From 21fc2d218079ab9087ad35f0045859b45587f513 Mon Sep 17 00:00:00 2001
From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com>
Date: Mon, 23 May 2022 17:03:46 +0200
Subject: [PATCH] fix(form): layout and progress-bar status
---
.../account-newsletter/account-newsletter.component.html | 2 +-
src/app/form/form-view/form-view.component.ts | 7 ++++---
.../personal-offer-accompaniment.component.html | 2 +-
.../personal-offer-training-type.component.html | 2 +-
.../structure-consent/structure-consent.component.html | 2 +-
.../structure-covid-info.component.html | 2 +-
.../structure-description.component.html | 2 +-
.../structure-equipments.component.html | 2 +-
.../structure-hours/structure-hours.component.html | 4 ++--
.../structure-labels/structure-labels.component.html | 2 +-
.../structure-other-services.component.html | 2 +-
.../structure-training-type.component.html | 2 +-
.../structure-web-and-social-network.component.html | 2 +-
13 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/app/form/form-view/account-form/account-newsletter/account-newsletter.component.html b/src/app/form/form-view/account-form/account-newsletter/account-newsletter.component.html
index 6ff4263ab..1b8452463 100644
--- a/src/app/form/form-view/account-form/account-newsletter/account-newsletter.component.html
+++ b/src/app/form/form-view/account-form/account-newsletter/account-newsletter.component.html
@@ -5,7 +5,7 @@
>
<div class="title">
<h3>Souhaitez-vous vous abonner à la lettre d’information de Res'in ?</h3>
- <p class="notRequired" *ngIf="!isEditMode">Facultatif</p>
+ <p *ngIf="!isEditMode">Facultatif</p>
</div>
<app-checkbox-form
[isChecked]="userAcceptNewsletter"
diff --git a/src/app/form/form-view/form-view.component.ts b/src/app/form/form-view/form-view.component.ts
index 967976283..411eca085 100644
--- a/src/app/form/form-view/form-view.component.ts
+++ b/src/app/form/form-view/form-view.component.ts
@@ -1,5 +1,5 @@
-import { Component, OnInit, SimpleChanges } from '@angular/core';
-import { FormGroup, FormControl, Validators, FormArray } from '@angular/forms';
+import { Component, OnInit } from '@angular/core';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
import { forkJoin, of } from 'rxjs';
import { catchError, map } from 'rxjs/operators';
@@ -144,7 +144,8 @@ export class FormViewComponent implements OnInit {
}
if (formType[this.routeParam] === formType.structure) {
if (!this.isEditMode) {
- this.nbSteps = 24;
+ const PAGE_WITHOUT_COUNT_INCREMENT = 2;
+ this.nbSteps = structureFormSteps - PAGE_WITHOUT_COUNT_INCREMENT;
this.currentPage = structureFormStep.structureChoice;
this.currentFormType = formType.structure;
this.structure = new Structure();
diff --git a/src/app/form/form-view/personal-offer-form/personal-offer-accompaniment/personal-offer-accompaniment.component.html b/src/app/form/form-view/personal-offer-form/personal-offer-accompaniment/personal-offer-accompaniment.component.html
index aee6164bf..a145437ce 100644
--- a/src/app/form/form-view/personal-offer-form/personal-offer-accompaniment/personal-offer-accompaniment.component.html
+++ b/src/app/form/form-view/personal-offer-form/personal-offer-accompaniment/personal-offer-accompaniment.component.html
@@ -2,7 +2,7 @@
<div class="title">
<p class="overtitle">{{ structureName }}</p>
<h3>Quelles aides au numérique proposez-vous ?</h3>
- <p class="notRequired">Facultatif</p>
+ <p>Facultatif</p>
</div>
<div fxLayout="column" fxLayoutGap="32px">
diff --git a/src/app/form/form-view/personal-offer-form/personal-offer-training-type/personal-offer-training-type.component.html b/src/app/form/form-view/personal-offer-form/personal-offer-training-type/personal-offer-training-type.component.html
index f6458cd9a..55da9d4e9 100644
--- a/src/app/form/form-view/personal-offer-form/personal-offer-training-type/personal-offer-training-type.component.html
+++ b/src/app/form/form-view/personal-offer-form/personal-offer-training-type/personal-offer-training-type.component.html
@@ -2,7 +2,7 @@
<div class="title">
<p class="overtitle">{{ structureName }}</p>
<h3>Quelles formations au numérique proposez-vous ?</h3>
- <p class="notRequired">Facultatif</p>
+ <p>Facultatif</p>
</div>
<app-training-type-picker
[baseSkills]="personalOfferForm.get('baseSkills').value"
diff --git a/src/app/form/form-view/structure-form/structure-consent/structure-consent.component.html b/src/app/form/form-view/structure-form/structure-consent/structure-consent.component.html
index f0496ea7e..5590c3fae 100644
--- a/src/app/form/form-view/structure-form/structure-consent/structure-consent.component.html
+++ b/src/app/form/form-view/structure-form/structure-consent/structure-consent.component.html
@@ -26,7 +26,7 @@
data.grandlyon.com<span class="asterisk" *ngIf="!isEditMode">**</span
><span class="asterisk" *ngIf="isEditMode">*</span> ?
</h3>
- <p class="notRequired" *ngIf="!isEditMode">Facultatif</p>
+ <p *ngIf="!isEditMode">Facultatif</p>
</div>
</div>
<app-checkbox-form
diff --git a/src/app/form/form-view/structure-form/structure-covid-info/structure-covid-info.component.html b/src/app/form/form-view/structure-form/structure-covid-info/structure-covid-info.component.html
index aaf7f91da..ad503c002 100644
--- a/src/app/form/form-view/structure-form/structure-covid-info/structure-covid-info.component.html
+++ b/src/app/form/form-view/structure-form/structure-covid-info/structure-covid-info.component.html
@@ -9,7 +9,7 @@
></app-svg-icon>
<div class="titleContent">
<h3>Y a-t-il des informations spécifiques à la période COVID ?</h3>
- <p class="notRequired">Facultatif</p>
+ <p>Facultatif</p>
</div>
</div>
<div class="textareaBlock" fxLayout="column">
diff --git a/src/app/form/form-view/structure-form/structure-description/structure-description.component.html b/src/app/form/form-view/structure-form/structure-description/structure-description.component.html
index 88b371d39..b15ecf3c7 100644
--- a/src/app/form/form-view/structure-form/structure-description/structure-description.component.html
+++ b/src/app/form/form-view/structure-form/structure-description/structure-description.component.html
@@ -9,7 +9,7 @@
></app-svg-icon>
<div class="titleContent">
<h3>Pouvez-vous présenter la structure en quelques mots ?</h3>
- <p class="notRequired">Facultatif</p>
+ <p>Facultatif</p>
</div>
</div>
<div class="textareaBlock introduceStructure" fxLayout="column">
diff --git a/src/app/form/form-view/structure-form/structure-equipments/structure-equipments.component.html b/src/app/form/form-view/structure-form/structure-equipments/structure-equipments.component.html
index 771b5c356..b060ca580 100644
--- a/src/app/form/form-view/structure-form/structure-equipments/structure-equipments.component.html
+++ b/src/app/form/form-view/structure-form/structure-equipments/structure-equipments.component.html
@@ -9,7 +9,7 @@
></app-svg-icon>
<div class="titleContent">
<h3>Quel matériel est mis à disposition par la structure ?</h3>
- <p class="notRequired">Facultatif</p>
+ <p>Facultatif</p>
</div>
</div>
<ng-container *ngFor="let equipment of equipmentsAndServices">
diff --git a/src/app/form/form-view/structure-form/structure-hours/structure-hours.component.html b/src/app/form/form-view/structure-form/structure-hours/structure-hours.component.html
index 40cccf9a6..3f2ae9fc9 100644
--- a/src/app/form/form-view/structure-form/structure-hours/structure-hours.component.html
+++ b/src/app/form/form-view/structure-form/structure-hours/structure-hours.component.html
@@ -9,7 +9,7 @@
></app-svg-icon>
<div class="titleContent">
<h3>Quels sont les horaires d'ouverture de la structure ?</h3>
- <p class="notRequired">Facultatif</p>
+ <p>Facultatif</p>
</div>
</div>
<app-hour-picker
@@ -21,7 +21,7 @@
<div class="title secondTitle">
<h3>Avez-vous des précisions à apporter sur les horaires ?</h3>
- <p class="notRequired">Facultatif</p>
+ <p>Facultatif</p>
</div>
<div class="textareaBlock" fxLayout="column">
<textarea
diff --git a/src/app/form/form-view/structure-form/structure-labels/structure-labels.component.html b/src/app/form/form-view/structure-form/structure-labels/structure-labels.component.html
index 47f65e87f..40530a34d 100644
--- a/src/app/form/form-view/structure-form/structure-labels/structure-labels.component.html
+++ b/src/app/form/form-view/structure-form/structure-labels/structure-labels.component.html
@@ -9,7 +9,7 @@
></app-svg-icon>
<div class="titleContent">
<h3>La structure est-elle labellisée ?</h3>
- <p class="notRequired">Facultatif</p>
+ <p>Facultatif</p>
</div>
</div>
<div class="labelsQualifications" *ngIf="labelsQualifications" fxLayout="row wrap" fxLayoutAlign="flex-start">
diff --git a/src/app/form/form-view/structure-form/structure-other-services/structure-other-services.component.html b/src/app/form/form-view/structure-form/structure-other-services/structure-other-services.component.html
index 3b4bc5aae..623537c72 100644
--- a/src/app/form/form-view/structure-form/structure-other-services/structure-other-services.component.html
+++ b/src/app/form/form-view/structure-form/structure-other-services/structure-other-services.component.html
@@ -9,7 +9,7 @@
></app-svg-icon>
<div class="titleContent">
<h3>Quels autres services sont proposés par la structure ?</h3>
- <p class="notRequired">Facultatif</p>
+ <p>Facultatif</p>
</div>
</div>
<div *ngIf="equipmentsAndServices" fxLayout="column wrap" fxLayoutAlign="flex-start" class="otherServices">
diff --git a/src/app/form/form-view/structure-form/structure-training-type/structure-training-type.component.html b/src/app/form/form-view/structure-form/structure-training-type/structure-training-type.component.html
index c7007b058..accbc729b 100644
--- a/src/app/form/form-view/structure-form/structure-training-type/structure-training-type.component.html
+++ b/src/app/form/form-view/structure-form/structure-training-type/structure-training-type.component.html
@@ -9,7 +9,7 @@
></app-svg-icon>
<div class="titleContent">
<h3>Quelles formations au numérique proposez-vous ?</h3>
- <p class="notRequired">Facultatif</p>
+ <p>Facultatif</p>
</div>
</div>
<app-training-type-picker
diff --git a/src/app/form/form-view/structure-form/structure-web-and-social-network/structure-web-and-social-network.component.html b/src/app/form/form-view/structure-form/structure-web-and-social-network/structure-web-and-social-network.component.html
index c6187d89f..c0e2c6a16 100644
--- a/src/app/form/form-view/structure-form/structure-web-and-social-network/structure-web-and-social-network.component.html
+++ b/src/app/form/form-view/structure-form/structure-web-and-social-network/structure-web-and-social-network.component.html
@@ -9,7 +9,7 @@
></app-svg-icon>
<div class="titleContent">
<h3>Comment vous trouver la structure sur internet ?</h3>
- <p class="notRequired">Facultatif</p>
+ <p>Facultatif</p>
</div>
</div>
<div class="collapse" [ngClass]="{ notCollapsed: !showWebsite }">
--
GitLab