From f1403fe2a0c45382a471f3ada0ed86162c2dd858 Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Tue, 30 Nov 2021 18:01:18 +0100
Subject: [PATCH] hide time slices per day select, colors

---
 src/app/core/services/poll.service.ts         |  2 +-
 .../steps/step-four/step-four.component.html  | 99 +++++++++----------
 .../steps/step-four/step-four.component.ts    |  5 +-
 .../steps/step-one/step-one.component.html    |  2 +-
 .../form/steps/step-one/step-one.component.ts |  4 +-
 .../steps/step-six/step-six.component.html    |  6 +-
 .../step-three/step-three.component.html      |  6 +-
 .../steps/step-two/step-two.component.html    | 12 ++-
 .../form/steps/step-two/step-two.component.ts |  1 +
 .../feedback/feedback.component.scss          |  2 +-
 src/environments/environment.ts               |  1 +
 src/styles/partials/_responsive.scss          |  2 +-
 12 files changed, 76 insertions(+), 66 deletions(-)

diff --git a/src/app/core/services/poll.service.ts b/src/app/core/services/poll.service.ts
index f1788d59..fea84371 100644
--- a/src/app/core/services/poll.service.ts
+++ b/src/app/core/services/poll.service.ts
@@ -140,7 +140,7 @@ export class PollService implements Resolve<Poll> {
 			hasMaxCountOfAnswers: [300, [Validators.required]],
 			useVoterUniqueLink: [false, [Validators.required]],
 			voterEmailList: ['', []],
-			hasSeveralHours: [false, []],
+			hasSeveralHours: [true, []],
 			hideResults: [false, []],
 			allowNewDateTime: [true, [Validators.required]],
 		});
diff --git a/src/app/features/administration/form/steps/step-four/step-four.component.html b/src/app/features/administration/form/steps/step-four/step-four.component.html
index 28b55e53..d7bdc4c0 100644
--- a/src/app/features/administration/form/steps/step-four/step-four.component.html
+++ b/src/app/features/administration/form/steps/step-four/step-four.component.html
@@ -2,61 +2,55 @@
 	<div class="min-height">
 		<app-stepper [step_current]="4" [step_max]="pollService.step_max"></app-stepper>
 		<app-errors-list [form]="pollService.form"></app-errors-list>
-		<h2 class="title is-2">
-			Choisissez les horaires
-		</h2>
-		<div
-			class="days-list-having-separated-time-slices rounded-block"
-			*ngFor="let dayChoice of pollService.dateChoiceList; index as day_id"
-		>
-			<div class="heading day-choice">
-				{{ dayChoice.date_object | date }}
+
+		<div class="custom-day-time-slices" *ngIf="environment.creation_display_hour_per_day">
+			<h2 class="title is-2">
+				Choisissez les horaires
+			</h2>
+			<div
+				class="days-list-having-separated-time-slices rounded-block"
+				*ngFor="let dayChoice of pollService.dateChoiceList; index as day_id"
+			>
+				<div class="heading day-choice">
+					{{ dayChoice.date_object | date }}
+				</div>
+
+				<section class="time-slice-list-of-a-day">
+					<div *ngFor="let timeSlice of dayChoice.timeSlices; index as id" class="time-choice padded">
+						<label for="dateChoices_{{ id }}"> Horaire / option {{ id + 1 }} </label>
+						<input
+							class="input is-fullwidth"
+							type="text"
+							id="dateChoices_{{ id }}"
+							[(ngModel)]="timeSlice.literal"
+						/>
+						<button class="button input is-full" (click)="pollService.timeList.splice(id, 1)">
+							<i class="fa fa-trash"></i> supprimer
+						</button>
+					</div>
+					<div class="add-time-choice">
+						<button (click)="addChoiceForDay(dayChoice)">
+							<i class="fa fa-plus"></i>
+							Ajouter horaire / option
+						</button>
+					</div>
+				</section>
 			</div>
-
-			<section class="time-slice-list-of-a-day">
-				<div *ngFor="let timeSlice of dayChoice.timeSlices; index as id" class="time-choice padded">
-					<label for="dateChoices_{{ id }}"> Horaire / option {{ id + 1 }} </label>
-					<input
-						class="input is-fullwidth"
-						type="text"
-						id="dateChoices_{{ id }}"
-						[(ngModel)]="timeSlice.literal"
-					/>
-					<button class="button input is-full" (click)="pollService.timeList.splice(id, 1)">
-						<i class="fa fa-trash"></i> supprimer
-					</button>
-				</div>
-				<div class="add-time-choice">
-					<button (click)="addChoiceForDay(dayChoice)">
-						<i class="fa fa-plus"></i>
-						Ajouter horaire / option
-					</button>
-				</div>
-			</section>
 		</div>
-
 		<section class="same-time-slices">
