From 087a1ba2de138d3124c36a36dfd847c44d690cf6 Mon Sep 17 00:00:00 2001
From: tykayn <contact@cipherbliss.com>
Date: Tue, 21 Dec 2021 16:45:19 +0100
Subject: [PATCH] fix autoscroll to top on nav change

---
 src/app/app.component.ts                           |  8 ++++----
 .../form/date/list/day/day-list.component.html     | 14 ++++++--------
 .../form/steps/step-four/step-four.component.html  |  9 ++++-----
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 6bbd694d..2501be93 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -32,10 +32,9 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit {
 	public themeClass: string;
 	public isSidebarOpened = false;
 	public devModeEnabled = !environment.production;
-	private themeSubscription: Subscription;
-
 	public environment = environment;
 	public onHomePage = false;
+	private themeSubscription: Subscription;
 
 	constructor(
 		private router: Router,
@@ -71,8 +70,9 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit {
 			console.log('evt', evt);
 
 			this.onHomePage = evt.url === '/';
-
-			window.scrollTo(0, 0);
+			setTimeout(() => {
+				window.scrollTo(0, 0);
+			}, 10);
 		});
 
 		if (!environment.production) {
diff --git a/src/app/features/administration/form/date/list/day/day-list.component.html b/src/app/features/administration/form/date/list/day/day-list.component.html
index fc5a32e0..a12f215e 100644
--- a/src/app/features/administration/form/date/list/day/day-list.component.html
+++ b/src/app/features/administration/form/date/list/day/day-list.component.html
@@ -1,18 +1,16 @@
 <div class="day-list-container">
 	<div
-		class="columns days-list"
+		class="days-list"
 		cdkDropList
 		[ngClass]="{ 'colored-weekend-days': environment.enable_colored_weekend_days }"
 		[cdkDropListData]="dateChoices"
 		(cdkDropListDropped)="dropDayItem($event)"
 	>
-		<div class="column">
-			<div
-				*ngFor="let choice of dateChoices; index as id"
-				class="date-choice"
-				cdkDrag
-				[ngClass]="{ 'day-weekend': isWeekendDay(choice.date_input) }"
-			>
+		<div class="date-choice-container" *ngFor="let choice of dateChoices; index as id">
+			<p>
+				{{ choice.date_object | date: 'short' }}
+			</p>
+			<div class="date-choice" cdkDrag [ngClass]="{ 'day-weekend': isWeekendDay(choice.date_input) }">
 				<!--				<span class="button is-default">-->
 				<!--					<i class="icon fa fa-arrows-v"></i>-->
 				<!--					<span *ngIf="timeSlice.date_object">-->
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 a5280d1a..7bedf69d 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
@@ -40,14 +40,10 @@
 		<section class="same-time-slices">
 			<section class="same-time-slices" *ngIf="pollService.form.value.hasSeveralHours">
 				<h2 class="title is-2">
-					Choisissez les horaires ou options à appliquer à toutes les dates
+					Choisissez les horaires
 				</h2>
 
 				<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"
@@ -115,6 +111,9 @@
 			</div>
 		</div>
 	</div>
+	<p>
+		Appliquer le même horaire / option à toutes les dates
+	</p>
 </div>
 
 <app-nav-steps