fix(excel): add new templates

SocialGouv · Jan 10, 2024 · 9e2debf · 9e2debf
1 parent 5260f2a
commit 9e2debf
Show file tree

Hide file tree

Showing 5 changed files with 184 additions and 168 deletions.
diff --git a/packages/backend/src/excel/_templates/export-structure-stats.xlsx b/packages/backend/src/excel/_templates/export-structure-stats.xlsx
diff --git a/...xport-structure-stats/worksheet-renderer/exportStructureStatsWorksheetSection1Renderer.ts b/...xport-structure-stats/worksheet-renderer/exportStructureStatsWorksheetSection1Renderer.ts
@@ -19,7 +19,7 @@ function renderSection1ValidUsagers(context: {
     value: `Axe 1. Connaissance du public domicilié au ${format(
       model.stats.period.endDateUTC,
       "dd/MM/yyyy"
-    )} en nombre de personnes`,
+    )} (en nombre de personnes)`,
   });
   i++; // blank line
   worksheetRendered.renderCell(i++, "c", {
@@ -100,48 +100,54 @@ function renderSection1ValidUsagers(context: {
   i++; // blank line
   i++; // title
   worksheetRendered.renderCell(i++, "c", {
-    value: data.menage.couple_avec_enfant,
+    value: data.situationPro.aah,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.menage.couple_sans_enfant,
+    value: data.situationPro.etudiant,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.menage.femme_isole_avec_enfant,
+    value: data.situationPro.france_travail,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.menage.femme_isole_sans_enfant,
+    value: data.situationPro.independant,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.menage.homme_isole_avec_enfant,
+    value: data.situationPro.retraite,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.menage.homme_isole_sans_enfant,
+    value: data.situationPro.rsa,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.menage.non_renseigne,
+    value: data.situationPro.salarie,
+  });
+  worksheetRendered.renderCell(i++, "c", {
+    value: data.situationPro.autre,
+  });
+  worksheetRendered.renderCell(i++, "c", {
+    value: data.situationPro.non_renseigne,
   });
   i++; // blank line
   i++; // title
   worksheetRendered.renderCell(i++, "c", {
-    value: data.residence.domicile_mobile,
+    value: data.menage.couple_avec_enfant,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.residence.hebergement_social,
+    value: data.menage.couple_sans_enfant,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.residence.hebergement_tiers,
+    value: data.menage.femme_isole_avec_enfant,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.residence.hotel,
+    value: data.menage.femme_isole_sans_enfant,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.residence.sans_abri,
+    value: data.menage.homme_isole_avec_enfant,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.residence.autre,
+    value: data.menage.homme_isole_sans_enfant,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.residence.non_renseigne,
+    value: data.menage.non_renseigne,
   });
   i++; // blank line
   i++; // title
@@ -178,62 +184,77 @@ function renderSection1ValidUsagers(context: {
   worksheetRendered.renderCell(i++, "c", {
     value: data.cause.non_renseigne,
   });
-
   i++; // blank line
   i++; // title
   worksheetRendered.renderCell(i++, "c", {
-    value: data.raison.exercice_droits,
+    value: data.residence.domicile_mobile,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.raison.prestations_sociales,
+    value: data.residence.hebergement_social,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.raison.autre,
+    value: data.residence.hebergement_tiers,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.raison.non_renseigne,
+    value: data.residence.hotel,
+  });
+  worksheetRendered.renderCell(i++, "c", {
+    value: data.residence.sans_abri,
+  });
+  worksheetRendered.renderCell(i++, "c", {
+    value: data.residence.autre,
+  });
+  worksheetRendered.renderCell(i++, "c", {
+    value: data.residence.non_renseigne,
   });
   i++; // blank line
   i++; // title
   worksheetRendered.renderCell(i++, "c", {
-    value: data.accompagnement.oui,
+    value: data.raison.exercice_droits,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.accompagnement.non,
+    value: data.raison.prestations_sociales,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.accompagnement.non_renseigne,
+    value: data.raison.autre,
+  });
+  worksheetRendered.renderCell(i++, "c", {
+    value: data.raison.non_renseigne,
   });
   i++; // blank line
   i++; // title
   worksheetRendered.renderCell(i++, "c", {
-    value: data.situationPro.aah,
+    value: data.liencommune.residentiel,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.situationPro.etudiant,
+    value: data.liencommune.parental,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.situationPro.france_travail,
+    value: data.liencommune.familial,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.situationPro.independant,
+    value: data.liencommune.professionnel,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.situationPro.retraite,
+    value: data.liencommune.social,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.situationPro.rsa,
+    value: data.liencommune.autre,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.situationPro.salarie,
+    value: data.liencommune.non_renseigne,
   });
+  i++; // blank line
+  i++; // title
   worksheetRendered.renderCell(i++, "c", {
-    value: data.situationPro.autre,
+    value: data.accompagnement.oui,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.situationPro.non_renseigne,
+    value: data.accompagnement.non,
+  });
+  worksheetRendered.renderCell(i++, "c", {
+    value: data.accompagnement.non_renseigne,
   });
-
   i++; // blank line
 
   context.currentRowNumber = i;

diff --git a/...xport-structure-stats/worksheet-renderer/exportStructureStatsWorksheetSection2Renderer.ts b/...xport-structure-stats/worksheet-renderer/exportStructureStatsWorksheetSection2Renderer.ts
@@ -20,7 +20,10 @@ function renderSection2ActiviteDecisions(context: {
     value: `Axe 2. Activité de domiciliation du ${format(
       new Date(model.stats.period.startDateUTC),
       "dd/MM/yyyy"
-    )} au ${format(new Date(model.stats.period.endDateUTC), "dd/MM/yyyy")}`,
+    )} au ${format(
+      new Date(model.stats.period.endDateUTC),
+      "dd/MM/yyyy"
+    )} (en nombre d'actes)`,
   });
   i++; // blank line
   worksheetRendered.renderCell(i++, "c", {