flatten form fields

mocks/old-stuff/config/PollConfig.ts

@@ -40,7 +40,7 @@ export class PollConfig {
 	myEmail: string = environment.production ? '' : 'tktest@tktest.com';
 	myPolls: any = []; // list of retrieved polls from the backend api
 	/*
-     date specific poll, we have the choice to setup different hours (timeList) for all possible dates (dateList), or use the same hours for all dates
+     date specific poll, we have the choice to setup different hours (timeSlices) for all possible dates (dateList), or use the same hours for all dates
     */
 	allowSeveralHours = 'true';
 	// access

src/app/core/models/poll.model.ts

@@ -4,6 +4,7 @@ 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';
 
 export class Poll {
 	public id = 0;
@@ -23,11 +24,18 @@ export class Poll {
 	public creatorEmail?: string;
 
 	public is_archived?: boolean;
+	public is_zero_knowledge?: boolean = false;
+	public allow_comments?: boolean = true;
+	public has_several_hours?: boolean = false;
+
 	public allowSeveralHours?: boolean;
 
 	public archiveNumberOfDays?: number;
+
 	public max_score?: number;
 
+	public max_count_of_answers?: number = 150;
+
 	public configuration: PollConfiguration = new PollConfiguration();
 
 	public comments: Comment[] = [];
@@ -42,9 +50,9 @@ export class Poll {
 
 	public modification_policy = 'everybody';
 
-	public dateChoices: Choice[] = [];
+	public dateChoices: DateChoice[] = [];
 	// sets of days as strings, config to set identical time for days in a special days poll
-	public timeChoices: Choice[] = []; // ranges of time expressed as strings
+	public timeSlices: TimeSlices[] = []; // ranges of time expressed as strings
 	constructor(public owner: Owner = new Owner(), public title = 'mon titre', public custom_url: string = '') {}
 
 	public getAdministrationUrl(): string {

src/app/core/services/poll.service.ts

@@ -14,6 +14,7 @@ import { HttpClient } from '@angular/common/http';
 import { environment } from '../../../environments/environment';
 import { StorageService } from './storage.service';
 import { Title } from '@angular/platform-browser';
+import { TimeSlices } from '../../../../mocks/old-stuff/config/defaultConfigs';
 
 @Injectable({
 	providedIn: 'root',
@@ -200,7 +201,8 @@ export class PollService implements Resolve<Poll> {
 				newpoll[fieldOfForm] = form.value[fieldOfForm];
 			}
 		}
-		newpoll.expiracy_date = form.value.expiracy_date;
+		newpoll.dateChoices = this.storageService.dateList;
+		newpoll.timeSlices = this.storageService.timeSlices;
 
 		console.log('newpoll', newpoll);
 		return newpoll;

src/app/core/services/storage.service.ts

@@ -7,6 +7,12 @@ import { Stack } from '../models/stack.model';
 import { Choice } from '../models/choice.model';
 import { Vote } from '../models/vote.model';
 import { environment } from '../../../environments/environment';
+import {
+	DateChoice,
+	moreTimeOfDay,
+	otherDefaultDates,
+	TimeSlices,
+} from '../../../../mocks/old-stuff/config/defaultConfigs';
 
 @Injectable({
 	providedIn: 'root',
@@ -21,13 +27,19 @@ export class StorageService {
 	@LocalStorage()
 	public userPollsIds: string[];
 
+	@LocalStorage()
+	public dateList: DateChoice[] = otherDefaultDates;
+
+	@LocalStorage()
+	public timeSlices: TimeSlices[] = moreTimeOfDay;
+
 	@LocalStorage()
 	public vote_stack: Stack = new Stack();
 
 	setChoicesForVoteStack(choices_list: Choice[]) {
 		this.vote_stack.votes = [];
 
-		for (let choice of choices_list) {
+		for (const choice of choices_list) {
 			if (environment.autofill) {
 				this.vote_stack.votes.push(new Vote(choice.id, 'yes'));
 			} else {
@@ -37,7 +49,7 @@ export class StorageService {
 	}
 
 	toggleAnswer(choice_id: number, value: string) {
-		for (let vote of this.vote_stack.votes) {
+		for (const vote of this.vote_stack.votes) {
 			if (vote.choice_id == choice_id) {
 				if (vote.value == value) {
 					vote.value = '';
@@ -49,7 +61,7 @@ export class StorageService {
 	}
 
 	choiceHasAnswerOfValue(choice_id: number, value: any) {
-		for (let vote of this.vote_stack.votes) {
+		for (const vote of this.vote_stack.votes) {
 			if (vote.choice_id == choice_id) {
 				if (vote.value == value) {
 					return true;

src/app/features/administration/form/advanced-config/advanced-config.component.html

@@ -148,7 +148,7 @@
 			Nombre de réponses limitées à ce nombre
 		</mat-checkbox>
 		<input
-			*ngIf="form.value.configuration.hasMaxCountOfAnswers"
+			*ngIf="form.value.hasMaxCountOfAnswers"
 			#maxCountOfAnswers
 			id="maxCountOfAnswers"
 			matInput

src/app/features/administration/form/date-select/date-select.component.html

@@ -43,10 +43,10 @@
 	<div class="dates-list">
 		<button
 			class="btn"
-			[class.is-primary]="form.value.configuration.hasSeveralHours"
+			[class.is-primary]="form.value.hasSeveralHours"
 			(click)="
 				form.patchValue({
-					configuration: { hasSeveralHours: !form.value.configuration.hasSeveralHours }
+					configuration: { hasSeveralHours: !form.value.hasSeveralHours }
 				})
 			"
 		>
@@ -55,10 +55,10 @@
 			<span> horaires avancées</span>
 		</button>
 		<div class="is-info notification">
-			<span *ngIf="form.value.configuration.hasSeveralHours">
+			<span *ngIf="form.value.hasSeveralHours">
 				Chaque jour aura ses plages de temps personnalisées
 			</span>
-			<span *ngIf="!form.value.configuration.hasSeveralHours">
+			<span *ngIf="!form.value.hasSeveralHours">
 				Tous les jours auront les mêmes plages de temps
 			</span>
 		</div>
@@ -68,7 +68,7 @@
 				<div class="column has-text-right">
 					<button
 						(click)="addTime()"
-						*ngIf="!form.value.configuration.hasSeveralHours"
+						*ngIf="!form.value.hasSeveralHours"
 						class="btn btn--primary"
 						id="add_time_button"
 					>
@@ -79,7 +79,7 @@
 					</button>
 					<button
 						(click)="removeAllTimes()"
-						*ngIf="form.value.configuration.hasSeveralHours"
+						*ngIf="form.value.hasSeveralHours"
 						class="btn btn--warning"
 						id="remove_time_button"
 					>
@@ -90,7 +90,7 @@
 					</button>
 					<button
 						(click)="resetTimes()"
-						*ngIf="form.value.configuration.hasSeveralHours"
+						*ngIf="form.value.hasSeveralHours"
 						class="btn btn--warning"
 						id="reset_time_button"
 					>
@@ -101,7 +101,7 @@
 					</button>
 				</div>
 			</div>
-			<div class="range-time" *ngIf="!form.value.configuration.hasSeveralHours">
+			<div class="range-time" *ngIf="!form.value.hasSeveralHours">
 				<h2>
 					<span class="count-dates-txt">
 						{{ 'dates.count_time' | translate }}
@@ -182,12 +182,12 @@
 						</button>
 						<button
 							(click)="addTimeToDate(choice, id)"
-							*ngIf="form.value.configuration.hasSeveralHours"
+							*ngIf="form.value.hasSeveralHours"
 							class="btn btn--primary"
 						>
 							{{ 'dates.add_time' | translate }}
 						</button>
-						<div *ngIf="form.value.configuration.hasSeveralHours" class="several-times">
+						<div *ngIf="form.value.hasSeveralHours" class="several-times">
 							plage horaire distincte
 							<br />
 							<div *ngFor="let timeItem of choice.timeList; index as idTime" class="time-choice">

src/app/features/administration/form/date-select/date-select.component.ts

@@ -15,6 +15,7 @@ import {
 } from '../../../../../../mocks/old-stuff/config/defaultConfigs';
 import { CdkDragDrop, moveItemInArray, transferArrayItem } from '@angular/cdk/drag-drop';
 import { TranslateService } from '@ngx-translate/core';
+import { StorageService } from '../../../../core/services/storage.service';
 
 @Component({
 	selector: 'app-date-select',
@@ -32,8 +33,8 @@ export class DateSelectComponent implements OnInit {
 	endDateInterval: string;
 	intervalDays: any;
 	intervalDaysDefault = 7;
-	dateList: DateChoice[] = otherDefaultDates; // sets of days as strings, config to set identical time for days in a special days poll
-	timeList: TimeSlices[] = moreTimeOfDay; // ranges of time expressed as strings
+	dateList: DateChoice[]; // sets of days as strings, config to set identical time for days in a special days poll
+	timeList: TimeSlices[]; // ranges of time expressed as strings
 	dateCalendarEnum: Date[] = [new Date('02/09/2021')];
 	selectionKind = 'range';
 
@@ -45,10 +46,14 @@ export class DateSelectComponent implements OnInit {
 		private pollService: PollService,
 		public dateUtilities: DateUtilitiesService,
 		private apiService: ApiService,
+		private storageService: StorageService,
 		private router: Router,
 		private translateService: TranslateService,
 		@Inject(DOCUMENT) private document: any
-	) {}
+	) {
+		this.dateList = this.storageService.dateList;
+		this.timeList = this.storageService.timeSlices;
+	}
 
 	ngOnInit(): void {
 		// this.setDefaultDatesForInterval();
@@ -249,7 +254,7 @@ export class DateSelectComponent implements OnInit {
 	}
 
 	dropTimeItem(event: any) {
-		// moveItemInArray(this.timeList, event.previousIndex, event.currentIndex);
+		// moveItemInArray(this.timeSlices, event.previousIndex, event.currentIndex);
 		if (event.previousContainer === event.container) {
 			moveItemInArray(event.container.data, event.previousIndex, event.currentIndex);
 		} else {

src/app/features/administration/form/form.component.html

@@ -37,10 +37,7 @@
 					</div>
 
 					<app-base-config [form]="form"></app-base-config>
-					<app-date-select
-						*ngIf="form.value.configuration && form.value.kind == 'date'"
-						[form]="form"
-					></app-date-select>
+					<app-date-select *ngIf="form.value && form.value.kind == 'date'" [form]="form"></app-date-select>
 					<app-text-select *ngIf="!form.value.kind == 'date'" [form]="form"></app-text-select>
 
 					<button

src/app/features/administration/form/form.component.ts

@@ -42,7 +42,7 @@ export class FormComponent implements OnInit {
 		const creationDate = new Date();
 
 		this.form = this.fb.group({
-			title: ['', [Validators.required, Validators.minLength(12)]],
+			title: ['', [Validators.required, Validators.minLength(5)]],
 			creatorPseudo: ['', [Validators.required]],
 			creatorEmail: ['', [Validators.required]],
 			custom_url: [this.pollUtilitiesService.makeUuid(), [Validators.required]],
@@ -64,30 +64,28 @@ export class FormComponent implements OnInit {
 					]),
 				}),
 			]),
+			// these time choice are meant to be the same for each day
 			timeChoices: this.fb.array([
 				this.fb.group({
 					label: ['', [Validators.required]],
 				}),
 			]),
 			kind: ['', [Validators.required]],
-			configuration: this.fb.group({
-				areResultsPublic: [true, [Validators.required]],
-				whoCanChangeAnswers: ['everybody', [Validators.required]],
-				isProtectedByPassword: [false, [Validators.required]],
-				isOwnerNotifiedByEmailOnNewVote: [false, [Validators.required]],
-				isOwnerNotifiedByEmailOnNewComment: [false, [Validators.required]],
-				isMaybeAnswerAvailable: [false, [Validators.required]],
-
-				isAboutDate: [true, [Validators.required]],
-				isZeroKnoledge: [false, [Validators.required]],
-				expiresDaysDelay: [60, [Validators.required, Validators.min(1)]],
-				maxCountOfAnswers: [150, [Validators.required, Validators.min(1)]],
-				allowComments: [true, [Validators.required]],
-				password: [this.pollUtilitiesService.makeUuid(), [Validators.required]],
-				dateCreated: [creationDate, [Validators.required]],
-				hasSeveralHours: [true, [Validators.required]],
-				hasMaxCountOfAnswers: [true, [Validators.required, Validators.min(1)]],
-			}),
+			areResultsPublic: [true, [Validators.required]],
+			whoCanChangeAnswers: ['everybody', [Validators.required]],
+			isProtectedByPassword: [false, [Validators.required]],
+			isOwnerNotifiedByEmailOnNewVote: [false, [Validators.required]],
+			isOwnerNotifiedByEmailOnNewComment: [false, [Validators.required]],
+			isMaybeAnswerAvailable: [false, [Validators.required]],
+			isAboutDate: [true, [Validators.required]],
+			isZeroKnoledge: [false, [Validators.required]],
+			expiresDaysDelay: [60, [Validators.required, Validators.min(1)]],
+			maxCountOfAnswers: [150, [Validators.required, Validators.min(1)]],
+			allowComments: [true, [Validators.required]],
+			password: [this.pollUtilitiesService.makeUuid(), [Validators.required]],
+			dateCreated: [creationDate, [Validators.required]],
+			hasSeveralHours: [true, [Validators.required]],
+			hasMaxCountOfAnswers: [true, [Validators.required, Validators.min(1)]],
 			startDateInterval: ['', [Validators.required]],
 			endDateInterval: ['', [Validators.required]],
 		});
@@ -111,22 +109,19 @@ export class FormComponent implements OnInit {
 		this.form.patchValue({
 			title: title,
 			custom_url: this.pollUtilitiesService.makeSlugFromString(title),
-			description: 'répondez SVP <3 ! *-* ',
+			description: 'répondez SVP <3 ! *-*',
 			creatorPseudo: 'Chuck Norris',
 			creatorEmail: 'chucknorris@example.com',
 			isAboutDate: true,
 			// hasSeveralHours: true,
 			kind: 'date',
-			// TODO aplatir les contrôles
-			configuration: {
-				whoCanChangeAnswers: 'everybody',
-				isProtectedByPassword: false,
-				isOwnerNotifiedByEmailOnNewVote: false,
-				isOwnerNotifiedByEmailOnNewComment: false,
-				isMaybeAnswerAvailable: false,
-				areResultsPublic: true,
-				expiresDaysDelay: 60,
-			},
+			whoCanChangeAnswers: 'everybody',
+			isProtectedByPassword: false,
+			isOwnerNotifiedByEmailOnNewVote: false,
+			isOwnerNotifiedByEmailOnNewComment: false,
+			isMaybeAnswerAvailable: false,
+			areResultsPublic: true,
+			expiresDaysDelay: 60,
 			comments: [],
 			choices: [
 				{

src/app/features/administration/form/kind-select/kind-select.component.html

@@ -13,7 +13,7 @@
 				<div class="column">
 					<button
 						class="btn-block btn"
-						[ngClass]="{ 'is-primary': form.value.configuration.isAboutDate }"
+						[ngClass]="{ 'is-primary': form.value.isAboutDate }"
 						(click)="
 							form.patchValue({
 								configuration: {
@@ -29,7 +29,7 @@
 				<div class="column">
 					<button
 						class="btn-block btn btn-default"
-						[ngClass]="{ 'is-primary': !form.value.configuration.isAboutDate }"
+						[ngClass]="{ 'is-primary': !form.value.isAboutDate }"
 						(click)="
 							form.patchValue({
 								configuration: {