src/app/form/form-view/structure-form/structure-digital-helping-accompaniment/structure-digital-helping-accompaniment.component.html

 <form [formGroup]="structureForm" *ngIf="structureForm" (keyup.enter)="isPageValid && !isEditMode ? nextPage() : null">
-  <div class="title">
-    <h3>Quelles aides au numérique propose la structure&nbsp;?</h3>
-    <p>Facultatif</p>
+  <div class="title" [ngClass]="{ editTitle: isEditMode }">
+    <app-svg-icon
+      (click)="goBack()"
+      *ngIf="isEditMode"
+      [iconClass]="'backArrow'"
+      [type]="'ico'"
+      [icon]="'arrowBack'"
+    ></app-svg-icon>
+    <div class="titleContent">
+      <h3>Quelles aides au numérique propose la structure&nbsp;?</h3>
+      <p>Facultatif</p>
+    </div>
   </div>
-
   <div class="btn-grid">
     <span *ngFor="let accompaniment of proceduresAccompaniment.modules">
       <app-button

src/app/form/form-view/structure-form/structure-digital-helping-accompaniment/structure-digital-helping-accompaniment.component.ts

@@ -10,6 +10,7 @@ import { Category } from '../../../../structure-list/models/category.model';
 export class StructureDigitalHelpingAccompanimentComponent implements OnInit {
   @Input() structureForm: FormGroup;
   @Input() proceduresAccompaniment: Category;
+  @Input() isEditMode: boolean;
   @Output() updateChoice = new EventEmitter<any>();
   @Output() validateForm = new EventEmitter<any>();
 
@@ -31,4 +32,7 @@ export class StructureDigitalHelpingAccompanimentComponent implements OnInit {
       return true;
     return false;
   }
+  public goBack(): void {
+    history.back();
+  }
 }

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

 <form [formGroup]="structureForm" (keyup.enter)="(!isEditMode ? '' : null)">
-  <div class="title">
-    <h3>Quel matériel est mis à disposition par la structure&nbsp;?</h3>
-    <p class="notRequired">Facultatif</p>
+  <div class="title" [ngClass]="{ editTitle: isEditMode }">
+    <app-svg-icon
+      (click)="goBack()"
+      *ngIf="isEditMode"
+      [iconClass]="'backArrow'"
+      [type]="'ico'"
+      [icon]="'arrowBack'"
+    ></app-svg-icon>
+    <div class="titleContent">
+      <h3>Quel matériel est mis à disposition par la structure&nbsp;?</h3>
+      <p>Facultatif</p>
+    </div>
   </div>
   <ng-container *ngFor="let equipment of equipmentsAndServices">
     <div
@@ -28,6 +37,8 @@
                 (input)="setValidationsForm()"
                 formControlName="nbComputers"
                 min="0"
+                step="1"
+                max="1000"
                 class="form-input nbEquipment"
                 [(value)]="structureForm.value.nbComputers"
               />
@@ -46,6 +57,8 @@
                 (input)="setValidationsForm()"
                 formControlName="nbTablets"
                 min="0"
+                step="1"
+                max="1000"
                 class="form-input nbEquipment"
                 [(value)]="structureForm.value.nbTablets"
               />
@@ -64,6 +77,8 @@
                 (input)="setValidationsForm()"
                 formControlName="nbPrinters"
                 min="0"
+                step="1"
+                max="1000"
                 class="form-input nbEquipment"
                 [(value)]="structureForm.value.nbPrinters"
               />
@@ -82,6 +97,8 @@
                 (input)="setValidationsForm()"
                 formControlName="nbNumericTerminal"
                 min="0"
+                step="1"
+                max="1000"
                 class="form-input nbEquipment"
                 [(value)]="structureForm.value.nbNumericTerminal"
               />
@@ -100,6 +117,8 @@
                 (input)="setValidationsForm()"
                 formControlName="nbScanners"
                 min="0"
