fix(frontend): fix menu mon domifa

SocialGouv · Dec 17, 2024 · 5f3d5c2 · 5f3d5c2
1 parent ab76d76
commit 5f3d5c2
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 28 deletions.
diff --git a/packages/backend/src/_static/custom-docs/courrier_radiation.template.docx b/packages/backend/src/_static/custom-docs/courrier_radiation.template.docx
diff --git a/packages/backend/src/usagers/services/cerfa/get-decision-date.ts b/packages/backend/src/usagers/services/cerfa/get-decision-date.ts
@@ -19,7 +19,8 @@ export const getDecisionDate = (
   }
 
   if (
-    (typeCerfa === "attestation" || typeCerfa === "attestation_future") &&
+    (typeCerfa === CerfaDocType.attestation ||
+      typeCerfa === CerfaDocType.attestation_future) &&
     (usager.decision.statut === "INSTRUCTION" ||
       usager.decision.statut === "ATTENTE_DECISION")
   ) {
@@ -30,7 +31,7 @@ export const getDecisionDate = (
 
     if (
       usager.typeDom === "PREMIERE_DOM" ||
-      typeCerfa === "attestation_future"
+      typeCerfa === CerfaDocType.attestation_future
     ) {
       dateDebut = generateDateForCerfa(new Date());
       dateFin = generateDateForCerfa(subDays(addYears(new Date(), 1), 1));

diff --git a/...l-usagers/components/admin-portail-usagers-menu/admin-portail-usagers-menu.component.html b/...l-usagers/components/admin-portail-usagers-menu/admin-portail-usagers-menu.component.html
@@ -2,7 +2,7 @@
   <div class="container">
     <div class="row">
       <div class="col-md-7 col-12">
-        <h1>Le portail Mon DomiFa, consulter son courrier en ligne</h1>
+        <h1>{{ title }}</h1>
       </div>
       <div class="text-start text-md-end col-12 col-md-5">
         <a
@@ -24,7 +24,7 @@ <h1>Le portail Mon DomiFa, consulter son courrier en ligne</h1>
         routerLink="/portail-usagers/"
         ariaCurrentWhenActive="page"
       >
-        <span class="statut-label">Présentation du portail</span>
+        <span class="statut-label">Présentation du portail Mon DomiFa</span>
         <span class="visually-hidden" *ngIf="section === ''"
           >, onglet actif</span
         >

diff --git a/...ail-usagers/components/admin-portail-usagers-menu/admin-portail-usagers-menu.component.ts b/...ail-usagers/components/admin-portail-usagers-menu/admin-portail-usagers-menu.component.ts
@@ -1,5 +1,4 @@
 import { ChangeDetectionStrategy, Component, Input } from "@angular/core";
-import { UserStructure } from "@domifa/common";
 
 @Component({
   selector: "app-admin-portail-usagers-menu",
@@ -8,6 +7,6 @@ import { UserStructure } from "@domifa/common";
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AdminPortailUsagersMenuComponent {
-  @Input() public section: "" | "parametres" | "informations";
-  @Input() public me!: UserStructure;
+  @Input({ required: true }) public section: "" | "parametres" | "informations";
+  @Input({ required: true }) public title!: string;
 }
diff --git a/...agers/components/manage-structure-information/manage-structure-information.component.html b/...agers/components/manage-structure-information/manage-structure-information.component.html
@@ -1,23 +1,7 @@
-<div class="head-page py-4">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-7 col-12">
-        <h1>Informations diffusées sur le portail Mon DomiFa</h1>
-      </div>
-      <div class="text-start text-md-end col-12 col-md-5">
-        <!-- <a
-          href="https://fabnummas.notion.site/Activer-le-portail-domicili-856ef0d4354244d1a1cebd0bf3806396?pvs=25"
-          target="_blank"
-          class="btn btn-white-primary"
-          rel="noopener noreferrer"
-        >
-          <fa-icon aria-hidden="true" [icon]="['fas', 'info-circle']"></fa-icon>
-          Consulter le guide
-        </a> -->
-      </div>
-    </div>
-  </div>
-</div>
+<app-admin-portail-usagers-menu
+  section="informations"
+  title="Diffuser des informations sur le portail Mon DomiFa"
+></app-admin-portail-usagers-menu>
 
 <div class="content py-3">
   <div class="container py-3">

diff --git a/...n-portail-usagers/components/portail-usagers-params/portail-usagers-params.component.html b/...n-portail-usagers/components/portail-usagers-params/portail-usagers-params.component.html
@@ -1,6 +1,10 @@
 <app-admin-portail-usagers-menu
   [section]="section"
-  [me]="me"
+  [title]="
+    section === ''
+      ? 'Présentation du portail Mon DomiFa'
+      : 'Paramètres du portail Mon DomiFa'
+  "
 ></app-admin-portail-usagers-menu>
 
 <app-landing-page-portail