Skip to content

Investments update #4312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
entantoencuanto wants to merge 19 commits into
base: master
Choose a base branch
from
Draft

Investments update #4312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d08a786
Allow external_id param in API to create new terms
entantoencuanto Oct 16, 2025
402437b
Add new fields to mataro investments visualization config
entantoencuanto Oct 16, 2025
be2b45d
Update translations js file
entantoencuanto Oct 16, 2025
e57da3f
Allow configuring a list of allowed values in filters and configure f…
entantoencuanto Oct 28, 2025
51ef601
Small refactor to allow hidding the dropdown of a filter
entantoencuanto Oct 28, 2025
7139992
Remove filter
entantoencuanto Oct 28, 2025
45e6468
Remove useless filter
entantoencuanto Oct 28, 2025
484e4ec
Remove detail fields
entantoencuanto Oct 28, 2025
9cf555f
Update translations js file
entantoencuanto Oct 28, 2025
c8c3aad
Support up to 9 phases with proper gradient
entantoencuanto Oct 28, 2025
c0ef857
Allow configuring vocabularies in plugins to return their terms in me…
entantoencuanto Nov 4, 2025
5e4bc45
Add representation of tables including columns with vocabularies
entantoencuanto Nov 4, 2025
d3a813a
Improve types detection
entantoencuanto Nov 4, 2025
26965c2
Change the width of columns depending on type
entantoencuanto Nov 4, 2025
91336cf
Change mataro configuration
entantoencuanto Nov 4, 2025
7487cea
Reorder items
entantoencuanto Nov 4, 2025
bc858aa
Define 8 phases
entantoencuanto Nov 4, 2025
1e7c3f4
Add new fields to mataro.conf
entantoencuanto Nov 13, 2025
fd5ac53
Increase width of column of labels
entantoencuanto Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 49 additions & 9 deletions app/assets/stylesheets/investments.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@
}

&--cell-heading {
flex: 0 0 20%;
flex: 0 0 25%;
font-size: $f6;
font-weight: 700;
line-height: 19px;
Expand All @@ -254,6 +254,11 @@
line-height: 29px;
}

&--table-container {
margin-top: 1rem;
margin-bottom: 1rem;
}

&--inner-table-row {
display: flex;
align-items: baseline;
Expand All @@ -273,6 +278,41 @@
}
}

&--inner-table-header {
background-color: rgba($color_headers, 0.04);
padding: 0.5rem 0;
border-bottom: 2px solid $separator_dark;
margin-bottom: 0.5rem;

&:not(:first-child) {
margin-top: 0;
}
}

&--inner-table-cell {
flex: 1;
word-break: break-word;

&:not(:first-child) {
padding-left: 1rem;
}

&--date {
flex: 0 0 100px;
min-width: 100px;
}

&--vocabulary {
flex: 0 0 110px;
min-width: 110px;
}

&--text {
flex: 2;
min-width: 300px;
}
}

