From f66603d18712cf4fc3f4cbbcd4948a274e6e7784 Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Tue, 18 May 2021 10:00:37 +0200
Subject: [PATCH] add validation messages, autofill default values on creation
 of poll

---
 src/app/core/models/poll.model.ts             |  7 +--
 src/app/core/services/poll.service.ts         |  2 +-
 .../base-config/base-config.component.html    | 25 ++++------
 .../administration/form/form.component.ts     | 50 +++++++++++++------
 .../kind-select/kind-select.component.html    |  2 +-
 .../form/errors-list/errors-list.component.ts |  1 +
 src/environments/environment.ts               |  2 +-
 src/styles/partials/_form-controls.scss       | 17 +++++++
 8 files changed, 67 insertions(+), 39 deletions(-)

diff --git a/src/app/core/models/poll.model.ts b/src/app/core/models/poll.model.ts
index 801d1353..6f03ecce 100644
--- a/src/app/core/models/poll.model.ts
+++ b/src/app/core/models/poll.model.ts
@@ -1,8 +1,5 @@
-import { environment } from 'src/environments/environment';
-
 import { Choice } from './choice.model';
 import { Comment } from './comment.model';
-import { PollConfiguration } from './configuration.model';
 import { Owner } from './owner.model';
 import { DateChoice, TimeSlices } from '../../../../mocks/old-stuff/config/defaultConfigs';
 
