CHANGELOG.md

@@ -4,9 +4,7 @@ All notable changes to this project will be documented in this file. See [standa
 
 ## [2.0.0-beta2](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v2.0.0-beta1.1...v2.0.0-beta2) (2022-05-24)
 
-
 ### Features
-
 * **admin:** administration panel for jobs and employers ([04d4296](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/04d4296b55b72bfd7f0ca0a1496030cbe178caff))
 * **carto:** structure-details component refactor on animation and display. Addition of avatar on form. ([e36c8f7](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/e36c8f7eb0f070ec8e5e67384724695237b7da5b))
 * **carto:** updated behavior to join structure from structure details page ([4852abb](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/4852abb8284b971fedab2c4c4ded802523405f5a))
@@ -21,11 +19,8 @@ All notable changes to this project will be documented in this file. See [standa
 * rework of profile page ([201b18d](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/201b18dee9db7115253da8edf835f05c9da4942f))
 * **structure:** Add structure members in details ([cfb968e](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/cfb968e325bb9d183f2158a95473588f94084f57))
 * **toastr:** New toastr design ([53ec5e6](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/53ec5e623a23ecd62fc4ac1fc4c2a8f9b3e03244))
-
-
+  
 ### Bug Fixes
-
-* add sonar again ([05b5573](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/05b557390ae8f2a53f185fd59dcd0bb8e56aeb49))
 * **carto:** structure-details missing display placeholder and correct link for profile ([f3f6968](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/f3f6968876698e25ef143b9252a0978f41c192f8))
 * **cicd:** job orders ([9e86390](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/9e86390f46e20d4acd0269a2899aa60c310ac937))
 * **cicd:** update deploy dev to deploy V2 only ([212a6d5](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/212a6d5d7e099e0dfb32d930f9b09f12a0afae89))
@@ -38,37 +33,6 @@ All notable changes to this project will be documented in this file. See [standa
 * remove unused component ([22c6f92](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/22c6f92007f179cf998374ae8b1d99c523ce241d))
 * **style:** correct duplicated values ([4b03965](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/4b0396529362ea92ab0dd57a65b3f290f9c1ed49))
 
-### [1.16.3](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v1.16.2...v1.16.3) (2022-03-31)
-
-
-### Bug Fixes
-
-* **orientation:** broken layout ([67c6b23](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/67c6b23945b60b5f0fbc76d50f5b213deab7be61))
-* **orientation:** issue on height ([87f8ea5](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/87f8ea5c59c2dbadb963d7e2fa5359375d47a2d7))
-* **orientation:** map height ([cd75ee2](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/cd75ee22bee5e241624cd200b6e066794faa1634))
-
-### [1.16.2](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v2.0.0-beta1...v1.16.2) (2022-03-31)
-
-
-### Bug Fixes
-
-* **news:** broken layout with double scroll ([44757f6](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/44757f619e9f23535cbf9c2dba502c6066732728))
-
-### [1.16.1](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v1.16.0...v1.16.1) (2022-03-29)
-
-
-### Features
-
-* **posts:** add button to show more ([0211de8](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/0211de8fe54ad9c1b494b824ba59183041b9f91f))
-* **posts:** restore window scroll service ([3a4b521](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/3a4b521cf5106f8175897d2c09a8963d56d279dc))
-
-
-### Bug Fixes
-
-* default limit ([2a9a707](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/2a9a707fc98046d2313b64890485ecaef22439ee))
-* no display if empty post ([44f089f](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/44f089f9819b8d6dedafa39cd470adf38409a67b))
-* **posts:** load more posts with tag (cf. MR !225 ) ([2721c9e](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/2721c9e9f86610e43455a1e6ba9d12415c91f29e))
-* **posts:** remove scroll service from app component ([6a7d319](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/6a7d319061ee4c4ea6e6d4b32a32b86039844e14))
 
 ## [2.0.0-beta1.1](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v2.0.0-beta1...v2.0.0-beta1.1) (2022-04-04)
 
@@ -107,6 +71,68 @@ All notable changes to this project will be documented in this file. See [standa
 * **style:** button hover ([122fcfc](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/122fcfc1412282af29734f33985f375b83606b30))
 * **style:** update button style ([c8ade31](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/c8ade31b7d4f187a2c9cb0db321dd5355e7ebb88))
 
+
+### [1.17.2](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v1.17.1...v1.17.2) (2022-05-30)
+
+
+### Bug Fixes
+
+* **carto:** update demarches labels ([92ec4ab](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/92ec4abb078b0abc3ea65d20a3c6852c776e71d9))
+
+### [1.17.1](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v1.17.0...v1.17.1) (2022-05-30)
+
+
+### Bug Fixes
+
+* **carto:** label orders and label typo ([fd608d3](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/fd608d3ba01d83a27dc5a0b5edde465ed5889dd1))
+
+## [1.17.0](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v1.16.3...v1.17.0) (2022-05-30)
+
+
+### Features
+
+* **admin:** now display last update date next to structure names ([9d80147](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/9d80147c9f19143f24c84541b812e7fefd0ab059))
+* **structures:** add MaisonFranceService to structure types ([177d226](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/177d226e5e301889c4a569e8beffbfa8b82dee67))
+
+
+### Bug Fixes
+
+* add sonar again ([05b5573](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/05b557390ae8f2a53f185fd59dcd0bb8e56aeb49))
+* change resin website placeholder ([4c3f8dd](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/4c3f8dded9911470b060126a3a2694ea85df44f6))
+* **orientation:** wrong result with address on 2 postcodes ([67a2106](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/67a2106ec932b2ce9279dafbb6daf72059be7b14))
+
+### [1.16.3](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v1.16.2...v1.16.3) (2022-03-31)
+
+
+### Bug Fixes
+
+* **orientation:** broken layout ([67c6b23](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/67c6b23945b60b5f0fbc76d50f5b213deab7be61))
+* **orientation:** issue on height ([87f8ea5](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/87f8ea5c59c2dbadb963d7e2fa5359375d47a2d7))
+* **orientation:** map height ([cd75ee2](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/cd75ee22bee5e241624cd200b6e066794faa1634))
+
+### [1.16.2](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v2.0.0-beta1...v1.16.2) (2022-03-31)
+
+
+### Bug Fixes
+
+* **news:** broken layout with double scroll ([44757f6](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/44757f619e9f23535cbf9c2dba502c6066732728))
+
+### [1.16.1](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v1.16.0...v1.16.1) (2022-03-29)
+
+
+### Features
+
+* **posts:** add button to show more ([0211de8](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/0211de8fe54ad9c1b494b824ba59183041b9f91f))
+* **posts:** restore window scroll service ([3a4b521](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/3a4b521cf5106f8175897d2c09a8963d56d279dc))
+
+
+### Bug Fixes
+
+* default limit ([2a9a707](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/2a9a707fc98046d2313b64890485ecaef22439ee))
+* no display if empty post ([44f089f](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/44f089f9819b8d6dedafa39cd470adf38409a67b))
+* **posts:** load more posts with tag (cf. MR !225 ) ([2721c9e](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/2721c9e9f86610e43455a1e6ba9d12415c91f29e))
+* **posts:** remove scroll service from app component ([6a7d319](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/6a7d319061ee4c4ea6e6d4b32a32b86039844e14))
+
 ### [1.16.3](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v1.16.2...v1.16.3) (2022-03-31)
 
 

src/app/form/form-view/form-view.component.ts

@@ -8,6 +8,7 @@ import { Structure } from '../../models/structure.model';
 import { StructureWithOwners } from '../../models/structureWithOwners.model';
 import { User } from '../../models/user.model';
 import { ProfileService } from '../../profile/services/profile.service';
+import { NotificationService } from '../../services/notification.service';
 import { PersonalOfferService } from '../../services/personal-offer.service';
 import { StructureService } from '../../services/structure.service';
 import { MustMatch } from '../../shared/validator/form';
@@ -75,7 +76,8 @@ export class FormViewComponent implements OnInit {
     private route: ActivatedRoute,
     private profileService: ProfileService,
     private structureService: StructureService,
-    private personalOfferService: PersonalOfferService
+    private personalOfferService: PersonalOfferService,
+    private notificationService: NotificationService
   ) {}
 
   async ngOnInit(): Promise<void> {
@@ -342,6 +344,7 @@ export class FormViewComponent implements OnInit {
     let editStructure = this.editForm.value;
     editStructure.hours = this.hoursForm.value;
     this.structureService.editStructure(editStructure).subscribe(() => {
+      this.notificationService.showSuccess('Vos modifications ont bien été prises en compte.', '');
       history.back();
     });
   }

src/app/form/form-view/global-components/information-step/information-step.component.html

@@ -62,7 +62,8 @@
   <div class="information-step-container profile-updated no-max-width">
     <img src="../../assets/form/profileUpdated.svg" alt="image profil" />
     <h3 class="centered">
-      Votre structure ne disposant ni d’accompagnement, ni de formation, elle n’apparaitra pas sur Rés’in.
+      Votre structure ne disposant ni d’accompagnement,&nbsp;ni&nbsp;de formation,&nbsp;elle&nbsp;n’apparaitra pas sur
+      Rés’in.
     </h3>
     <p>Votre profil a bien été mis à jour.</p>
     <div class="btn">

src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.scss

@@ -28,7 +28,7 @@
 }
 
 .scroll {
-  height: 353px;
+  height: 50vh;
   overflow-y: scroll;
   border: 1px solid $grey-6;
   margin: 16px 0px -1px 0px;

src/app/form/form-view/structure-form/structure-contact/structure-contact.component.html

@@ -52,7 +52,7 @@
         [icon]="'validate'"
       ></app-svg-icon>
       <app-svg-icon
-        *ngIf="structureForm.get('contactMail').invalid"
+        *ngIf="structureForm.get('contactMail').invalid && structureForm.get('contactMail').value !== null"
         [iconClass]="'icon-26'"
         [type]="'form'"
         [icon]="'notValidate'"

src/app/form/form-view/structure-form/structure-form.component.ts

@@ -228,7 +228,6 @@ export class StructureFormComponent implements OnChanges, OnInit {
       this.pagesValidation[structureFormStep.structureConsent] = {
         valid: !this.isEditMode ? this.userAcceptSavedDate : true,
       };
-
       this.updatePageValid();
     }
   }

src/app/shared/enum/demarches.enum.ts

 export enum Demarches {
-  accompagnantCaf = 'Caf',
-  carsat = 'Carsat',
-  cpam = 'Cpam',
+  accompagnantCaf = 'CAF',
+  carsat = 'CARSAT',
+  cpam = 'CPAM',
   espacePublicNumeriqueepn = 'Espace public Numérique',
   impots = 'Impôts',
   logement = 'Logements',

src/app/shared/enum/typeStructure.enum.ts

@@ -9,7 +9,7 @@ export enum typeStructureEnum {
   // En attente de suppression remplacer par CAF CARSAT, Pole Emploi et CCAS
   grandOrganismePublic = 'Grand organisme public (CAF, CARSAT, Pôle emploi...)',
 
-  mdm = 'Maison de la métropole',
+  mdm = 'Maison de la Métropole',
   mairie = 'Mairie',
   CAF = 'CAF',
   CCAS = 'CCAS',

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

@@ -268,7 +268,7 @@
               [iconClass]="'icon-40'"
             ></app-svg-icon>
             <div class="info-member">
-              <p class="member">{{ member.name }} {{ member.surname }}</p>
+              <p class="member">{{ member.name | uppercase }} {{ member.surname | titlecase }}</p>
               <p class="job" *ngIf="displayJobEmployer(member)">{{ displayJobEmployer(member) }}</p>
             </div>
           </div>
@@ -286,7 +286,7 @@
         <h2>Aides au numérique</h2>
         <div fxLayout="column">
           <div class="wrapper">
-            <div *ngFor="let accompagnement of structure.proceduresAccompaniment">
+            <div *ngFor="let accompagnement of structure.proceduresAccompaniment.sort()">
               <app-logo-card *ngIf="accompagnement != 'autres'" [name]="accompagnement"></app-logo-card>
             </div>
           </div>

src/styles.scss

@@ -85,7 +85,7 @@ a {
     &::after {
       content: url('/assets/ico/toast-success.svg') !important;
       position: absolute !important;
-      top: 14px !important;
+      top: 5px !important;
       left: 5px !important;
     }
   }
@@ -97,7 +97,7 @@ a {
     &::after {
       content: url('assets/ico/toast-error.svg') !important;
       position: absolute !important;
-      top: 14px !important;
+      top: 5px !important;
       left: 5px !important;
     }
   }