+                step="1"
+                max="1000"
                 class="form-input nbEquipment"
                 [(value)]="structureForm.value.nbScanners"
               />

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

@@ -32,7 +32,9 @@ export class StructureEquipmentsComponent implements OnInit {
     if (equipment === 'imprimantes') field = 'nbPrinters';
 
     if (value === -1 && this.structureForm.value[field] === 0) return;
-    this.getStructureControl(field).setValue(this.structureForm.value[field] + value);
+    if (this.structureForm.value[field] + value < 0) return;
+    this.getStructureControl(field).setValue(Math.round(this.structureForm.value[field] + value));
+    this.validateForm.emit();
   }
 
   public setValidationsForm() {
@@ -48,4 +50,7 @@ export class StructureEquipmentsComponent implements OnInit {
     if (this.vowels.includes(equipment.toLocaleLowerCase()[0])) return `d'${equipment.toLocaleLowerCase()}`;
     return `de ${equipment.toLocaleLowerCase()}`;
   }
+  public goBack(): void {
+    history.back();
+  }
 }

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

 <div class="no-max-width">
   <ng-container *ngIf="currentStep === structureFormStep.structureChoice">
     <app-profile-structure-choice
+      [isEditMode]="isEditMode"
       [structureForm]="structureForm"
       (validateForm)="setValidationsForm()"
       (createStructure)="goToCreateStructure($event)"
     ></app-profile-structure-choice>
   </ng-container>
-  <ng-container *ngIf="currentStep === structureFormStep.structureFormTime" class="no-max-width">
-    <app-information-step
-      [step]="structureFormStep.structureFormTime"
-      [structureName]="structureForm.value.structureName"
-      (goNext)="setValidationsForm()"
-      [formType]="formTypeEnum.structure"
-    ></app-information-step>
-  </ng-container>
-  <ng-container *ngIf="currentStep === structureFormStep.mailSentInfo">
+  <ng-container
+    *ngIf="
+      currentStep === structureFormStep.structureFormTime ||
+      currentStep === structureFormStep.mailSentInfo ||
+      currentStep === structureFormStep.noStructure ||
+      currentStep === structureFormStep.StructureInfoUnknown
+    "
+    class="no-max-width"
+  >
     <app-information-step
-      [step]="structureFormStep.mailSentInfo"
+      [step]="currentStep"
       [structureName]="structureForm.value.structureName"
       (goNext)="setValidationsForm()"
       [formType]="formTypeEnum.structure"
@@ -24,6 +25,7 @@
   </ng-container>
   <div *ngIf="currentStep == structureFormStep.structureNameAndAddress">
     <app-structure-name-and-address
+      [isEditMode]="isEditMode"
       [structureForm]="structureForm"
       (validateForm)="setValidationsForm()"
       (addressStructure)="setAddressStructure($event)"
@@ -31,12 +33,14 @@
   </div>
   <div *ngIf="currentStep == structureFormStep.structureContact">
     <app-structure-contact
+      [isEditMode]="isEditMode"
       [structureForm]="structureForm"
       (validateForm)="setValidationsForm()"
     ></app-structure-contact>
   </div>
   <div *ngIf="currentStep == structureFormStep.structureAccompanimentChoice">
     <app-structure-accompaniment-choice
+      [isEditMode]="isEditMode"
       [structureForm]="structureForm"
       (validateForm)="setValidationsForm()"
       (radioChange)="onRadioChange($event)"
@@ -44,6 +48,7 @@
   </div>
   <div *ngIf="currentStep == structureFormStep.structureChoiceCompletion">
     <app-structure-choice-completion
+      [isEditMode]="isEditMode"
       [structureForm]="structureForm"
       (validateForm)="setValidationsForm()"
       (radioChange)="onRadioChange($event)"
@@ -51,12 +56,14 @@
   </div>
   <div *ngIf="currentStep == structureFormStep.structureContactCompletion">
     <app-structure-contact-completion