&--icon-text {
display: flex;
align-items: baseline;
Expand Down Expand Up @@ -307,16 +347,16 @@
> * {
padding: 1em 0;
border-bottom: 1px solid $separator_dark;
}

&:first-of-type {
padding-top: 0;
.gobierto-filter--hide-dropdown {
padding-top: 0;

.gobierto-vue-dropdown--trigger {
display: none;
.gobierto-vue-dropdown--trigger {
display: none;

& + * {
margin-top: 0;
}
& + * {
margin-top: 0;
}
}
}
Expand Down Expand Up @@ -606,7 +646,7 @@
}
}

$ranges-opacity: 10%, 25%, 40%, 60%, 75%, 90%, 100%;
$ranges-opacity: 13%, 25%, 38%, 50%, 63%, 75%, 88%, 100%;

&--item {
flex: 0 0 calc(100% / #{length($ranges-opacity)});
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/gobierto_admin/gobierto_common/api/terms_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def load_vocabulary
end

def term_params
params.require(:term).permit(name_translations: {})
params.require(:term).permit(:external_id, name_translations: {})
end

def set_admin_by_session_or_token
Expand Down
75 changes: 71 additions & 4 deletions app/javascript/gobierto_investments/webapp/components/DictionaryItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,22 @@
</div>

<!-- Table type -->
<div v-if="type === 'table'">

<div
v-if="type === 'table' && table && table.columns"
class="investments-project-main--table-container"
>
<!-- Table header with column titles -->
<div class="investments-project-main--inner-table-row investments-project-main--inner-table-header">
<div
v-for="column in table.columns"
:key="`header-${column.id}`"
:class="getCellClass(column)"
>
<strong>{{ translate(column.name_translations) }}</strong>
</div>
</div>
<!-- Table rows with data -->
<div
v-for="(v, i) in value"
:key="`${v}-${i}`"
Expand All @@ -14,19 +29,26 @@
<div
v-for="column in table.columns"
:key="`${column.id}-${v}`"
:class="getCellClass(column)"
>
<div v-if="column.filter === 'money'">
{{ v[column.id] | money }}
<div v-if="column.type === 'vocabulary'">
{{ getVocabularyValue(column.id, v[column.id]) }}
</div>
<div v-else-if="column.filter === 'date'">
<div v-else-if="column.type === 'date' || column.filter === 'date'">
{{ v[column.id] | date }}
</div>
<div v-else-if="column.type === 'money' || column.filter === 'money'">
{{ v[column.id] | money }}
</div>
<div v-else>
{{ v[column.id] }}
</div>
</div>
</div>
</div>
<div v-else-if="type === 'table' && (!table || !table.columns)">
<em>{{ value || "Table configuration missing" }}</em>
</div>

<!-- Icon type -->
<div v-else-if="type === 'icon'">
Expand Down Expand Up @@ -90,6 +112,51 @@ export default {
type: Object,
default: () => {}
}
},
data() {
return {
vocabularyLookup: {}
};
},
created() {
if (this.type === 'table' && this.table && this.table.vocabulary_terms) {
this.buildVocabularyLookup();
}
},
methods: {
buildVocabularyLookup() {
// Build a lookup dictionary from vocabulary_terms
// vocabulary_terms contains all terms for all vocabularies used in the table
if (Array.isArray(this.table.vocabulary_terms)) {
this.table.vocabulary_terms.forEach(term => {
// Map term id to translated name
this.vocabularyLookup[term.id] = this.translate(term.name_translations);
});
}
},
getVocabularyValue(columnId, value) {
// Look up the term by its ID
if (this.vocabularyLookup[value]) {
return this.vocabularyLookup[value];
}
// Fallback to original value if not found
return value || '-';
},
getCellClass(column) {
const baseClass = 'investments-project-main--inner-table-cell';
const type = column.type || column.filter || 'text';

// Map column types to CSS classes
const typeClasses = {
'date': `${baseClass} ${baseClass}--date`,
'vocabulary': `${baseClass} ${baseClass}--vocabulary`,
'money': `${baseClass} ${baseClass}--vocabulary`,
'text': `${baseClass} ${baseClass}--text`
};

// Return specific class or default to vocabulary width
return typeClasses[type] || `${baseClass} ${baseClass}--vocabulary`;
}
}
};
</script>
31 changes: 20 additions & 11 deletions app/javascript/gobierto_investments/webapp/conf/mataro.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,12 @@ export default {
maxZoom: 16
},
availableFilters: [
{
id: "date",
startKey: "data-inici",
endKey: "data-final",
},
{
id: "estat"
},
{
id: "any-estat"
id: "any-pla-inversions"//,
// allowedValues: ["2024", "2025"]
},
{
id: "tipus"
Expand All @@ -33,7 +29,10 @@ export default {
id: "tipus-projecte"
},
{
id: "import"
id: "zones"
},
{
id: "consells-territorials"
}
],
displayGalleryFieldTags: false,
Expand Down Expand Up @@ -76,6 +75,9 @@ export default {
{
type: "separator"
},
{
id: "data-inici-obra"
},
{
id: "data-inici-redaccio"
},
Expand All @@ -91,20 +93,27 @@ export default {
{
id: "data-final"
},
{
id: "data-final-obra"
},
{
type: "separator"
},
{
id: "import"
id: "import-adjudicacio-ambiva"
},
{
id: "import-adjudicacio"
id: "import-licitacio-ambiva"
},
{
id: "import-liquidacio"
id: "import-liquidacio-ambiva"
},
{
type: "separator"
},
{
id: "partida"
id: "estats",
type: "table"
}
]
};
2 changes: 1 addition & 1 deletion app/javascript/gobierto_investments/webapp/containers/home/Article.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
:count="phase.count"
:budget="phase.budget | money"
:projects="phase.items"
:is-negative="i > 2"
:is-negative="i > 3"
/>
</div>
</template>
Expand Down
15 changes: 14 additions & 1 deletion app/javascript/gobierto_investments/webapp/mixins/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,24 @@ export const CommonsMixin = {
attr.field_type = "money"
}

// Extract table configuration from plugin_configuration if type is table
let table = element.table;
if (element.type === "table" && attr.options?.configuration?.plugin_configuration) {
table = attr.options.configuration.plugin_configuration;

// Add vocabulary_terms from metadata to table configuration
// The metadata provides vocabulary_terms for all vocabularies in vocabulary_ids
if (table && attr.vocabulary_terms) {
table.vocabulary_terms = attr.vocabulary_terms;
}
}

return {
...attr,
...element,
name: this.translate(attr.name_translations),
value: value
value: value,
table: table
};
},
setItem(element, metadata) {
Expand Down
6 changes: 3 additions & 3 deletions app/javascript/lib/i18n/modules/translations.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions app/javascript/lib/shared/modules/middleware.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export class Middleware {
const filters = [];

for (let index = 0; index < this.filters.length; index++) {
const { id: key, ...rest } = this.filters[index];
const { id: key, allowedValues, hideDropdown, ...rest } = this.filters[index];
const element = stats[key];
const { field_type: type, vocabulary_terms: options = [], name_translations: title = {} } = this.getAttributesByKey(key);

Expand All @@ -20,7 +20,9 @@ export class Middleware {
title: translate(title),
options: Array.isArray(options) ? options.map(opt => ({ ...opt, title: translate(opt.name_translations) })) : [],
type: type ? type : key,
key
key,
allowedValues,
hideDropdown
});
}

Expand Down
23 changes: 9 additions & 14 deletions app/javascript/lib/vue/components/modules/Filters.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@
>{{ labelClear }}</span>
</transition>

<template v-for="filter in filters">
<div
v-for="filter in filters"
:key="filter.key"
:class="{ 'gobierto-filter--hide-dropdown': filter.hideDropdown }"
>
<!-- Filter type: calendar -->
<template v-if="filter.type === 'date'">
<Dropdown
:key="filter.key"
@is-content-visible="filter.rotate = !filter.rotate"
>
<Dropdown @is-content-visible="filter.rotate = !filter.rotate">
<template #trigger>
<BlockHeader
:rotate="filter.rotate"
Expand All @@ -34,10 +35,7 @@

<!-- Filter type: checkbox -->
<template v-else-if="filter.type === 'vocabulary_options'">
<Dropdown
:key="filter.key"
@is-content-visible="filter.rotate = !filter.rotate"
>
<Dropdown @is-content-visible="filter.rotate = !filter.rotate">
<template #trigger>
<BlockHeader
:rotate="filter.rotate"
Expand All @@ -63,10 +61,7 @@

<!-- Filter type: numeric range -->
<template v-else-if="filter.type === 'numeric'">
<Dropdown
:key="filter.key"
@is-content-visible="filter.rotate = !filter.rotate"
>
<Dropdown @is-content-visible="filter.rotate = !filter.rotate">
<template #trigger>
<BlockHeader
:rotate="filter.rotate"
Expand All @@ -89,7 +84,7 @@
/>
</Dropdown>
</template>
</template>
</div>
</div>
</template>

Expand Down
Loading