From 1307b9f1a351bd7036d72610b47849a7859b19a5 Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Wed, 1 Dec 2021 19:00:00 +0100
Subject: [PATCH] only one popup confirm

---
 .../stepper/stepper.component.html            | 33 +++++--------------
 .../stepper/stepper.component.ts              | 21 ++++++++----
 src/assets/i18n/FR.json                       |  1 +
 3 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/src/app/features/administration/stepper/stepper.component.html b/src/app/features/administration/stepper/stepper.component.html
index e6c00e15..296faeb0 100644
--- a/src/app/features/administration/stepper/stepper.component.html
+++ b/src/app/features/administration/stepper/stepper.component.html
@@ -62,34 +62,19 @@
 				<h3 class="step-counter-text">Étape {{ step_current }} sur {{ step_max }}</h3>
 			</div>
 			<div class="column is-narrow has-text-right">
-				<a class="cancel-button" (click)="showCancelDialog()"> Annuler <i class="fa fa-times"></i> </a>
+				<p-button class="cancel-button" (click)="showCancelDialog()">
+					Annuler <i class="fa fa-times"></i>
+				</p-button>
 			</div>
 		</div>
 	</div>
+	<p-confirmDialog
+		[style]="{ width: '50vw' }"
+		key="positionDialog"
+		[baseZIndex]="10000"
+		rejectButtonStyleClass="p-button-outlined"
+	></p-confirmDialog>
 	<div class="step-bar-container" style="width: 100%;">
 		<div class="step-bar-progress" [ngStyle]="{ width: (step_current / step_max) * 100 + '%' }"></div>
 	</div>
-
-	<!--	modale de confirmation pour quitter-->
-	<p-confirmDialog #stepperConfirm [style]="{ width: '50vw' }">
-		<ng-template pTemplate="header">
-			<h3>{{ 'creation.dialog' | translate }}</h3>
-		</ng-template>
-		<ng-template pTemplate="footer">
-			<button
-				type="button"
-				pButton
-				icon="pi pi-times"
-				[label]="'dialogs.no' | translate"
-				(click)="stepperConfirm.reject()"
-			></button>
-			<button
-				type="button"
-				pButton
-				icon="pi pi-check"
-				[label]="'dialogs.yes' | translate"
-				(click)="stepperConfirm.accept()"
-			></button>
-		</ng-template>
-	</p-confirmDialog>
 </section>
diff --git a/src/app/features/administration/stepper/stepper.component.ts b/src/app/features/administration/stepper/stepper.component.ts
index 932ce04d..14609cf2 100644
--- a/src/app/features/administration/stepper/stepper.component.ts
+++ b/src/app/features/administration/stepper/stepper.component.ts
@@ -10,6 +10,9 @@ import { Router } from '@angular/router';
 	styleUrls: ['./stepper.component.scss'],
 })
 export class StepperComponent {
+	@Input()
+	public stepperConfirm: HTMLElement;
+
 	@Input()
 	public step_current: number = 1;
 	@Input()
@@ -20,16 +23,20 @@ export class StepperComponent {
 		public pollService: PollService,
 		private confirmationService: ConfirmationService,
 		private router: Router
-	) {}
+	) {
+		this.step_current = this.pollService.step_current;
+	}
 
 	showCancelDialog() {
 		this.confirmationService.confirm({
-			message: 'Quitter la création de sondage?',
-			header: "Retour à l' accueil",
-			reject: () => {},
-			accept: () => {
-				this.router.navigate(['/']);
-			},
+			header: 'Quitter ?',
+			message: 'Souhaitez-vous vraiment quitter le sondage ? Toutes les informations seront effacées.',
+			accept: () => this.goToHome(),
+			reject: () => console.log('rejected'),
 		});
 	}
+	goToHome() {
+		this.confirmationService.close();
+		this.router.navigate(['/']);
+	}
 }
diff --git a/src/assets/i18n/FR.json b/src/assets/i18n/FR.json
index d3f8edd5..3e6c0f19 100644
--- a/src/assets/i18n/FR.json
+++ b/src/assets/i18n/FR.json
@@ -34,6 +34,7 @@
 		"title": "Créer un sondage",
 		"want": "Choisissez le type de sondage",
 		"dialog": "Quitter la création de sondage?",
+		"dialog_content": "Souhaitez-vous vraiment quitter le sondage ? Toutes les informations seront effacées.",
 		"advanced": "Options avancées",
 		"kind": {
 			"classic": "Propositions",