+      [isEditMode]="isEditMode"
       [structureForm]="structureForm"
       (validateForm)="setValidationsForm()"
     ></app-structure-contact-completion>
   </div>
   <div *ngIf="currentStep == structureFormStep.structureType">
     <app-structure-type
+      [isEditMode]="isEditMode"
       [structureForm]="structureForm"
       (validateForm)="setValidationsForm()"
       (typeStructure)="setTypeStructure($event)"
@@ -64,6 +71,7 @@
   </div>
   <div *ngIf="currentStep == structureFormStep.structureAccessModality">
     <app-structure-access-modality
+      [isEditMode]="isEditMode"
       [structureForm]="structureForm"
       [accessModality]="accessModality"
       (validateForm)="setValidationsForm()"
@@ -72,6 +80,7 @@
   </div>
   <div *ngIf="currentStep == structureFormStep.structureHours">
     <app-structure-hours
+      [isEditMode]="isEditMode"
       [structureForm]="structureForm"
       [hoursForm]="hoursForm"
       (validateForm)="setValidationsForm()"
@@ -80,10 +89,15 @@
     ></app-structure-hours>
   </div>
   <div *ngIf="currentStep == structureFormStep.structurePmr">
-    <app-structure-pmr [structureForm]="structureForm" (radioChange)="onRadioChange($event)"></app-structure-pmr>
+    <app-structure-pmr
+      [isEditMode]="isEditMode"
+      [structureForm]="structureForm"
+      (radioChange)="onRadioChange($event)"
+    ></app-structure-pmr>
   </div>
   <div *ngIf="currentStep == structureFormStep.structureWebAndSocialNetwork">
     <app-structure-web-and-social-network
+      [isEditMode]="isEditMode"
       [structureForm]="structureForm"
       [showWebsite]="showWebsite"
       [showSocialNetwork]="showSocialNetwork"
@@ -95,6 +109,7 @@
   </div>
   <div *ngIf="currentStep == structureFormStep.structurePublicTarget">
     <app-structure-public-target
+      [isEditMode]="isEditMode"
       [structureForm]="structureForm"
       [publics]="publics"
       (validateForm)="setValidationsForm()"
@@ -104,12 +119,14 @@
   </div>
   <div *ngIf="currentStep == structureFormStep.structureTrainingType">
     <app-structure-training-type
+      [isEditMode]="isEditMode"
       [structureForm]="structureForm"
       (validateForm)="setValidationsForm()"
     ></app-structure-training-type>
   </div>
   <div *ngIf="currentStep == structureFormStep.structureTrainingPrice">
     <app-structure-training-price
+      [isEditMode]="isEditMode"
       [structureForm]="structureForm"
       (validateForm)="setValidationsForm()"
       (radioChange)="onRadioChange($event)"
@@ -117,11 +134,9 @@
   </div>
   <div *ngIf="currentStep == structureFormStep.structureWifi">
     <app-structure-wifi
-      [structureForm]="structureForm"
       [isEditMode]="isEditMode"
-      [isWifiChoosen]="isWifiChoosen"
+      [structureForm]="structureForm"
       (validateForm)="setValidationsForm($event)"
-      (inArray)="isInArray($event)"
       (checkChange)="onCheckChange($event)"
     ></app-structure-wifi>
   </div>
@@ -154,6 +169,7 @@
   </div>
   <div *ngIf="currentStep == structureFormStep.structureDigitalHelpingAccompaniment">
     <app-structure-digital-helping-accompaniment
+      [isEditMode]="isEditMode"
       [structureForm]="structureForm"
       [proceduresAccompaniment]="proceduresAccompaniment"
       (validateForm)="setValidationsForm($event)"
@@ -162,6 +178,7 @@
   </div>
   <div *ngIf="currentStep == structureFormStep.structureDescription">
     <app-structure-description
+      [isEditMode]="isEditMode"
       [structureForm]="structureForm"
       (validateForm)="setValidationsForm($event)"
       [isEditMode]="isEditMode"
