fix(backend): fix export column's order

SocialGouv · Feb 3, 2025 · 2546b51 · 2546b51
1 parent 3f97b19
commit 2546b51
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 38 deletions.
diff --git a/packages/backend/src/auth/decorators/is-social-gouv-email.decorator.ts b/packages/backend/src/auth/decorators/is-social-gouv-email.decorator.ts
@@ -20,7 +20,8 @@ export function IsSocialGouvEmail(validationOptions?: ValidationOptions) {
           return (
             typeof value === "string" &&
             isEmail(value) &&
-            (value.endsWith("@social.gouv.fr") ||
+            (value.endsWith("@externes.social.gouv.fr") ||
+              value.endsWith("@social.gouv.fr") ||
               value.endsWith("@fabrique.social.gouv.fr"))
           );
         },

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/exportStructureStatsWorksheetSection3Renderer.ts b/...xport-structure-stats/worksheet-renderer/exportStructureStatsWorksheetSection3Renderer.ts
@@ -26,22 +26,22 @@ function renderSection3Interactions(context: {
     value: data.appel,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.colisIn,
+    value: data.courrierIn,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.colisOut,
+    value: data.courrierOut,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.colisOutForwarded,
+    value: data.courrierOutForwarded,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.courrierIn,
+    value: data.colisIn,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.courrierOut,
+    value: data.colisOut,
   });
   worksheetRendered.renderCell(i++, "c", {
-    value: data.courrierOutForwarded,
+    value: data.colisOutForwarded,
   });
   worksheetRendered.renderCell(i++, "c", {
     value: data.recommandeIn,

diff --git a/...ackend/src/usagers/services/xlsx-structure-usagers-renderer/renderStructureUsagersRows.ts b/...ackend/src/usagers/services/xlsx-structure-usagers-renderer/renderStructureUsagersRows.ts
@@ -52,7 +52,7 @@ export const renderStructureUsagersHeaders = (
     DATE_FIN_DOM: CUSTOM_DOCS_LABELS.DATE_FIN_DOM,
     DATE_PREMIERE_DOM: CUSTOM_DOCS_LABELS.DATE_PREMIERE_DOM,
     DATE_DERNIER_PASSAGE: CUSTOM_DOCS_LABELS.DATE_DERNIER_PASSAGE,
-    REFERENT: CUSTOM_DOCS_LABELS.REFERENT,
+    //REFERENT: CUSTOM_DOCS_LABELS.REFERENT,
     AYANTS_DROITS_NOMBRE: CUSTOM_DOCS_LABELS.AYANTS_DROITS_NOMBRE,
     TRANSFERT_ACTIF: CUSTOM_DOCS_LABELS.TRANSFERT_ACTIF,
     TRANSFERT_NOM: CUSTOM_DOCS_LABELS.TRANSFERT_NOM,
@@ -219,7 +219,7 @@ export const renderFirstSheetData = (
     DATE_FIN_DOM: usager.DATE_FIN_DOM,
     DATE_PREMIERE_DOM: usager.DATE_PREMIERE_DOM,
     DATE_DERNIER_PASSAGE: usager.DATE_DERNIER_PASSAGE,
-    REFERENT: usager.REFERENT,
+    // REFERENT: usager.REFERENT,
     AYANTS_DROITS_NOMBRE: usager.AYANTS_DROITS_NOMBRE,
     TRANSFERT_ACTIF: usager.TRANSFERT_ACTIF,
     TRANSFERT_NOM: usager.TRANSFERT_NOM,

diff --git a/...nd/src/app/modules/manage-usagers/components/manage-filters/manage-filters.component.html b/...nd/src/app/modules/manage-usagers/components/manage-filters/manage-filters.component.html
@@ -310,7 +310,7 @@
             </div>
           </div>
         </div>
-        <div
+        <!-- <div
           class="d-md-inline-block d-block me-2 text-md-start text-center my-1"
         >
           <button
@@ -392,7 +392,7 @@
               </button>
             </div>
           </div>
-        </div>
+        </div> -->
       </div>
       <div class="col-12 col-md-3 text-md-end text-center my-1">
         <div

diff --git a/...src/app/modules/structure-stats/components/structure-stats/structure-stats.component.html b/...src/app/modules/structure-stats/components/structure-stats/structure-stats.component.html
@@ -409,58 +409,58 @@ <h3>
               </tr>
               <tr>
                 <th scope="row" class="soustable">
-                  {{ ENTRETIEN_SITUATION_PRO.ETUDIANT }}
+                  {{ ENTRETIEN_SITUATION_PRO.AAH }}
                 </th>
                 <td class="stats-table-value">
-                  {{ stats.data.validUsagers.situationPro.etudiant }}
+                  {{ stats.data.validUsagers.situationPro.aah }}
                 </td>
               </tr>
               <tr>
                 <th scope="row" class="soustable">
-                  {{ ENTRETIEN_SITUATION_PRO.SALARIE }}
+                  {{ ENTRETIEN_SITUATION_PRO.ETUDIANT }}
                 </th>
                 <td class="stats-table-value">
-                  {{ stats.data.validUsagers.situationPro.salarie }}
+                  {{ stats.data.validUsagers.situationPro.etudiant }}
                 </td>
               </tr>
               <tr>
                 <th scope="row" class="soustable">
-                  {{ ENTRETIEN_SITUATION_PRO.INDEPENDANT }}
+                  {{ ENTRETIEN_SITUATION_PRO.FRANCE_TRAVAIL }}
                 </th>
                 <td class="stats-table-value">
-                  {{ stats.data.validUsagers.situationPro.independant }}
+                  {{ stats.data.validUsagers.situationPro.france_travail }}
                 </td>
               </tr>
               <tr>
                 <th scope="row" class="soustable">
-                  {{ ENTRETIEN_SITUATION_PRO.FRANCE_TRAVAIL }}
+                  {{ ENTRETIEN_SITUATION_PRO.INDEPENDANT }}
                 </th>
                 <td class="stats-table-value">
-                  {{ stats.data.validUsagers.situationPro.france_travail }}
+                  {{ stats.data.validUsagers.situationPro.independant }}
                 </td>
               </tr>
               <tr>
                 <th scope="row" class="soustable">
-                  {{ ENTRETIEN_SITUATION_PRO.RSA }}
+                  {{ ENTRETIEN_SITUATION_PRO.RETRAITE }}
                 </th>
                 <td class="stats-table-value">
-                  {{ stats.data.validUsagers.situationPro.rsa }}
+                  {{ stats.data.validUsagers.situationPro.retraite }}
                 </td>
               </tr>
               <tr>
                 <th scope="row" class="soustable">
-                  {{ ENTRETIEN_SITUATION_PRO.AAH }}
+                  {{ ENTRETIEN_SITUATION_PRO.RSA }}
                 </th>
                 <td class="stats-table-value">
-                  {{ stats.data.validUsagers.situationPro.aah }}
+                  {{ stats.data.validUsagers.situationPro.rsa }}
                 </td>
               </tr>
               <tr>
                 <th scope="row" class="soustable">
-                  {{ ENTRETIEN_SITUATION_PRO.RETRAITE }}
+                  {{ ENTRETIEN_SITUATION_PRO.SALARIE }}
                 </th>
                 <td class="stats-table-value">
-                  {{ stats.data.validUsagers.situationPro.retraite }}
+                  {{ stats.data.validUsagers.situationPro.salarie }}
                 </td>
               </tr>
               <tr>
@@ -477,7 +477,6 @@ <h3>
                   {{ stats.data.validUsagers.situationPro.non_renseigne }}
                 </td>
               </tr>
-
               <!-- Lien commune -->
               <tr>
                 <th class="fw-bold" colspan="2" scope="col">

diff --git a/.../modules/usager-dossier/components/decision-valide-form/decision-valide-form.component.ts b/.../modules/usager-dossier/components/decision-valide-form/decision-valide-form.component.ts
@@ -85,7 +85,7 @@ export class DecisionValideFormComponent implements OnInit, OnDestroy {
 
   public getLastDecision() {
     const indexOfDate =
-      this.usager.decision.statut === "ATTENTE_DECISION" ? 2 : 1;
+      this.usager.decision.statut === "ATTENTE_DECISION" ? 3 : 2;
 
     if (indexOfDate && this.usager.historique.length >= indexOfDate) {
       this.lastDecision =

diff --git a/...dossier/components/display-etat-civil-decision/display-etat-civil-decision.component.html b/...dossier/components/display-etat-civil-decision/display-etat-civil-decision.component.html
@@ -31,10 +31,10 @@
     </span>
   </p>
 
-  <p class="my-2">
+  <!-- <p class="my-2">
     <span class="valeur"> Référent: </span>
     <span> {{ usager.referrerId | referrerName | async }}</span>
-  </p>
+  </p> -->
 </ng-container>
 
 <ng-container *ngIf="section === 'AYANTS_DROIT'">

diff --git a/.../src/app/modules/usager-dossier/components/step-etat-civil/step-etat-civil.component.html b/.../src/app/modules/usager-dossier/components/step-etat-civil/step-etat-civil.component.html
@@ -392,7 +392,7 @@ <h2 class="form-title">État civil du demandeur</h2>
             />
             <small id="numero-description">Exemple : BP 102, TSA 11000</small>
           </div>
-          <div class="col-12 col-md-6 form-group">
+          <!-- <div class="col-12 col-md-6 form-group">
             <label for="referrerId">Référent.e dans la structure</label>
             <select
               formControlName="referrerId"
@@ -407,7 +407,7 @@ <h2 class="form-title">État civil du demandeur</h2>
                 </option>
               </ng-container>
             </select>
-          </div>
+          </div> -->
         </div>
 
         <div

diff --git a/...r-profil/components/_general-section/display-etat-civil/display-etat-civil.component.html b/...r-profil/components/_general-section/display-etat-civil/display-etat-civil.component.html
@@ -50,12 +50,12 @@
     </span>
   </p>
 
-  <p class="col-md-4 reponses">
+  <!-- <p class="col-md-4 reponses">
     <span class="question">Référent.e au sein de la structure</span>
     <span class="valeur">
       {{ usager.referrerId | referrerName | async }}
     </span>
-  </p>
+  </p> -->
 </div>
 
 <div class="row justify-content-start">

diff --git a/...ager-profil/components/pages/profil-general-section/profil-general-section.component.html b/...ager-profil/components/pages/profil-general-section/profil-general-section.component.html
@@ -311,12 +311,12 @@ <h2>Dossier</h2>
                 [usager]="usager"
               ></app-display-ayants-droits>
             </div>
-            <div class="col-6 my-1 align-self-center">
+            <!-- <div class="col-6 my-1 align-self-center">
               <span class="label">Référent au sein de la structure</span>
             </div>
             <div class="col-6 my-1">
               {{ usager.referrerId | referrerName | async }}
-            </div>
+            </div> -->
             <div class="col-12 mt-4">
               <a
                 class="text-link"

diff --git a/...les/usager-shared/components/profil-etat-civil-form/profil-etat-civil-form.component.html b/...les/usager-shared/components/profil-etat-civil-form/profil-etat-civil-form.component.html
@@ -285,7 +285,7 @@
       <small id="numero-description">Exemple : BP 102, TSA 11000 </small>
     </div>
 
-    <div class="col-md-4 col-12 form-group required">
+    <!-- <div class="col-md-4 col-12 form-group required">
       <label for="referrerId">Référent.e dans la structure</label>
       <select
         formControlName="referrerId"
@@ -298,7 +298,7 @@
           <option [value]="user.id">{{ user.nom }} {{ user.prenom }}</option>
         </ng-container>
       </select>
-    </div>
+    </div> -->
   </div>
 
   <div class="row">

diff --git a/...ns/src/app/modules/structure/components/structure-stats/structure-stats.component.spec.ts b/...ns/src/app/modules/structure/components/structure-stats/structure-stats.component.spec.ts
@@ -1,5 +1,4 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
-
 import { StructureStatsComponent } from "./structure-stats.component";
 import { CommonModule } from "@angular/common";
 import { HttpClientTestingModule } from "@angular/common/http/testing";

diff --git a/packages/portail-admins/src/app/modules/structure/components/users/users.component.html b/packages/portail-admins/src/app/modules/structure/components/users/users.component.html
@@ -6,6 +6,15 @@ <h2>Utilisateurs enregistrés: {{ users.length }} utilisateurs</h2>
     </caption>
     <thead>
       <tr>
+        <th scope="col">
+          <app-table-head-sort
+            sortKey="id"
+            [(sortValue)]="sortValue"
+            [(currentKey)]="currentKey"
+            columnName="ID"
+          >
+          </app-table-head-sort>
+        </th>
         <th scope="col">
           <app-table-head-sort
             sortKey="nom"
@@ -71,6 +80,7 @@ <h2>Utilisateurs enregistrés: {{ users.length }} utilisateurs</h2>
         "
         [attr.aria-rowindex]="i + 1"
       >
+        <td class="fw-bold">{{ user.id }}</td>
         <td class="fw-bold">{{ user.nom }} {{ user.prenom }}</td>
         <td>{{ user.email }}</td>
         <td>{{ user.createdAt | date : "d MMMM y" }}</td>