-			<button class="is-outlined is-primary" (click)="toggleHasSeveralHours()">
-				Appliquer le même horaire / option à toutes les dates
-			</button>
-			<section class="same-time-slices rounded-block" *ngIf="pollService.form.value.hasSeveralHours">
+			<!--			<button class="is-outlined is-primary" (click)="toggleHasSeveralHours()">-->
+			<!--				Appliquer le même horaire / option à toutes les dates-->
+			<!--			</button>-->
+			<section class="same-time-slices" *ngIf="pollService.form.value.hasSeveralHours">
 				<h3 class="title is-3">
 					Choisissez les horaires ou options à appliquer à toutes les dates
 				</h3>
-				<button
-					(click)="pollService.addTime()"
-					*ngIf="false == pollService.allowSeveralHours"
-					class="button is-primary is-block is-fullwidth"
-					id="add_time_button"
-				>
-					<i class="fa fa-plus" aria-hidden="true"></i>
-					{{ 'dates.add_time' | translate }}
-				</button>
 
-				<section class="proposals">
+				<section class="proposals" *ngIf="environment.creation_display_proposals_time_slices">
 					<h3 class="title is-3">
 						Propositions de créneaux horaires
 					</h3>
+
 					<div class="time-slices-proposals rounded-block">
 						<div
 							class="button is-rounded"
@@ -88,6 +82,15 @@
 						(pour chaque jour)
 					</span>
 				</div>
+				<button
+					(click)="pollService.addTime()"
+					*ngIf="false == pollService.allowSeveralHours"
+					class="button is-primary is-block is-fullwidth"
+					id="add_time_button"
+				>
+					<i class="fa fa-plus" aria-hidden="true"></i>
+					{{ 'dates.add_time' | translate }}
+				</button>
 				<button class="is-primary button" (click)="applyTimeSlicesToDateChoices()">
 					Appliquer ces créneaux
 				</button>
@@ -124,11 +127,7 @@
 			</button>
 		</div>
 		<div class="column">
-			<button
-				class="btn is-primary is-fullwidth"
-				[routerLink]="['/administration/step/5']"
-				[disabled]="!pollService.form.valid"
-			>
+			<button class="btn is-primary is-fullwidth" [routerLink]="['/administration/step/5']">
 				Suivant
 			</button>
 		</div>
diff --git a/src/app/features/administration/form/steps/step-four/step-four.component.ts b/src/app/features/administration/form/steps/step-four/step-four.component.ts
index df08b879..01aae011 100644
--- a/src/app/features/administration/form/steps/step-four/step-four.component.ts
+++ b/src/app/features/administration/form/steps/step-four/step-four.component.ts
@@ -14,8 +14,9 @@ import { ToastService } from '../../../../../core/services/toast.service';
 	styleUrls: ['./step-four.component.scss'],
 })
 export class StepFourComponent implements OnInit {
-	urlPrefix: any;
-	advancedDisplayEnabled: boolean = environment.advanced_options_display;
+	public urlPrefix: any;
+	public environment = environment;
+	public advancedDisplayEnabled: boolean = environment.advanced_options_display;
 	@Input()
 	step_max: any;
 	@Input()
diff --git a/src/app/features/administration/form/steps/step-one/step-one.component.html b/src/app/features/administration/form/steps/step-one/step-one.component.html
index 837753d4..e7a5e19e 100644
--- a/src/app/features/administration/form/steps/step-one/step-one.component.html
+++ b/src/app/features/administration/form/steps/step-one/step-one.component.html
@@ -1,6 +1,6 @@
 <div class="step step-container">
 	<form class="min-height" [formGroup]="pollService.form">
-		<app-stepper [step_current]="1" [step_max]="5"></app-stepper>
+		<app-stepper [step_current]="1" [step_max]="pollService.step_max"></app-stepper>
 		<section class="poll-title">
 			<h2 class="title is-2">
 				{{ 'creation.choose_title' | translate }}
diff --git a/src/app/features/administration/form/steps/step-one/step-one.component.ts b/src/app/features/administration/form/steps/step-one/step-one.component.ts
index 731cc56d..8b295c71 100644
--- a/src/app/features/administration/form/steps/step-one/step-one.component.ts
+++ b/src/app/features/administration/form/steps/step-one/step-one.component.ts
@@ -21,7 +21,9 @@ export class StepOneComponent implements OnInit {
 		@Inject(DOCUMENT) private document: any,
 		private router: Router,
 		private confirmationService: ConfirmationService
-	) {}
+	) {
+		this.step_max = this.pollService.step_max;
+	}
 
 	ngOnInit(): void {
 		this.pollService.step_current = 1;
diff --git a/src/app/features/administration/form/steps/step-six/step-six.component.html b/src/app/features/administration/form/steps/step-six/step-six.component.html
index 204fc56a..024b7531 100644
--- a/src/app/features/administration/form/steps/step-six/step-six.component.html
+++ b/src/app/features/administration/form/steps/step-six/step-six.component.html
@@ -22,11 +22,7 @@
 			</button>
 		</div>
 		<div class="column">
-			<button
-				class="btn is-primary is-fullwidth"
-				[routerLink]="['/administration/step/7']"
-				[disabled]="!pollService.form.valid"
-			>
+			<button class="btn is-primary is-fullwidth" [routerLink]="['/administration/step/7']">
 				Suivant
 			</button>
 		</div>
diff --git a/src/app/features/administration/form/steps/step-three/step-three.component.html b/src/app/features/administration/form/steps/step-three/step-three.component.html
index 12a69701..a1140307 100644
--- a/src/app/features/administration/form/steps/step-three/step-three.component.html
+++ b/src/app/features/administration/form/steps/step-three/step-three.component.html
@@ -2,7 +2,11 @@
 	<app-stepper [step_current]="3" [step_max]="pollService.step_max"></app-stepper>
 	<app-errors-list [form]="pollService.form"></app-errors-list>
 	<!--	sélecteur d'interface-->
-	<button class="button" (click)="changeDateInputMode()" [ngClass]="{ 'is-primary': !pollService.mode_calendar }">
+	<button
+		class="button is-fullwidth"
+		(click)="changeDateInputMode()"
+		[ngClass]="{ 'is-primary': !pollService.mode_calendar }"
+	>
 		<span *ngIf="pollService.mode_calendar"> <i class="fa fa-pencil"></i> Saisir les dates manuellement </span>
 		<span *ngIf="!pollService.mode_calendar">
 			<i class="fa fa-calendar-o"></i> Saisir les dates dans le calendrier
diff --git a/src/app/features/administration/form/steps/step-two/step-two.component.html b/src/app/features/administration/form/steps/step-two/step-two.component.html
index f6d7925e..6fab7cc3 100644
--- a/src/app/features/administration/form/steps/step-two/step-two.component.html
+++ b/src/app/features/administration/form/steps/step-two/step-two.component.html
@@ -1,7 +1,7 @@
 <div class="step step-container form-field poll-kind">
 	<form action="#" [formGroup]="pollService.form">
 		<div class="min-height">
-			<app-stepper [step_current]="2" [step_max]="5"></app-stepper>
+			<app-stepper [step_current]="2" [step_max]="pollService.step_max"></app-stepper>
 			<app-errors-list [form]="pollService.form"></app-errors-list>
 			<h2 class="title is-2">
 				{{ 'creation.want' | translate }}
@@ -11,7 +11,10 @@
 					<div class="column">
 						<div
 							class="button input-radio is-fullwidth"
-							[ngClass]="{ 'is-selected is-primary': pollService.form.controls.isAboutDate.value }"
+							[ngClass]="{
+								'is-selected has-background-primary has-text-white':
+									pollService.form.controls.isAboutDate.value
+							}"
 							(click)="pollService.form.controls.isAboutDate.setValue(true)"
 						>
 							<i class="fa fa-calendar"></i>