@@ -169,9 +186,9 @@
   </div>
   <div *ngIf="currentStep == structureFormStep.structureCovidInfo">
     <app-structure-covid-info
+      [isEditMode]="isEditMode"
       [structureForm]="structureForm"
       (validateForm)="setValidationsForm($event)"
-      [isEditMode]="isEditMode"
     ></app-structure-covid-info>
   </div>
   <div *ngIf="currentStep == structureFormStep.structureConsent">

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

-import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
-import { AbstractControl, FormArray, FormControl, FormGroup, Validators } from '@angular/forms';
+import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
+import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms';
+import { ActivatedRoute } from '@angular/router';
 import { Address } from '../../../models/address.model';
 import { User } from '../../../models/user.model';
 import { ProfileService } from '../../../profile/services/profile.service';
@@ -14,14 +15,16 @@ import { structureFormStep } from './structureFormStep.enum';
   selector: 'app-structure-form',
   templateUrl: './structure-form.component.html',
 })
-export class StructureFormComponent implements OnChanges {
+export class StructureFormComponent implements OnChanges, OnInit {
   @Input() nbSteps: number;
   @Input() currentStep: structureFormStep;
   @Input() structureForm: FormGroup;
   @Input() hoursForm: FormGroup;
+  @Input() isEditMode: boolean;
   @Output() pageValid = new EventEmitter<any>();
   @Output() updateHoursForm = new EventEmitter<any>();
   @Output() isNotExistingStructure = new EventEmitter<any>();
+  @Output() setEditStep = new EventEmitter<any>();
   public structureFormStep = structureFormStep;
   public formTypeEnum = formType;
   public isPageValid: boolean;
@@ -35,8 +38,6 @@ export class StructureFormComponent implements OnChanges {
   public showProceduresAccompaniment: boolean;
 
   // Condition form
-  public isEditMode = false;
-  public isWifiChoosen = null;
   public isClaimMode = false;
   public isAccountMode: boolean = false;
   public userAcceptSavedDate = false;
@@ -50,7 +51,11 @@ export class StructureFormComponent implements OnChanges {
   public publicsAccompaniment: Category;
   public publics: Category;
 
-  constructor(private searchService: SearchService, private profileService: ProfileService) {}
+  constructor(
+    private searchService: SearchService,
+    private profileService: ProfileService,
+    private route: ActivatedRoute
+  ) {}
 
   ngOnChanges(changes: SimpleChanges): void {
     if (changes.currentStep) {
@@ -65,7 +70,8 @@ export class StructureFormComponent implements OnChanges {
         this.currentStep === structureFormStep.structureDescription ||
         this.currentStep === structureFormStep.structureCovidInfo ||
         this.currentStep === structureFormStep.mailSentInfo ||
-        this.currentStep === structureFormStep.structureFormTime
+        this.currentStep === structureFormStep.structureFormTime ||
+        (this.isEditMode && this.currentStep === structureFormStep.structureConsent)
       ) {
         this.pageValid.emit();
       }
@@ -77,9 +83,11 @@ export class StructureFormComponent implements OnChanges {
     this.profileService.getProfile().then((user: User) => {
       this.profile = user;
     });
-    // if (this.isEditMode) {
-    //     this.showCollapse(structure);
-    //   }
+    if (this.isEditMode) {
+      this.route.params.subscribe((params) => {
+        this.setEditStep.emit(structureFormStep[params.step]);
+      });
+    }
   }
 
   public setAddressStructure(address?: Address): void {
@@ -139,46 +147,37 @@ export class StructureFormComponent implements OnChanges {
     } else {
       this.pagesValidation[structureFormStep.structureChoice] = {
         valid: this.structureForm.get('_id').valid,
-        name: 'Structure existe',
       };
       this.pagesValidation[structureFormStep.structureNameAndAddress] = {
         valid: this.structureForm.get('structureName').valid && this.structureForm.get('address').valid,
-        name: 'Nom et adresse',
       };
       this.pagesValidation[structureFormStep.structureContact] = {
         valid: this.structureForm.get('contactMail').valid && this.structureForm.get('contactPhone').valid,
-        name: 'Contact structure',
       };
       this.pagesValidation[structureFormStep.structureAccompanimentChoice] = {
         valid: this.structureForm.get('placeOfReception').valid,
-        name: 'Lieu d accueil',
       };
       this.pagesValidation[structureFormStep.structureChoiceCompletion] = {
-        valid: this.structureForm.get('choiceCompletion').valid,
-        name: 'Completion info structure',
+        valid: this.isEditMode ? true : this.structureForm.get('choiceCompletion').valid,
       };
       this.pagesValidation[structureFormStep.structureContactCompletion] = {
-        valid:
-          this.structureForm.get('contactPersonFirstname').valid &&
-          this.structureForm.get('contactPersonLastname').valid &&
-          this.structureForm.get('contactPersonEmail').valid,
-        name: 'Personne contact informations',
+        valid: this.isEditMode
+          ? true
+          : this.structureForm.get('contactPersonFirstname').valid &&
+            this.structureForm.get('contactPersonLastname').valid &&
+            this.structureForm.get('contactPersonEmail').valid,
       };
       this.pagesValidation[structureFormStep.structureType] = {
         valid: this.structureForm.get('structureType').valid,
-        name: 'Type de structure',
       };
       this.pagesValidation[structureFormStep.structureAccessModality] = {
         valid: this.structureForm.get('accessModality').valid,
-        name: "Modalités d'accueil",
       };
       this.pagesValidation[structureFormStep.structureHours] = {
         valid: this.hoursForm.valid && this.structureForm.get('exceptionalClosures').valid,
-        name: "Horaires d'ouverture",
       };
       this.pagesValidation[structureFormStep.structurePmr] = {
         valid: this.structureForm.get('pmrAccess').valid,
-        name: 'Accessibilité pour les personnes à mobilité réduite',
       };
       this.pagesValidation[structureFormStep.structureWebAndSocialNetwork] = {
         valid:
@@ -187,57 +186,49 @@ export class StructureFormComponent implements OnChanges {
             this.structureForm.get('twitter').valid &&
             this.structureForm.get('instagram').valid) ||
             !this.showSocialNetwork),
-        name: 'Présence sur internet',
       };
       this.pagesValidation[structureFormStep.structurePublicTarget] = {
         valid: this.structureForm.get('publics').valid,
-        name: 'Public admis',
       };
       this.pagesValidation[structureFormStep.structureDigitalHelpingAccompaniment] = {
         valid: this.structureForm.get('proceduresAccompaniment').valid,
-        name: 'Aides au numérique',
       };
 
       this.pagesValidation[structureFormStep.structureTrainingType] = {
         valid: true,
-        name: 'Ateliers au numérique proposés',
       };
       this.pagesValidation[structureFormStep.structureTrainingPrice] = {
         valid: this.structureForm.get('freeWorkShop').valid,
-        name: 'Gratuité des ateliers',
       };
       this.pagesValidation[structureFormStep.structureWifi] = {
-        valid: this.structureForm.get('equipmentsAndServices').valid && this.isWifiChoosen !== null,
-        name: 'Gratuité du wifi',
+        valid: this.structureForm.get('equipmentsAndServices').valid,
       };
       this.pagesValidation[structureFormStep.structureEquipments] = {
-        valid: true,
+        valid:
+          this.structureForm.get('nbComputers').valid &&
+          this.structureForm.get('nbPrinters').valid &&
+          this.structureForm.get('nbTablets').valid &&
+          this.structureForm.get('nbNumericTerminal').valid &&
+          this.structureForm.get('nbScanners').valid,
         name: 'Equipements mis à disposition',
       };
       this.pagesValidation[structureFormStep.structureLabels] = {
         valid: true,
-        name: 'Labélisations proposées',
       };
       this.pagesValidation[structureFormStep.structureOtherServices] = {
         valid: this.structureForm.get('equipmentsAndServices').valid,
-        name: 'Autres services proposés',
       };
       this.pagesValidation[structureFormStep.structureDescription] = {
         valid: true,
-        name: 'Présentation de la structure',
       };
       this.pagesValidation[structureFormStep.structureCovidInfo] = {
         valid: true,
-        name: 'Informations spécifiques à la période COVID',
       };
-      if (this.isEditMode) {
-        this.pagesValidation[structureFormStep.structureConsent] = {
-          valid: this.structureForm.get('dataShareConsentDate').valid,
-          name: 'Partage de données sur data.grandlyon.com',
-        };
-      } else {
-        this.pagesValidation[structureFormStep.structureConsent] = { valid: this.userAcceptSavedDate };
-      }
+
+      this.pagesValidation[structureFormStep.structureConsent] = {
+        valid: !this.isEditMode ? this.userAcceptSavedDate : true,
+      };
+
       this.updatePageValid();
     }
   }
@@ -288,9 +279,6 @@ export class StructureFormComponent implements OnChanges {
     formControlName: string;
     value: string;
   }): void {
-    if (value === 'wifiEnAccesLibre') {
-      this.isWifiChoosen = event;
-    }
     const formArray: FormArray = this.structureForm.get(formControlName) as FormArray;
     if (event) {
       // Add a new control in the arrayForm

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

 <form [formGroup]="structureForm">
-  <div class="title">
-    <h3>Quels sont les horaires d'ouverture de la structure&nbsp;?</h3>
-    <p class="notRequired">Facultatif</p>
+  <div class="title" [ngClass]="{ editTitle: isEditMode }">
+    <app-svg-icon
+      (click)="goBack()"
+      *ngIf="isEditMode"
+      [iconClass]="'backArrow'"
+      [type]="'ico'"
+      [icon]="'arrowBack'"
+    ></app-svg-icon>
+    <div class="titleContent">
+      <h3>Quels sont les horaires d'ouverture de la structure&nbsp;?</h3>
+      <p>Facultatif</p>
+    </div>
   </div>
   <app-hour-picker
     *ngIf="hoursForm"
@@ -12,7 +21,7 @@
 
   <div class="title secondTitle">
     <h3>Avez-vous des précisions à apporter sur les horaires&nbsp;?</h3>
-    <p class="notRequired">Facultatif</p>
+    <p>Facultatif</p>
   </div>
   <div class="textareaBlock" fxLayout="column">
     <textarea

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

@@ -9,6 +9,7 @@ import { FormGroup } from '@angular/forms';
 export class StructureHoursComponent implements OnInit {
   @Input() structureForm: FormGroup;
   @Input() hoursForm: FormGroup;
+  @Input() isEditMode: boolean;
   @Output() hours = new EventEmitter<any>();
   @Output() hoursError = new EventEmitter<any>();
   @Output() validateForm = new EventEmitter<any>();
@@ -23,4 +24,7 @@ export class StructureHoursComponent implements OnInit {
   public setHoursError() {
     this.hoursError.emit();
   }
+  public goBack(): void {
+    history.back();
+  }
 }

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

 <form [formGroup]="structureForm" class="labelStep" (keyup.enter)="(!isEditMode ? '' : null)">
-  <div class="title">
-    <h3>La structure est-elle labellisée&nbsp;?</h3>
-    <p class="notRequired">Facultatif</p>
+  <div class="title" [ngClass]="{ editTitle: isEditMode }">
+    <app-svg-icon
+      (click)="goBack()"
+      *ngIf="isEditMode"
+      [iconClass]="'backArrow'"
+      [type]="'ico'"
+      [icon]="'arrowBack'"
+    ></app-svg-icon>
+    <div class="titleContent">
+      <h3>La structure est-elle labellisée&nbsp;?</h3>
+      <p>Facultatif</p>
+    </div>
   </div>
   <div class="labelsQualifications" *ngIf="labelsQualifications" fxLayout="row wrap" fxLayoutAlign="flex-start">
     <app-checkbox-form

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

@@ -32,4 +32,7 @@ export class StructureLabelsComponent implements OnInit {
       value: modality,
     });
   }
+  public goBack(): void {
+    history.back();
+  }
 }

src/app/form/form-view/structure-form/structure-name-and-address/structure-name-and-address.component.html

 <form [formGroup]="structureForm" *ngIf="structureForm" (keyup.enter)="isPageValid && !isEditMode ? nextPage() : null">
-  <div class="title">
-    <h3>Quelle structure voulez-vous référencer&nbsp;?</h3>
+  <div class="title" [ngClass]="{ editTitle: isEditMode }">
+    <app-svg-icon
+      (click)="goBack()"
+      *ngIf="isEditMode"
+      [iconClass]="'backArrow'"
+      [type]="'ico'"
+      [icon]="'arrowBack'"
+    ></app-svg-icon>
+    <div class="titleContent">
+      <h3>Quelle structure voulez-vous référencer&nbsp;?</h3>
+    </div>
   </div>
-  <!-- TODO : keep edit ? -->
-  <!-- <p
-  class="missing-information"
-  *ngIf="isEditMode && (!getStructureControl('structureName').valid || !getStructureControl('address').valid)"
->
-  <app-svg-icon [iconClass]="'validation'" [type]="'form'" [icon]="'notValidate'" class="validationIcon"></app-svg-icon>
-  <span>Il faut renseigner tous les champs</span>
-</p> -->
   <div class="form-group" fxLayout="column">
     <label for="structureName">Nom de la structure</label>
     <div fxLayout="row" fxLayoutGap="13px">

src/app/form/form-view/structure-form/structure-name-and-address/structure-name-and-address.component.ts

@@ -10,6 +10,7 @@ import { Address } from '../../../../models/address.model';
 })
 export class StructureNameAndAddressComponent implements OnInit {
   @Input() structureForm: FormGroup;
+  @Input() isEditMode: boolean;
   @Output() validateForm = new EventEmitter<any>();
   @Output() addressStructure = new EventEmitter<any>();
 
@@ -24,4 +25,7 @@ export class StructureNameAndAddressComponent implements OnInit {
   public setAddressStructure(address?: Address) {
     this.addressStructure.emit(address);
   }
+  public goBack(): void {
+    history.back();
+  }
 }

src/app/form/form-view/structure-form/structure-other-services/structure-other-services.component.html

 <form [formGroup]="structureForm" (keyup.enter)="(!isEditMode ? '' : null)">
-  <div class="title">
-    <h3>Quels autres services sont proposés par la structure&nbsp;?</h3>
-    <p class="notRequired">Facultatif</p>
+  <div class="title" [ngClass]="{ editTitle: isEditMode }">
+    <app-svg-icon
+      (click)="goBack()"
+      *ngIf="isEditMode"
+      [iconClass]="'backArrow'"
+      [type]="'ico'"
+      [icon]="'arrowBack'"
+    ></app-svg-icon>
+    <div class="titleContent">
+      <h3>Quels autres services sont proposés par la structure&nbsp;?</h3>
+      <p>Facultatif</p>
+    </div>
   </div>
   <div *ngIf="equipmentsAndServices" fxLayout="column wrap" fxLayoutAlign="flex-start" class="otherServices">
     <ng-container *ngFor="let service of equipmentsAndServices">

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

@@ -31,4 +31,7 @@ export class StructureOtherServicesComponent implements OnInit {
       value: modality,
     });
   }
+  public goBack(): void {
+    history.back();
+  }
 }

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

 <form [formGroup]="structureForm" (keyup.enter)="isPageValid && !isEditMode ? nextPage() : null">
