From 90f5631d6772e9720ca89770c1f94dea8f4c4663 Mon Sep 17 00:00:00 2001 From: "Yassine R." Date: Thu, 9 Jan 2025 23:56:59 +0100 Subject: [PATCH] fix(admin): fix export in admin --- .../_templates/export-stats-deploiement.xlsx | Bin 14727 -> 14708 bytes .../exportListeStructuresWorksheetRenderer.ts | 2 ++ .../types/StructureAdminForList.type.ts | 1 + .../admin-structures-list.component.ts | 2 ++ .../services/structuresSorter.service.ts | 16 +++++++++++++--- .../section-infos.component.html | 2 +- 6 files changed, 19 insertions(+), 4 deletions(-) diff --git a/packages/backend/src/excel/_templates/export-stats-deploiement.xlsx b/packages/backend/src/excel/_templates/export-stats-deploiement.xlsx index 39c1408cc411571fd5c10a11f37cdc5acb2a00c0..85aa0d115fbe4d4a0f956fb0143723495484b637 100644 GIT binary patch delta 6022 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 KEPc`6kN*!dogEYa delta 6015 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 { + const valueA = a[sortKey as keyof StructureAdmin] as number; + const valueB = b[sortKey as keyof StructureAdmin] as number; + return sortNumeric(valueA, valueB, asc); + }); + } + return sortMultiple(structures, asc, (structure) => { const sortAttributes: SortableValue[] = []; @@ -32,11 +40,13 @@ function sortBy( ) { value = normalizeString(value as string); } - // eslint-disable-next-line @typescript-eslint/no-explicit-any sortAttributes.push(value as any); - sortAttributes.push(normalizeString(structure.nom)); - + sortAttributes.push(structure.nom); return sortAttributes; }); } + +export const sortNumeric = (a: number, b: number, asc: boolean): number => { + return asc ? a - b : b - a; +}; diff --git a/packages/portail-usagers/src/app/modules/usager-account/components/home-usager/sections/section-infos/section-infos.component.html b/packages/portail-usagers/src/app/modules/usager-account/components/home-usager/sections/section-infos/section-infos.component.html index 430c78a259..8a6bcd0431 100644 --- a/packages/portail-usagers/src/app/modules/usager-account/components/home-usager/sections/section-infos/section-infos.component.html +++ b/packages/portail-usagers/src/app/modules/usager-account/components/home-usager/sections/section-infos/section-infos.component.html @@ -4,7 +4,7 @@

Votre domiciliation