From 2546b51ffd52b189864f7db705650e51d42f54f9 Mon Sep 17 00:00:00 2001 From: "Yassine R." Date: Mon, 3 Feb 2025 17:25:40 +0100 Subject: [PATCH] fix(backend): fix export column's order --- .../is-social-gouv-email.decorator.ts | 3 +- .../_templates/export-structure-stats.xlsx | Bin 14615 -> 14613 bytes ...StructureStatsWorksheetSection3Renderer.ts | 12 ++++---- .../renderStructureUsagersRows.ts | 4 +-- .../manage-filters.component.html | 4 +-- .../structure-stats.component.html | 29 +++++++++--------- .../decision-valide-form.component.ts | 2 +- ...display-etat-civil-decision.component.html | 4 +-- .../step-etat-civil.component.html | 4 +-- .../display-etat-civil.component.html | 4 +-- .../profil-general-section.component.html | 4 +-- .../profil-etat-civil-form.component.html | 4 +-- .../structure-stats.component.spec.ts | 1 - .../components/users/users.component.html | 10 ++++++ 14 files changed, 47 insertions(+), 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 index 8ad0117283..e342f54077 100644 --- 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 index be31e0335654e4b52aaef7a5cc134e18fbc9b265..3e86e5f3337f7bd41a620ab4f9b1d11a0e3d72ee 100644 GIT binary patch delta 4026 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 -
- + -->
- {{ ENTRETIEN_SITUATION_PRO.ETUDIANT }} + {{ ENTRETIEN_SITUATION_PRO.AAH }} - {{ stats.data.validUsagers.situationPro.etudiant }} + {{ stats.data.validUsagers.situationPro.aah }} - {{ ENTRETIEN_SITUATION_PRO.SALARIE }} + {{ ENTRETIEN_SITUATION_PRO.ETUDIANT }} - {{ stats.data.validUsagers.situationPro.salarie }} + {{ stats.data.validUsagers.situationPro.etudiant }} - {{ ENTRETIEN_SITUATION_PRO.INDEPENDANT }} + {{ ENTRETIEN_SITUATION_PRO.FRANCE_TRAVAIL }} - {{ stats.data.validUsagers.situationPro.independant }} + {{ stats.data.validUsagers.situationPro.france_travail }} - {{ ENTRETIEN_SITUATION_PRO.FRANCE_TRAVAIL }} + {{ ENTRETIEN_SITUATION_PRO.INDEPENDANT }} - {{ stats.data.validUsagers.situationPro.france_travail }} + {{ stats.data.validUsagers.situationPro.independant }} - {{ ENTRETIEN_SITUATION_PRO.RSA }} + {{ ENTRETIEN_SITUATION_PRO.RETRAITE }} - {{ stats.data.validUsagers.situationPro.rsa }} + {{ stats.data.validUsagers.situationPro.retraite }} - {{ ENTRETIEN_SITUATION_PRO.AAH }} + {{ ENTRETIEN_SITUATION_PRO.RSA }} - {{ stats.data.validUsagers.situationPro.aah }} + {{ stats.data.validUsagers.situationPro.rsa }} - {{ ENTRETIEN_SITUATION_PRO.RETRAITE }} + {{ ENTRETIEN_SITUATION_PRO.SALARIE }} - {{ stats.data.validUsagers.situationPro.retraite }} + {{ stats.data.validUsagers.situationPro.salarie }} @@ -477,7 +477,6 @@

{{ stats.data.validUsagers.situationPro.non_renseigne }} - diff --git a/packages/frontend/src/app/modules/usager-dossier/components/decision-valide-form/decision-valide-form.component.ts b/packages/frontend/src/app/modules/usager-dossier/components/decision-valide-form/decision-valide-form.component.ts index 3860b8fc79..855470d18a 100644 --- a/packages/frontend/src/app/modules/usager-dossier/components/decision-valide-form/decision-valide-form.component.ts +++ b/packages/frontend/src/app/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/packages/frontend/src/app/modules/usager-dossier/components/display-etat-civil-decision/display-etat-civil-decision.component.html b/packages/frontend/src/app/modules/usager-dossier/components/display-etat-civil-decision/display-etat-civil-decision.component.html index 2a6569455e..60eb6dd4df 100644 --- a/packages/frontend/src/app/modules/usager-dossier/components/display-etat-civil-decision/display-etat-civil-decision.component.html +++ b/packages/frontend/src/app/modules/usager-dossier/components/display-etat-civil-decision/display-etat-civil-decision.component.html @@ -31,10 +31,10 @@

-

+ diff --git a/packages/frontend/src/app/modules/usager-dossier/components/step-etat-civil/step-etat-civil.component.html b/packages/frontend/src/app/modules/usager-dossier/components/step-etat-civil/step-etat-civil.component.html index f94eb0dc26..0f0e4762ab 100644 --- a/packages/frontend/src/app/modules/usager-dossier/components/step-etat-civil/step-etat-civil.component.html +++ b/packages/frontend/src/app/modules/usager-dossier/components/step-etat-civil/step-etat-civil.component.html @@ -392,7 +392,7 @@

État civil du demandeur

/> Exemple : BP 102, TSA 11000
-
+

-

+

diff --git a/packages/frontend/src/app/modules/usager-profil/components/pages/profil-general-section/profil-general-section.component.html b/packages/frontend/src/app/modules/usager-profil/components/pages/profil-general-section/profil-general-section.component.html index c18eeddb96..6141c5d718 100644 --- a/packages/frontend/src/app/modules/usager-profil/components/pages/profil-general-section/profil-general-section.component.html +++ b/packages/frontend/src/app/modules/usager-profil/components/pages/profil-general-section/profil-general-section.component.html @@ -311,12 +311,12 @@

Dossier

[usager]="usager" >
-
+
Exemple : BP 102, TSA 11000
-
+
diff --git a/packages/portail-admins/src/app/modules/structure/components/structure-stats/structure-stats.component.spec.ts b/packages/portail-admins/src/app/modules/structure/components/structure-stats/structure-stats.component.spec.ts index 2089a68ebe..cb8192c47f 100644 --- a/packages/portail-admins/src/app/modules/structure/components/structure-stats/structure-stats.component.spec.ts +++ b/packages/portail-admins/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 index 272032393a..f0f0c77d9e 100644 --- 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 @@

Utilisateurs enregistrés: {{ users.length }} utilisateurs

+ + + + Utilisateurs enregistrés: {{ users.length }} utilisateurs " [attr.aria-rowindex]="i + 1" > + {{ user.id }} {{ user.nom }} {{ user.prenom }} {{ user.email }} {{ user.createdAt | date : "d MMMM y" }}