@@ -24,7 +27,10 @@
 					<div class="column">
 						<div
 							class="button input-radio is-fullwidth"
-							[ngClass]="{ 'is-selected is-primary': !pollService.form.controls.isAboutDate.value }"
+							[ngClass]="{
+								'is-selected has-background-primary has-text-white': !pollService.form.controls
+									.isAboutDate.value
+							}"
 							(click)="pollService.form.controls.isAboutDate.setValue(false)"
 						>
 							<i class="fa fa-list-ul"></i>
diff --git a/src/app/features/administration/form/steps/step-two/step-two.component.ts b/src/app/features/administration/form/steps/step-two/step-two.component.ts
index 8fb0f416..4ee76c93 100644
--- a/src/app/features/administration/form/steps/step-two/step-two.component.ts
+++ b/src/app/features/administration/form/steps/step-two/step-two.component.ts
@@ -40,6 +40,7 @@ export class StepTwoComponent implements OnInit {
 	) {
 		this.form = this.pollService.form;
 		this.pollService.step_current = 2;
+		this.step_max = this.pollService.step_max;
 	}
 
 	get choices(): FormArray {
diff --git a/src/app/shared/components/feedback/feedback.component.scss b/src/app/shared/components/feedback/feedback.component.scss
index e8396b91..dcba8f69 100644
--- a/src/app/shared/components/feedback/feedback.component.scss
+++ b/src/app/shared/components/feedback/feedback.component.scss
@@ -1,5 +1,5 @@
 :host {
-	position: fixed;
+	position: relative;
 	bottom: 4em;
 	left: 1em;
 	color: white;
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index fa314021..2537d590 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -25,6 +25,7 @@ export const environment = {
 	autofill_participation: false,
 	autofill_default_timeslices: false,
 	creation_email_is_required: true,
+	creation_display_proposals_time_slices: false,
 	creation_display_admin_url: false,
 	creation_display_hour_per_day: false, // display or not the ability to choose time slices different per day
 	showDemoWarning: false,
diff --git a/src/styles/partials/_responsive.scss b/src/styles/partials/_responsive.scss
index be1bc3ff..e56f44c4 100644
--- a/src/styles/partials/_responsive.scss
+++ b/src/styles/partials/_responsive.scss
@@ -1,7 +1,7 @@
 // small screens
 @media (min-width: 600px) {
 	.feedback-container {
-		position: fixed;
+		//position: fixed;
 	}
 }
 // wide screen like desktop