Merge branch '366-1-fiche-structure-page-modification-changement-de-libelles' into 'dev'

fix: fiche-structure-page-modification

See merge request !709

.gitignore

@@ -61,4 +61,7 @@ CHANGELOG.md
 
 # Storybook
 /storybook-static
-documentation.json
\ No newline at end of file
+documentation.json
+
+# .nx
+/.nx

src/app/models/structure.model.ts

 import { StructureCategoryEnum } from '../shared/enum/structureCategory.enum';
 import { StructureCategoryIconEnum } from '../shared/enum/structureCategoryIcon.enum';
 import { Weekday } from '../structure-list/enum/weekday.enum';
+import { FreeWorkshop } from '../structure/enums/freeWorkshop.enum';
 import { Address } from './address.model';
 import { OpeningDay } from './openingDay.model';
 import { PersonalOffer } from './personalOffer.model';
@@ -177,4 +178,12 @@ export class Structure {
       (this.twitter !== null && this.twitter !== '')
     );
   }
+
+  public getFreeWorkshopLabel(): string {
+    const isFree = this.freeWorkShop !== FreeWorkshop.no;
+    const isUnderCondition = this.freeWorkShop === FreeWorkshop.underCondition;
+    const accessStatus = isFree ? 'gratuits' : 'payants';
+    const conditionStatus = isUnderCondition ? ' sous conditions' : '';
+    return `Accompagnements ${accessStatus}${conditionStatus}`;
+  }
 }

src/app/profile/structure-edition-summary/structure-edition-summary.component.html

@@ -277,6 +277,13 @@
           (action)="goToEdit(structureFormStep.structureDigitalHelpingAccompaniment)"
         />
       </div>
+      <app-v3-tag-item
+        *ngIf="containsDigitalHelp()"
+        label="Accompagnements gratuits"
+        size="small"
+        color="red"
+        [clickable]="false"
+      />
       <div class="content">
         <app-no-information *ngIf="!containsDigitalHelp()" />
         <div *ngIf="containsDigitalHelp()" class="list">
@@ -308,6 +315,7 @@
           (action)="goToEdit(structureFormStep.structureDigitalHelpingAccompanimentOther)"
         />
       </div>
+
       <div class="content">
         <app-no-information *ngIf="!structure.otherDescription" />
         <ng-container *ngIf="structure.otherDescription">
@@ -334,6 +342,15 @@
           (action)="goToEdit(structureFormStep.structureTrainingType)"
         />
       </div>
+      <app-v3-tag-item
+        *ngIf="containsDigitalLearning()"
+        wa
+        [label]="structure.getFreeWorkshopLabel()"
+        [size]="'small'"
+        [color]="'red'"
+        [clickable]="false"
+      />
+
       <div class="content">
         <app-no-information *ngIf="!containsDigitalLearning()" />
         <div *ngIf="containsDigitalLearning()" class="formationDetails">

src/app/structure-list/components/structure-details/structure-details.component.html

@@ -281,6 +281,13 @@
       class="onlineDemarch"
     >
       <h2>Aides aux démarches en ligne</h2>
+      <app-v3-tag-item
+        *ngIf="structure.categoriesDisplay.onlineProcedures.length > 0"
+        label="Accompagnements gratuits"
+        size="small"
+        color="red"
+        [clickable]="false"
+      />
       <div class="wrapper">
         <app-logo-card
           *ngFor="let accompagnement of structure.categoriesDisplay.onlineProcedures.sort()"
@@ -296,11 +303,16 @@
     <!-- Compétences numériques -->
     <section *ngIf="hasBaseSkills() || hasAdvancedSkills()" class="digitalSkills">
       <h2>Compétences numériques</h2>
-      <app-v3-tag-item [label]="getFreeWorkshopLabel()" [size]="'small'" [color]="'red'" [clickable]="false" />
-
+      <app-v3-tag-item
+        [label]="structure.getFreeWorkshopLabel()"
+        [size]="'small'"
+        [color]="'red'"
+        [clickable]="false"
+      />
       <!-- BaseSkills-->
       <div *ngIf="hasBaseSkills()" class="skillsContainer">
         <h3 class="titleSkills">Compétences numériques de base</h3>
+
         <ul>
           <li *ngFor="let skill of structure.categoriesDisplay.baseSkills" class="details">{{ skill }}</li>
         </ul>

src/app/structure-list/components/structure-details/structure-details.component.ts

@@ -287,16 +287,6 @@ export class StructureDetailsComponent implements OnInit {
     }
   }
 
-  public multipleWorkshop(): boolean {
-    if (
-      this.structure.categoriesDisplay.baseSkills.length + this.structure.categoriesDisplay.advancedSkills.length >
-      1
-    ) {
-      return true;
-    }
-    return false;
-  }
-
   public goToWebsite(): void {
     let url = this.structure.website;
     if (!url.startsWith('http')) {
@@ -317,16 +307,6 @@ export class StructureDetailsComponent implements OnInit {
     );
   }
 
-  public getFreeWorkshopLabel(): string {
-    const isFree = this.structure.freeWorkShop !== FreeWorkshop.no;
-    const isUnderCondition = this.structure.freeWorkShop === FreeWorkshop.underCondition;
-    const workshopText = this.multipleWorkshop() ? 'ces formations' : 'cette formation';
-    const accessStatus = isFree ? 'gratuit' : 'payant';
-    const conditionStatus = isUnderCondition ? ' sous condition' : '';
-
-    return `L'accès à ${workshopText} est ${accessStatus}${conditionStatus}`;
-  }
-
   public containsHours(): boolean {
     for (const day in this.structure.hours) {
       if (this.structure.hours[day].time.length) return true;