Skip to content

Commit 4b2fb88

Browse files
RICHARD-QuentinRICHARD-Quentin
committed
chore: Update menu paths to use supannPerson instead of supann in useMenu.ts and identityAffectation.ts
1 parent 66ba750 commit 4b2fb88

File tree

4 files changed

+12
-95
lines changed

4 files changed

+12
-95
lines changed

‎src/composables/useMenu.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,23 +80,23 @@ function useMenu(identityStateStore, identityAffectationStore) {
8080
{
8181
icon: 'mdi-account-off',
8282
label: 'Etudiants',
83-
path: '/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[^additionalFields.attributes.supann.supannTypeEntiteAffectation]=/etd/i',
83+
path: '/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[^additionalFields.attributes.supannPerson.supannTypeEntiteAffectation]=/etd/i',
8484
color: 'primary',
8585
part: 'Affectations',
8686
badgeValue: 'ETD',
8787
},
8888
{
8989
icon: 'mdi-account-tie',
9090
label: 'Administratifs',
91-
path: '/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[^additionalFields.attributes.supann.supannTypeEntiteAffectation]=/adm/i',
91+
path: '/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[^additionalFields.attributes.supannPerson.supannTypeEntiteAffectation]=/adm/i',
9292
color: 'primary',
9393
part: 'Affectations',
9494
badgeValue: 'ADM',
9595
},
9696
{
9797
icon: 'mdi-account-group',
9898
label: 'Enseignants',
99-
path: '/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[^additionalFields.attributes.supann.supannTypeEntiteAffectation]=/esn/i',
99+
path: '/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[^additionalFields.attributes.supannPerson.supannTypeEntiteAffectation]=/esn/i',
100100
color: 'primary',
101101
part: 'Affectations',
102102
badgeValue: 'ESN',

‎src/layouts/default.vue‎

Lines changed: 0 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -18,88 +18,6 @@ q-layout
1818
q-icon(:name="menu.icon")
1919
q-badge(v-if="menu.badgeValue" :color="menu.badge.color" floating) {{ menu.badge.value }}
2020
q-separator
21-
//- q-item-section.avatar
22-
//- q-icon(:name="getMenuByPart(part)[0].icon")
23-
//- q-item-section
24-
//- q-item-label {{ part }}
25-
//- q-tooltip.text-body2(anchor="center right" self="center left") {{ part }}
26-
//- q-badge(v-if="badgesValues[part]" color="primary" floating) {{ badgesValues[part] }}
27-
//- q-item(@click="push('/')" clickable v-ripple)
28-
//- q-item-section(avatar)
29-
//- q-icon(name="mdi-home")
30-
//- q-tooltip.text-body2(anchor="center right" self="center left") Accueil
31-
//- q-item(@click="push('/agents')" clickable)
32-
//- q-item-section(avatar)
33-
//- q-icon(name="mdi-card-account-details")
34-
//- q-tooltip.text-body2(anchor="center right" self="center left") Liste des agents
35-
//- q-item(@click="push('/identities')" clickable)
36-
//- q-item-section(avatar)
37-
//- q-icon(name="mdi-account")
38-
//- q-badge(color="primary" floating) {{ TOTAL }}
39-
//- q-tooltip.text-body2(anchor="center right" self="center left") Liste des identités
40-
//- q-space
41-
//- q-separator
42-
//- q-item(@click="push(`/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[@state][]=${IdentityState.TO_VALIDATE}`)" clickable)
43-
//- q-item-section(avatar)
44-
//- q-icon(name="mdi-account-check")
45-
//- q-badge(color="primary" floating ) {{ TO_VALIDATE }}
46-
//- q-tooltip.text-body2(anchor="center right" self="center left") A valider
47-
48-
//- q-item(@click="push(`/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[@state][]=${IdentityState.TO_COMPLETE}`)" clickable)
49-
//- q-item-section(avatar)
50-
//- q-icon(name="mdi-account-alert")
51-
//- q-badge(color="primary" floating) {{ TO_COMPLETE }}
52-
//- q-tooltip.text-body2(anchor="center right" self="center left") A compléter
53-
//- q-item(@click="push(`/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[@state][]=${IdentityState.ON_ERROR}`)" clickable)
54-
//- q-item-section(avatar)
55-
//- q-icon(name="mdi-account-remove")
56-
//- q-tooltip.text-body2(anchor="center right" self="center left") En erreur
57-
//- q-badge(color="primary" floating) {{ ON_ERROR }}
58-
59-
//- q-item(@click="push(`/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[@state][]=${IdentityState.TO_SYNC}`)" clickable)
60-
//- q-item-section(avatar)
61-
//- q-icon(name="mdi-sync")
62-
//- q-tooltip.text-body2(anchor="center right" self="center left") A synchroniser
63-
//- q-badge(color="primary" floating) {{ TO_SYNC }}
64-
65-
//- q-item(@click="push(`/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[@state][]=${IdentityState.PROCESSING}`)" clickable)
66-
//- q-item-section(avatar)
67-
//- q-icon(name="mdi-loading")
68-
//- q-tooltip.text-body2(anchor="center right" self="center left") En cours de synchronisation
69-
//- q-badge(color="primary" floating) {{ PROCESSING }}
70-
71-
//- q-item(@click="push(`/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[@state][]=${IdentityState.SYNCED}`)" clickable)
72-
//- q-item-section(avatar)
73-
//- q-icon(name="mdi-check")
74-
//- q-tooltip.text-body2(anchor="center right" self="center left") Synchronisées
75-
//- q-badge(color="primary" floating) {{ SYNCED }}
76-
77-
//- q-separator
78-
//- q-item(@click="push('/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[^additionalFields.attributes.supann.supannTypeEntiteAffectation]=/etd/i')" clickable)
79-
//- q-item-section(avatar)
80-
//- q-icon(name="mdi-account-off")
81-
//- q-tooltip.text-body2(anchor="center right" self="center left") Etudiants
82-
//- q-badge(color="primary" floating) {{ ETD }}
83-
//- q-item(@click="push('/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[^additionalFields.attributes.supann.supannTypeEntiteAffectation]=/adm/i')" clickable)
84-
//- q-item-section(avatar)
85-
//- q-icon(name="mdi-account-tie")
86-
//- q-tooltip.text-body2(anchor="center right" self="center left") Administratifs
87-
//- q-badge(color="primary" floating) {{ ADM }}
88-
//- q-item(@click="push('/identities?sort[metadata.lastUpdatedAt]=desc&skip=0&limit=10&filters[^additionalFields.attributes.supann.supannTypeEntiteAffectation]=/esn/i')" clickable)
89-
//- q-item-section(avatar)
90-
//- q-icon(name="mdi-account-group")
91-
//- q-tooltip.text-body2(anchor="center right" self="center left") Enseignants
92-
//- q-badge(color="primary" floating) {{ ESN }}
93-
//- q-separator
94-
//- q-item(@click="push('/settings')" clickable)
95-
//- q-item-section(avatar)
96-
//- q-icon(name="mdi-cog")
97-
//- q-tooltip.text-body2(anchor="center right" self="center left") Paramètres
98-
//- q-item(@click="test" clickable)
99-
//- q-item-section(avatar)
100-
//- q-icon(name="mdi-logout")
101-
//- q-tooltip.text-body2(anchor="center right" self="center left") Déconnexion
102-
10321
q-page-container
10422
nuxt-page
10523
</template>

‎src/pages/identities/index.vue‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ const {
108108
error,
109109
} = await useHttp<Response>('/management/identities', {
110110
method: 'get',
111-
query: queryWithoutRead
111+
query: queryWithoutRead,
112112
})
113113
114114
if (error.value) {
@@ -140,9 +140,9 @@ const columns = ref<QTableProps['columns']>([
140140
sortable: true,
141141
},
142142
{
143-
name: 'additionalFields.attributes.supann.supannTypeEntiteAffectation',
143+
name: 'additionalFields.attributes.supannPerson.supannTypeEntiteAffectation',
144144
label: 'Affectation',
145-
field: (row: Identity) => row.additionalFields?.attributes.supann.supannTypeEntiteAffectation,
145+
field: (row: Identity) => row.additionalFields?.attributes.supannPerson.supannTypeEntiteAffectation,
146146
align: 'left',
147147
sortable: true,
148148
},
@@ -186,7 +186,7 @@ const columns = ref<QTableProps['columns']>([
186186
const visibleColumns = ref<QTableProps['visibleColumns']>([
187187
'inetOrgPerson.uid',
188188
'inetOrgPerson.employeeNumber',
189-
'additionalFields.attributes.supann.supannTypeEntiteAffectation',
189+
'additionalFields.attributes.supannPerson.supannTypeEntiteAffectation',
190190
'envelope.observers.name',
191191
'envelope.assigned.name',
192192
'inetOrgPerson.cn',
@@ -199,7 +199,7 @@ const visibleColumns = ref<QTableProps['visibleColumns']>([
199199
const columnsType = ref([
200200
{ name: 'inetOrgPerson.uid', type: 'text' },
201201
{ name: 'inetOrgPerson.employeeNumber', type: 'text' },
202-
{ name: 'additionalFields.attributes.supann.supannTypeEntiteAffectation', type: 'text' },
202+
{ name: 'additionalFields.attributes.supannPerson.supannTypeEntiteAffectation', type: 'text' },
203203
{ name: 'envelope.observers.name', type: 'text' },
204204
{ name: 'envelope.assigned.name', type: 'text' },
205205
{ name: 'inetOrgPerson.cn', type: 'text' },
@@ -259,8 +259,7 @@ const actions = {
259259
}
260260
}
261261
return null
262-
}
263-
262+
},
264263
}
265264
266265
const fieldsList = computed(() => {

‎src/stores/identityAffectation.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,23 @@ export const useIdentityAffectationStore = defineStore('identityAffectations', {
2525
},
2626
async fetchAdmCount() {
2727
try {
28-
const { data } = await useHttp(`/management/identities/count?&filters[^additionalFields.attributes.supann.supannTypeEntiteAffectation]=/adm/i&limit=9999`);
28+
const { data } = await useHttp(`/management/identities/count?&filters[^additionalFields.attributes.supannPerson.supannTypeEntiteAffectation]=/adm/i&limit=9999`);
2929
this['adm'] = data.value.data;
3030
} catch (error) {
3131
console.error(error);
3232
}
3333
},
3434
async fetchEsnCount() {
3535
try {
36-
const { data } = await useHttp(`/management/identities/count?filters[^additionalFields.attributes.supann.supannTypeEntiteAffectation]=/esn/i&limit=9999`);
36+
const { data } = await useHttp(`/management/identities/count?filters[^additionalFields.attributes.supannPerson.supannTypeEntiteAffectation]=/esn/i&limit=9999`);
3737
this['esn'] = data.value.data;
3838
} catch (error) {
3939
console.error(error);
4040
}
4141
},
4242
async fetchEtdCount() {
4343
try {
44-
const { data } = await useHttp(`/management/identities/count?filters[^additionalFields.attributes.supann.supannTypeEntiteAffectation]=/etd/i&limit=9999`);
44+
const { data } = await useHttp(`/management/identities/count?filters[^additionalFields.attributes.supannPerson.supannTypeEntiteAffectation]=/etd/i&limit=9999`);
4545
this['etd'] = data.value.data;
4646
} catch (error) {
4747
console.error(error);

0 commit comments

Comments
 (0)