Skip to content

Commit ebe3040

Browse files
committed
chore(asso): Review asso
1 parent 5dfde37 commit ebe3040

4 files changed

Lines changed: 15 additions & 7 deletions

File tree

src/assets/translations/fr/dashboard.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"projects_count": "Nombre de projets",
88
"budget_count": "Budget total",
99
"territories_count": "Nombre de territoires",
10-
"interventions_fields_count": "Nombre de domaines d'intervention"
10+
"interventions_fields_count": "Nombre de secteurs d'intervention"
1111
},
1212
"filters": {
1313
"year": "Filtrer par année"

src/views/admin/panels/associations/AdminAssociations.vue

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,17 @@ watch(searchQuery, (newValue) => {
9191
})
9292
9393
const sortedAssociations = computed(() => {
94-
return [...associationsStore.associationsList, ...associationsStore.newAssociationsList]
95-
.sort((a, b) => Number(b.waiting_for_validation) - Number(a.waiting_for_validation))
96-
.sort((a, b) => Number(!!b.newAssociation) - Number(!!a.newAssociation))
94+
return [...associationsStore.associationsList, ...associationsStore.newAssociationsList].sort(
95+
(a, b) => {
96+
const getPriority = (item: Association) => {
97+
if (item.newAssociation) return 3 // Highest priority
98+
if (item.waiting_for_validation) return 2 // Medium priority
99+
return 1 // Lower priority
100+
}
101+
102+
return getPriority(b) - getPriority(a)
103+
},
104+
)
97105
})
98106
const filteredAssociations = computed(() => {
99107
if (debouncedSearchQuery.value) {

src/views/associations/AssociationsListView.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,9 +409,9 @@ function createAssociation() {
409409
}
410410
411411
&__request {
412-
font-size: 0.6rem;
412+
font-weight: bold;
413413
cursor: pointer;
414-
color: rgb(var(--v-theme-main-blue));
414+
color: rgb(var(--v-theme-light-blue));
415415
> div {
416416
font-style: italic;
417417
}

src/views/dashboard/components/KeyNumber.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="keyNumber">
33
<span class="keyNumber__label">{{ label }}</span>
44
<span class="keyNumber__value"
5-
>{{ formatNumber(parseFloat(keyNumber.toFixed(2))) }}{{ isMillion ? ' M$' : '' }}</span
5+
>{{ formatNumber(parseFloat(keyNumber?.toFixed(2))) }}{{ isMillion ? ' M$' : '' }}</span
66
>
77
</div>
88
</template>

0 commit comments

Comments
 (0)