-  <div class="title">
-    <h3>La structure est-elle accessible pour les personnes à mobilité réduite&nbsp;?</h3>
+  <div class="title" [ngClass]="{ editTitle: isEditMode }">
+    <app-svg-icon
+      (click)="goBack()"
+      *ngIf="isEditMode"
+      [iconClass]="'backArrow'"
+      [type]="'ico'"
+      [icon]="'arrowBack'"
+    ></app-svg-icon>
+    <div class="titleContent">
+      <h3>La structure est-elle accessible pour les personnes à mobilité réduite&nbsp;?</h3>
+    </div>
   </div>
   <p class="missing-information" *ngIf="isEditMode && !structureForm.get('pmrAccess').valid">
     <app-svg-icon [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" class="validationIcon"></app-svg-icon>

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

@@ -20,4 +20,7 @@ export class StructurePmrComponent implements OnInit {
   public onRadioChange(name: string, value: boolean): void {
     this.radioChange.emit({ name, value });
   }
+  public goBack(): void {
+    history.back();
+  }
 }

src/app/form/form-view/structure-form/structure-public-target/structure-public-target.component.html

 <form [formGroup]="structureForm" *ngIf="structureForm" (keyup.enter)="isPageValid && !isEditMode ? nextPage() : null">
-  <div class="title">
-    <h3>Quel public peut être accueilli dans cette structure&nbsp;?</h3>
-    <p>Plusieurs choix possibles</p>
+  <div class="title" [ngClass]="{ editTitle: isEditMode }">
+    <app-svg-icon
+      (click)="goBack()"
+      *ngIf="isEditMode"
+      [iconClass]="'backArrow'"
+      [type]="'ico'"
+      [icon]="'arrowBack'"
+    ></app-svg-icon>
+    <div class="titleContent">
+      <h3>Quel public peut être accueilli dans cette structure&nbsp;?</h3>
+      <p>Plusieurs choix possibles</p>
+    </div>
   </div>
   <p class="missing-information" *ngIf="isEditMode && !structureForm.get('publics').valid">
     <app-svg-icon [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" class="validationIcon"></app-svg-icon>

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

@@ -10,6 +10,7 @@ import { Category } from '../../../../structure-list/models/category.model';
 export class StructurePublicTargetComponent implements OnInit {
   @Input() structureForm: FormGroup;
   @Input() publics: Category;
+  @Input() isEditMode: boolean;
   @Output() updateChoice = new EventEmitter<any>();
   @Output() validateForm = new EventEmitter<any>();
 
@@ -27,4 +28,7 @@ export class StructurePublicTargetComponent implements OnInit {
     if (this.structureForm.get('publics') && this.structureForm.get('publics').value.includes(choice)) return true;
     return false;
   }
+  public goBack(): void {
+    history.back();
+  }
 }

src/app/form/form-view/structure-form/structure-training-price/structure-training-price.component.html

 <form [formGroup]="structureForm">
-  <div class="title">
-    <h3>Ces formations sont-elles gratuites&nbsp;?</h3>
+  <div class="title" [ngClass]="{ editTitle: isEditMode }">
+    <app-svg-icon
+      (click)="goBack()"
+      *ngIf="isEditMode"
+      [iconClass]="'backArrow'"
+      [type]="'ico'"
+      [icon]="'arrowBack'"
+    ></app-svg-icon>
+    <div class="titleContent">
+      <h3>Ces formations sont-elles gratuites&nbsp;?</h3>
+    </div>
   </div>
   <app-radio-form
     [selectedOption]="getStructureControl('freeWorkShop').value"

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

@@ -7,6 +7,7 @@ import { AbstractControl, FormGroup } from '@angular/forms';
 })
 export class StructureTrainingPriceComponent implements OnInit {
   @Input() structureForm: FormGroup;
+  @Input() isEditMode: boolean;
   @Output() radioChange = new EventEmitter<any>();
   @Output() validateForm = new EventEmitter<any>();
 
@@ -20,4 +21,7 @@ export class StructureTrainingPriceComponent implements OnInit {
   public onRadioChange(name: string, value: boolean): void {
     this.radioChange.emit({ name, value });
   }
+  public goBack(): void {
+    history.back();
+  }
 }