From 28439b2bc16d1f2d6df7b61383b9287c8ff3a03a Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Fri, 4 Feb 2022 16:13:30 +0100
Subject: [PATCH] list date and time slices in resume step 7

---
 .../step-seven/step-seven.component.html      | 41 ++++++++++++++-----
 src/assets/i18n/EN.json                       |  4 +-
 src/assets/i18n/FR.json                       |  4 +-
 3 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/app/features/administration/form/steps/step-seven/step-seven.component.html b/src/app/features/administration/form/steps/step-seven/step-seven.component.html
index da1ff157..0637cb64 100644
--- a/src/app/features/administration/form/steps/step-seven/step-seven.component.html
+++ b/src/app/features/administration/form/steps/step-seven/step-seven.component.html
@@ -11,11 +11,17 @@
 			<div class="resume">
 				<h3 class="title is-3">{{ 'resume.general' | translate }}</h3>
 				<div class="block-resume">
-					<h3 class="title is-4">
+					<h4 class="title is-4">
 						{{ pollService.form.value.title }}
-					</h3>
+						<i *ngIf="!pollService.form.value.title">
+							(pas de titre)
+						</i>
+					</h4>
 					<p class="description">
 						{{ pollService.form.value.description }}
+						<i *ngIf="!pollService.form.value.description">
+							{{ 'resume.no_description' | translate }}
+						</i>
 					</p>
 					<hr />
 					<div class="go-to-step" [routerLink]="['/administration/step/1']">
@@ -28,7 +34,8 @@
 					{{ pollService.form.value.isAboutDate ? 'Date' : 'Propositions' }}
 					<hr />
 					<div class="go-to-step" [routerLink]="['/administration/step/2']">
-						<i class="fa fa-pencil"></i> {{ 'resume.edit' | translate }}
+						<img class="icon" aria-hidden="true" src="assets/icons/edit.svg" />
+						{{ 'resume.edit' | translate }}
 					</div>
 				</div>
 				<h3 class="title is-3">{{ 'resume.dates_and_hours' | translate }}</h3>
@@ -36,9 +43,14 @@
 					<div class="list-datechoices" *ngIf="pollService.form.value.isAboutDate">
 						<ul *ngFor="let choice of pollService.dateChoiceList">
 							<li>
-								<span class="date">
-									{{ choice.date_object | date: 'E d/M/yyy':'Europe/Paris':'fr_FR' }}
-								</span>
+								<strong class="date">
+									{{ choice.date_object | date: 'E d/M/yyy':'Europe/Paris' }}
+								</strong>
+								<ul *ngFor="let timeSlice of choice.timeSlices">
+									<li>
+										{{ timeSlice.literal }}
+									</li>
+								</ul>
 							</li>
 						</ul>
 					</div>
@@ -51,30 +63,39 @@
 					</div>
 					<hr />
 					<div class="go-to-step" [routerLink]="['/administration/step/3']">
-						<i class="fa fa-pencil"></i> {{ 'resume.edit' | translate }}
+						<img class="icon" aria-hidden="true" src="assets/icons/edit.svg" />
+						{{ 'resume.edit' | translate }}
 					</div>
 				</div>
 				<h3 class="title is-3">{{ 'resume.params_notifs' | translate }}</h3>
 				<div class="block-resume">
 					<div class="password">
-						Protégé par mot de passe: {{ pollService.form.value.isProtectedByPassword ? 'oui' : 'non' }}
+						Protégé par mot de passe: {{ pollService.form.value.password ? 'oui' : 'non' }}
 					</div>
 					<hr />
 					<div class="go-to-step clickable" [routerLink]="['/administration/step/4']">
-						<i class="fa fa-pencil"></i> {{ 'resume.edit' | translate }}
+						<img class="icon" aria-hidden="true" src="assets/icons/edit.svg" />
+						{{ 'resume.edit' | translate }}
 					</div>
 				</div>
 				<h3 class="title is-3">{{ 'resume.owner' | translate }}</h3>
 				<div class="block-resume">
 					<div class="name">
+						<strong>
+							{{ 'SENTENCES.your-name' | translate }}
+						</strong>
 						{{ pollService.form.value.creatorPseudo }}
 					</div>
 					<div class="email">
+						<strong>
+							{{ 'creation.email' | translate }}
+						</strong>
 						{{ pollService.form.value.creatorEmail }}
 					</div>
 					<hr />
 					<div class="go-to-step" [routerLink]="['/administration/step/6']">
-						<i class="fa fa-pencil"></i> {{ 'resume.edit' | translate }}
+						<img class="icon" aria-hidden="true" src="assets/icons/edit.svg" />
+						{{ 'resume.edit' | translate }}
 					</div>
 				</div>
 			</div>
diff --git a/src/assets/i18n/EN.json b/src/assets/i18n/EN.json
index 843e0051..1299c459 100644
--- a/src/assets/i18n/EN.json
+++ b/src/assets/i18n/EN.json
@@ -159,7 +159,9 @@
         "kind": "Kind of poll",
         "dates_and_hours": "My dates and hours",
         "params_notifs": "My notification options",
-        "owner ": "My name and e-mail",
+        "owner": "My name and e-mail",
+				"notifications_vote": "e-mail for each new vote",
+				"notifications_comment": "I will get an mail for each comment",
         "no_description": "No description"
     },
     "success": {
diff --git a/src/assets/i18n/FR.json b/src/assets/i18n/FR.json
index 8d56b23f..8e773a88 100644
--- a/src/assets/i18n/FR.json
+++ b/src/assets/i18n/FR.json
@@ -160,7 +160,9 @@
         "kind": "Type de sondage",
         "dates_and_hours": "Mes dates et horaires",
         "params_notifs": "Mes paramètres et options de notifications",
-        "owner ": "Mon nom et mon adresse e-mail",
+				"notifications_vote": "Je recevrais un e-mail à chaque participation au sondage",
+				"notifications_comment": "Je recevrais un e-mail à chaque nouveau commentaire",
+        "owner": "Mon nom et mon adresse e-mail",
         "no_description": "Pas de description"
     },
     "success": {