From fbe2999413bebed5bd0d0bbdf4078d43532c401f Mon Sep 17 00:00:00 2001
From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com>
Date: Thu, 8 Apr 2021 10:50:30 +0200
Subject: [PATCH] feat(form): move email section

---
 src/app/form/form.component.html | 39 ++++++++++++++++----------------
 src/app/form/form.component.ts   |  7 +++---
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/app/form/form.component.html b/src/app/form/form.component.html
index d0d588e89..8d597b936 100644
--- a/src/app/form/form.component.html
+++ b/src/app/form/form.component.html
@@ -331,7 +331,7 @@
       </div>
       <div *ngIf="currentPage == pageTypeEnum.structurePhone" class="page">
         <div class="title">
-          <h3>Quel numéro appeler pour joindre votre structure ?</h3>
+          <h3>Comment joindre votre structure ?</h3>
         </div>
         <div class="form-group" fxLayout="column">
           <label for="contactPhone">Téléphone de la structure</label>
@@ -356,6 +356,24 @@
             ></app-svg-icon>
           </div>
         </div>
+        <div class="form-group" fxLayout="column">
+          <label for="structureName">Courriel de la structure</label>
+          <div fxLayout="row" fxLayoutGap="13px">
+            <input type="text" (input)="setValidationsForm()" formControlName="contactMail" class="form-input" />
+            <app-svg-icon
+              *ngIf="getStructureControl('contactMail').valid"
+              [iconClass]="'validation'"
+              [type]="'form'"
+              [icon]="'validate'"
+            ></app-svg-icon>
+            <app-svg-icon
+              *ngIf="getStructureControl('contactMail').invalid && getStructureControl('contactMail').value"
+              [iconClass]="'validation'"
+              [type]="'form'"
+              [icon]="'notValidate'"
+            ></app-svg-icon>
+          </div>
+        </div>
       </div>
       <div *ngIf="currentPage == pageTypeEnum.structureType" class="page" fxLayout="column">
         <div class="title">
@@ -433,24 +451,7 @@
       <div *ngIf="currentPage == pageTypeEnum.structureWebAndSocialNetwork" class="page">
         <div class="title">
           <h3>Comment vous trouver sur internet ?</h3>
-        </div>
-        <div class="form-group" fxLayout="column">
-          <label for="structureName">Courriel de la structure</label>
-          <div fxLayout="row" fxLayoutGap="13px">
-            <input type="text" (input)="setValidationsForm()" formControlName="contactMail" class="form-input" />
-            <app-svg-icon
-              *ngIf="getStructureControl('contactMail').valid"
-              [iconClass]="'validation'"
-              [type]="'form'"
-              [icon]="'validate'"
-            ></app-svg-icon>
-            <app-svg-icon
-              *ngIf="getStructureControl('contactMail').invalid && getStructureControl('contactMail').value"
-              [iconClass]="'validation'"
-              [type]="'form'"
-              [icon]="'notValidate'"
-            ></app-svg-icon>
-          </div>
+          <p class="notRequired">facultatif</p>
         </div>
         <div class="collapse" [ngClass]="{ notCollapsed: !showWebsite }">
           <div fxLayout="column">
diff --git a/src/app/form/form.component.ts b/src/app/form/form.component.ts
index 10a41c2d9..7666a8583 100644
--- a/src/app/form/form.component.ts
+++ b/src/app/form/form.component.ts
@@ -470,8 +470,8 @@ export class FormComponent implements OnInit {
         name: 'Nom et adresse',
       };
       this.pagesValidation[PageTypeEnum.structurePhone] = {
-        valid: this.getStructureControl('contactPhone').valid,
-        name: 'Téléphone',
+        valid: this.getStructureControl('contactMail').valid && this.getStructureControl('contactPhone').valid,
+        name: 'Contact structure',
       };
       this.pagesValidation[PageTypeEnum.structureType] = {
         valid: this.getStructureControl('structureType').valid,
@@ -479,7 +479,7 @@ export class FormComponent implements OnInit {
       };
       this.pagesValidation[PageTypeEnum.structureAccessModality] = {
         valid: this.getStructureControl('accessModality').valid,
-        name: "Modalités d'accueil ",
+        name: "Modalités d'accueil",
       };
       this.pagesValidation[PageTypeEnum.structureHours] = { valid: this.hoursForm.valid, name: "Horaires d'ouverture" };
       this.pagesValidation[PageTypeEnum.structureHoursDetails] = {
@@ -492,7 +492,6 @@ export class FormComponent implements OnInit {
       };
       this.pagesValidation[PageTypeEnum.structureWebAndSocialNetwork] = {
         valid:
-          this.getStructureControl('contactMail').valid &&
           (this.getStructureControl('website').valid || !this.showWebsite) &&
           ((this.getStructureControl('facebook').valid &&
             this.getStructureControl('twitter').valid &&
-- 
GitLab