fix(admin): fix export in admin

SocialGouv · Jan 9, 2025 · f181905 · f181905
1 parent 14da8a2
commit f181905
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 4 deletions.
diff --git a/packages/backend/src/excel/_templates/export-stats-deploiement.xlsx b/packages/backend/src/excel/_templates/export-stats-deploiement.xlsx
diff --git a/...cel/export-stats-deploiement/worksheet-renderer/exportListeStructuresWorksheetRenderer.ts b/...cel/export-stats-deploiement/worksheet-renderer/exportListeStructuresWorksheetRenderer.ts
@@ -35,6 +35,7 @@ function renderWorksheet({
     { key: "importDate" },
     { key: "usersCount" },
     { key: "usagersAllCount" },
+    { key: "actifs" },
     { key: "lastLogin" },
     { key: "codePostal" },
     { key: "ville" },
@@ -69,6 +70,7 @@ function buildRows(structures: StructureAdminForList[]): XlRowModel[] {
         importDate: xlFormater.toLocalTimezone(structure.importDate),
         usersCount: structure.users,
         usagersAllCount: structure.usagers ?? 0,
+        actifs: structure.actifs ?? 0,
         lastLogin: xlFormater.toLocalTimezone(structure.lastLogin),
         codePostal: structure.codePostal,
         ville: structure.ville.toUpperCase().trim(),

diff --git a/packages/backend/src/modules/portail-admin/types/StructureAdminForList.type.ts b/packages/backend/src/modules/portail-admin/types/StructureAdminForList.type.ts
@@ -3,4 +3,5 @@ import { StructureAdmin } from "./StructureAdmin.type";
 export type StructureAdminForList = StructureAdmin & {
   users: number;
   usagers: number;
+  actifs: number;
 };
diff --git a/...ules/admin-structures/components/admin-structures-list/admin-structures-list.component.ts b/...ules/admin-structures/components/admin-structures-list/admin-structures-list.component.ts
@@ -125,6 +125,8 @@ export class AdminStructuresListComponent
     );
 
     this.setupIntersectionObserver();
+    this.filters$.next(this.filters);
+    this.searchInput.nativeElement.value = this.filters.searchString;
   }
 
   private setupIntersectionObserver(): void {

diff --git a/...es/admin-structures/components/admin-structures-list/services/structuresSorter.service.ts b/...es/admin-structures/components/admin-structures-list/services/structuresSorter.service.ts
@@ -20,6 +20,14 @@ function sortBy(
     return structures;
   }
 
+  if (["id", "users", "actifs", "usagers"].includes(sortKey)) {
+    return structures.sort((a, b) => {
+      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/...usager-account/components/home-usager/sections/section-infos/section-infos.component.html b/...usager-account/components/home-usager/sections/section-infos/section-infos.component.html
@@ -4,7 +4,7 @@ <h2 class="section-title">Votre domiciliation</h2>
     <div class="py-2">
       <div
         class="alert alert-info"
-        *ngIf="usager.decision.statut === 'INSTRUCTION' && rdvInfo.display"
+        *ngIf="usager.decision.statut === 'INSTRUCTION' && rdvInfo.content"
       >
         <div aria-hidden="true" class="svg-icon icon-calendar"></div>
         <p>