@@ -17,7 +14,7 @@ export class Poll {
 	public default_expiracy_days_from_now = 60;
 
 	public admin_key: string;
-	public kind: string;
+	public kind = 'date';
 
 	public description?: string;
 	public password?: string;
@@ -51,8 +48,6 @@ export class Poll {
 	public max_count_of_answers?: number = 150;
 	public maxCountOfAnswers?: number = 150;
 
-	// public configuration: PollConfiguration = new PollConfiguration();
-
 	public comments: Comment[] = [];
 
 	public choices: Choice[] = [];
diff --git a/src/app/core/services/poll.service.ts b/src/app/core/services/poll.service.ts
index fe6f159a..1f40cc92 100644
--- a/src/app/core/services/poll.service.ts
+++ b/src/app/core/services/poll.service.ts
@@ -32,7 +32,7 @@ export class PollService implements Resolve<Poll> {
 		private titleService: Title,
 		private toastService: ToastService
 	) {
-		this._poll.next(new Poll());
+		this._poll.next(new Poll(null, 'titre', 'custom-title'));
 	}
 
 	/**
diff --git a/src/app/features/administration/form/base-config/base-config.component.html b/src/app/features/administration/form/base-config/base-config.component.html
index 0159b726..aa686d3c 100644
--- a/src/app/features/administration/form/base-config/base-config.component.html
+++ b/src/app/features/administration/form/base-config/base-config.component.html
@@ -10,27 +10,27 @@
 				[placeholder]="'creation.choose_title_placeholder' | translate"
 				formControlName="title"
 				id="title"
-				autofocus="autofocus"
 				(keyup)="updateSlug()"
 				required="required"
 				#title
 			/>
 			<button
-				mat-button
-				*ngIf="form.value.title"
-				matSuffix
-				mat-icon-button
-				aria-label="Clear"
 				(click)="form.patchValue({ title: '' })"
+				*ngIf="form.value.title"
+				aria-label="Clear"
+				mat-button
+				mat-icon-button
+				matSuffix
+				maxlength="400"
 			>
 				<i class="fa fa-close"></i>
 			</button>
-			<div class="hint" *ngIf="form.controls.title.errors">
-				Ce champ est requis
-			</div>
+			<mat-error class="hint deletable-field-hint" *ngIf="form.controls.title.invalid">{{
+				getErrorMessage(form.controls.title)
+			}}</mat-error>
 
 			<br />
-			<label for="creatorPseudo">
+			<label for="creatorEmail">
 				<span>
 					{{ 'creation.email' | translate }}
 				</span>
@@ -54,12 +54,9 @@
 			>
 				<i class="fa fa-close"></i>
 			</button>
-			<mat-error *ngIf="form.controls.creatorEmail.invalid">{{
+			<mat-error class="hint deletable-field-hint" *ngIf="form.controls.creatorEmail.invalid">{{
 				getErrorMessage(form.controls.creatorEmail)
 			}}</mat-error>
-			<div class="hint" *ngIf="form.controls.creatorEmail.errors">
-				Ce champ est requis
-			</div>
 			<br />
 
 			<p>
diff --git a/src/app/features/administration/form/form.component.ts b/src/app/features/administration/form/form.component.ts
index 837c11cf..901c2829 100644
--- a/src/app/features/administration/form/form.component.ts
+++ b/src/app/features/administration/form/form.component.ts
@@ -9,6 +9,7 @@ import { Router } from '@angular/router';
 import { environment } from '../../../../environments/environment';
 import { PollUtilitiesService } from '../../../core/services/poll.utilities.service';
 import { StorageService } from '../../../core/services/storage.service';
+import { DateUtilitiesService } from '../../../core/services/date.utilities.service';
 
 @Component({
 	selector: 'app-admin-form',
@@ -36,6 +37,7 @@ export class FormComponent implements OnInit {
 		private pollService: PollService,
 		private storageService: StorageService,
 		public apiService: ApiService,
+		public dateUtils: DateUtilitiesService,
 		private router: Router,
 		@Inject(DOCUMENT) private document: any
 	) {}
@@ -103,7 +105,7 @@ export class FormComponent implements OnInit {
 
 		// take back values from pollservice
 		this.form.patchValue(this.pollService.poll);
-		this.form.patchValue({ creatorPseudo: 'Chuck Norris', creatorEmail: 'chucknorris@example.com' });
+		this.setDefaultFormValues();
 
 		if (showDemoValues) {
 			this.setDemoValues();
@@ -115,21 +117,14 @@ export class FormComponent implements OnInit {
 		}
 	}
 
-	/**
-	 * add example values to the form, overrides defaults of PollConfiguration
-	 */
-	setDemoValues(): void {
-		const title = 'le titre de démo oh oh ' + new Date().getTime();
-
-		// this.form.patchValue(this.pollService.poll);
-		// this.form.patchValue({ creatorPseudo: 'Chuck Norris', creatorEmail: 'chucknorris@example.com' });
+	setDefaultFormValues(): void {
+		const dateStart = this.dateUtils.formateDateToInputStringNg(new Date());
+		const dateEnd = this.dateUtils.formateDateToInputStringNg(this.dateUtils.addDaysToDate(5, new Date()));
 
 		this.form.patchValue({
-			title: title,
-			custom_url: this.pollUtilitiesService.makeSlugFromString(title),
-			description: 'répondez SVP <3 ! *-*',
-			creatorPseudo: 'Chuck Norris',
-			creatorEmail: 'chucknorris@example.com',
+			creatorPseudo: 'Anne Onyme',
+			creatorEmail: '',
+			description: 'RSVP',
 			isAboutDate: true,
 			hasSeveralHours: false,
 			kind: 'date',
@@ -147,12 +142,35 @@ export class FormComponent implements OnInit {
 			expiresDaysDelay: 60,
 			maxCountOfAnswers: 150,
 			allowNewDateTime: false,
-			startDateInterval: new Date(),
-			endDateInterval: new Date(),
+			startDateInterval: dateStart,
+			endDateInterval: dateEnd,
 			comments: [],
 		});
 	}
 
+	/**
+	 * add example values to the form, overrides defaults of PollConfiguration
+	 */
+	setDemoValues(): void {
+		const title = 'le titre de démo oh oh ' + new Date().getTime();
+
+		// this.form.patchValue(this.pollService.poll);
+		// this.form.patchValue({ creatorPseudo: 'Chuck Norris', creatorEmail: 'chucknorris@example.com' });
+
+		const dateStart = this.dateUtils.formateDateToInputStringNg(new Date());
+		const dateEnd = this.dateUtils.formateDateToInputStringNg(this.dateUtils.addDaysToDate(5, new Date()));
+
+		console.log('dateStart', dateStart);
+
+		this.form.patchValue({
+			title: title,
+			custom_url: this.pollUtilitiesService.makeSlugFromString(title),
+			description: 'répondez SVP <3 ! *-*',
+			creatorPseudo: 'Chuck Norris',
+			creatorEmail: 'chucknorris@example.com',
+		});
+	}
+
 	goPreviousStep() {
 		alert('todo');
 	}
diff --git a/src/app/features/administration/form/kind-select/kind-select.component.html b/src/app/features/administration/form/kind-select/kind-select.component.html
index 4845628e..3ce51529 100644
--- a/src/app/features/administration/form/kind-select/kind-select.component.html
+++ b/src/app/features/administration/form/kind-select/kind-select.component.html
@@ -3,7 +3,7 @@
 		<div class="kind-of-poll control">
 			<div class="select" *ngIf="template_questions_answers">
 				<!--			version maquette questions réponses-->
-				<select name="type" id="type" class="input" formControlName="kind">
+				<select name="type" id="type" class="input" formControlName="kind" autofocus>
 					<option [value]="'date'">{{ 'creation.kind.date' | translate }}</option>
 					<option [value]="'classic'">{{ 'creation.kind.classic' | translate }}</option>
 				</select>
diff --git a/src/app/features/shared/components/ui/form/errors-list/errors-list.component.ts b/src/app/features/shared/components/ui/form/errors-list/errors-list.component.ts
index b045e5d5..a8cdca9a 100644
--- a/src/app/features/shared/components/ui/form/errors-list/errors-list.component.ts
+++ b/src/app/features/shared/components/ui/form/errors-list/errors-list.component.ts
@@ -15,6 +15,7 @@ export class ErrorsListComponent implements OnInit {
 		this.form.valueChanges.subscribe((data) => {
 			this.getFormValidationErrors();
 		});
+		this.getFormValidationErrors();
 	}
 
 	getFormValidationErrors(): void {
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 0e893209..8db6879e 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -21,7 +21,7 @@ export const environment = {
 	frontDomain: 'http://tktest.lan',
 	production: false,
 	display_routes: false,
-	autofill: true,
+	autofill: false,
 	showDemoWarning: false,
 	autoSendNewPoll: false,
 	interval_days_default: 7,
diff --git a/src/styles/partials/_form-controls.scss b/src/styles/partials/_form-controls.scss
index 204afe07..1d8a4bca 100644
--- a/src/styles/partials/_form-controls.scss
+++ b/src/styles/partials/_form-controls.scss
@@ -11,7 +11,12 @@ textarea {
 	&:hover {
 		color: $primary_color;
 	}
+
+	&.ng-invalid {
+		border: $warning 3px solid !important;
+	}
 }
+
 input[required] {
 	&:after {
 		content: '*';
@@ -72,3 +77,15 @@ textarea {
 .cname {
 	font-weight: bold;
 }
+
+.deletable-field-hint {
+	margin-right: 2.8em;
+	margin-top: -0.7em;
+	-moz-border-radius-bottomright: 1em;
+}
+
+.mat-error {
+	display: block;
+	background: $warning;
+	padding: 1em;
+}