From c0ca623885d923c873c7d5796f1f687dfa148f8e Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Mon, 3 May 2021 15:19:06 +0200
Subject: [PATCH] same time span for every day by default, clean config

---
 .../date-select/date-select.component.html    | 11 ++---
 .../administration/form/form.component.html   | 48 ++++++++-----------
 .../administration/form/form.component.ts     |  4 +-
 .../stepper/stepper.component.html            | 12 ++---
 4 files changed, 33 insertions(+), 42 deletions(-)

diff --git a/src/app/features/administration/form/date-select/date-select.component.html b/src/app/features/administration/form/date-select/date-select.component.html
index 48e8753b..f4a2655c 100644
--- a/src/app/features/administration/form/date-select/date-select.component.html
+++ b/src/app/features/administration/form/date-select/date-select.component.html
@@ -57,15 +57,12 @@
 		<button
 			class="btn"
 			[class.is-primary]="form.value.hasSeveralHours"
-			(click)="
-				form.patchValue({
-					configuration: { hasSeveralHours: !form.value.hasSeveralHours }
-				})
-			"
+			(click)="form.patchValue({ hasSeveralHours: !form.value.hasSeveralHours })"
 		>
-			<i class="fa fa-clock-o"></i>
-
+			<i class="fa fa-check-square-o" *ngIf="form.value.hasSeveralHours"></i>
+			<i class="fa fa-square-o" *ngIf="!form.value.hasSeveralHours"></i>
 			<span> horaires avancées</span>
+			<i class="fa fa-clock-o"></i>
 		</button>
 		<div class="is-info notification">
 			<span *ngIf="form.value.hasSeveralHours">
diff --git a/src/app/features/administration/form/form.component.html b/src/app/features/administration/form/form.component.html
index 0e9442fc..df8b1ce7 100644
--- a/src/app/features/administration/form/form.component.html
+++ b/src/app/features/administration/form/form.component.html
@@ -20,34 +20,28 @@
 					<p class="label is-medium">
 						{{ 'creation.want' | translate }}
 					</p>
-					<div class="step-choices" *ngIf="currentStep === 'base'">
-						<app-kind-select [form]="form"></app-kind-select>
-						<app-base-config [form]="form"></app-base-config>
-					</div>
-					<div class="step-choices" *ngIf="currentStep === 'choices'">
-						<app-date-select
-							*ngIf="form.value && form.value.kind == 'date'"
-							[form]="form"
-						></app-date-select>
-						<app-text-select
-							*ngIf="form.value && form.value.kind == 'date'"
-							[form]="form"
-						></app-text-select>
+					<!--					<div class="step-choices" *ngIf="currentStep === 'base'">-->
+					<!--						<app-kind-select [form]="form"></app-kind-select>-->
+					<!--						<app-base-config [form]="form"></app-base-config>-->
+					<!--					</div>-->
+					<!--					<div class="step-choices" *ngIf="currentStep === 'choices'">					</div>-->
+					<app-date-select *ngIf="form.value && form.value.kind == 'date'" [form]="form"></app-date-select>
+					<app-text-select *ngIf="form.value && form.value.kind == 'text'" [form]="form"></app-text-select>
+
+					<button
+						class="btn"
+						[class]="{ 'is-primary': advancedDisplayEnabled, 'is-info': !advancedDisplayEnabled }"
+						(click)="advancedDisplayEnabled = !advancedDisplayEnabled"
+					>
+						<i class="fa fa-save"></i>
+						{{ 'creation.advanced' | translate }}
+					</button>
+					<app-advanced-config
+						[poll]="poll"
+						[form]="form"
+						*ngIf="advancedDisplayEnabled"
+					></app-advanced-config>
 
-						<button
-							class="btn"
-							[class]="{ 'is-primary': advancedDisplayEnabled, 'is-info': !advancedDisplayEnabled }"
-							(click)="advancedDisplayEnabled = !advancedDisplayEnabled"
-						>
-							<i class="fa fa-save"></i>
-							{{ 'creation.advanced' | translate }}
-						</button>
-						<app-advanced-config
-							[poll]="poll"
-							[form]="form"
-							*ngIf="advancedDisplayEnabled"
-						></app-advanced-config>
-					</div>
 					<div class="bar-nav-admin">
 						<div class="columns">
 							<div class="column">
diff --git a/src/app/features/administration/form/form.component.ts b/src/app/features/administration/form/form.component.ts
index c965cb69..05cd56a1 100644
--- a/src/app/features/administration/form/form.component.ts
+++ b/src/app/features/administration/form/form.component.ts
@@ -89,7 +89,7 @@ export class FormComponent implements OnInit {
 			allowComments: [true, [Validators.required]],
 			password: [this.pollUtilitiesService.makeUuid(), [Validators.required]],
 			dateCreated: [creationDate, [Validators.required]],
-			hasSeveralHours: [true, [Validators.required]],
+			hasSeveralHours: [false, [Validators.required]],
 			hasMaxCountOfAnswers: [true, [Validators.required, Validators.min(1)]],
 			startDateInterval: ['', [Validators.required]],
 			endDateInterval: ['', [Validators.required]],
@@ -118,7 +118,7 @@ export class FormComponent implements OnInit {
 			creatorPseudo: 'Chuck Norris',
 			creatorEmail: 'chucknorris@example.com',
 			isAboutDate: true,
-			// hasSeveralHours: true,
+			hasSeveralHours: false,
 			kind: 'date',
 			password: '',
 			whoCanChangeAnswers: 'everybody',
diff --git a/src/app/features/administration/stepper/stepper.component.html b/src/app/features/administration/stepper/stepper.component.html
index 7eb0f8c7..00d5d761 100644
--- a/src/app/features/administration/stepper/stepper.component.html
+++ b/src/app/features/administration/stepper/stepper.component.html
@@ -72,22 +72,22 @@
 					<i class="fa fa-close"></i>
 				</button>
 			</mat-form-field>
-			<mat-checkbox class="is-flex" formControlName="configuration.areResultsPublic">
+			<mat-checkbox class="is-flex" formControlName="areResultsPublic">
 				Les participants pourront consulter les résultats
 			</mat-checkbox>
-			<mat-checkbox class="is-flex" formControlName="configuration.isAboutDate">
+			<mat-checkbox class="is-flex" formControlName="isAboutDate">
 				Les choix possibles concerneront des dates
 			</mat-checkbox>
-			<mat-checkbox class="is-flex" formControlName="configuration.isProtectedByPassword">
+			<mat-checkbox class="is-flex" formControlName="isProtectedByPassword">
 				Le sondage sera protégé par un mot de passe
 			</mat-checkbox>
-			<mat-checkbox class="is-flex" formControlName="configuration.isOwnerNotifiedByEmailOnNewVote">
+			<mat-checkbox class="is-flex" formControlName="isOwnerNotifiedByEmailOnNewVote">
 				Vous recevrez un mail à chaque nouvelle participation
 			</mat-checkbox>
-			<mat-checkbox class="is-flex" formControlName="configuration.isOwnerNotifiedByEmailOnNewComment">
+			<mat-checkbox class="is-flex" formControlName="isOwnerNotifiedByEmailOnNewComment">
 				Vous recevrez un mail à chaque nouveau commentaire
 			</mat-checkbox>
-			<mat-checkbox class="is-flex" formControlName="configuration.isMaybeAnswerAvailable">
+			<mat-checkbox class="is-flex" formControlName="isMaybeAnswerAvailable">
 				La réponse « peut-être » sera disponible
 			</mat-checkbox>