diff --git a/src/app/core/services/poll.service.ts b/src/app/core/services/poll.service.ts index e5ec3eba..3c37f592 100644 --- a/src/app/core/services/poll.service.ts +++ b/src/app/core/services/poll.service.ts @@ -96,7 +96,7 @@ export class PollService implements Resolve { isProtectedByPassword: false, richTextMode: false, areResultsPublic: true, - expiracyNumberOfDays: 60, + expiresDaysDelay: environment.expiresDaysDelay, }); this.automaticSlug(); } @@ -122,7 +122,7 @@ export class PollService implements Resolve { whoModifiesAnswers: ['', [Validators.required]], whoCanChangeAnswers: ['', [Validators.required]], isAboutDate: [true, [Validators.required]], - expiresDaysDelay: [60, []], + expiresDaysDelay: [environment.expiresDaysDelay, []], maxCountOfAnswers: [300, []], isZeroKnoledge: [false, [Validators.required]], isProtectedByPassword: [false, [Validators.required]], @@ -137,7 +137,7 @@ export class PollService implements Resolve { hasMaxCountOfAnswers: [300, [Validators.required]], useVoterUniqueLink: [false, [Validators.required]], voterEmailList: ['', []], - allowNewDateTime: [60, [Validators.required, Validators.min(0)]], + allowNewDateTime: [true, [Validators.required]], }); this.form = form; return form; @@ -159,7 +159,7 @@ export class PollService implements Resolve { isProtectedByPassword: false, richTextMode: false, areResultsPublic: true, - expiresDayDelay: 60, + expiresDaysDelay: environment.expiresDaysDelay, maxCountOfAnswers: 300, voterEmailList: '', password: '', @@ -395,8 +395,6 @@ export class PollService implements Resolve { return this.apiService.createPoll(newpoll).then( (resp: any) => { console.log('poll created resp', resp); - console.log('TODO fill admin_key'); - console.log('resp', resp); this.admin_key = resp.data.poll.admin_key; this.storageService.userPolls.push(resp.data.poll); }, 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 edca8077..3c589228 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 @@ -21,8 +21,13 @@ export class StepFourComponent implements OnInit { ngOnInit(): void {} createPoll() { - this.pollService.createPoll().then((resp) => { - this.router.navigate(['administration/success']); - }); + this.pollService.createPoll().then( + (resp) => { + this.router.navigate(['administration/success']); + }, + (err) => { + console.error('oops err', err); + } + ); } } diff --git a/src/app/features/administration/success/success.component.html b/src/app/features/administration/success/success.component.html index 0076de43..a7b388f7 100644 --- a/src/app/features/administration/success/success.component.html +++ b/src/app/features/administration/success/success.component.html @@ -42,12 +42,18 @@ Voir le sondage coté administrateur·ice
-

- Note : Le sondage sera supprimé - {{ pollService.form.value.default_expiracy_days_from_now }} jours après la date de sa +

+ Note : Le sondage sera supprimé + {{ pollService.form.value.expiresDaysDelay }} jours après la date de sa dernière modification. - - Le {{ pollService.form.value.expiracy_date | date: 'short' }} + + Le + {{ + pollService.DateUtilitiesService.addDaysToDate( + pollService.form.value.expiresDaysDelay, + today + ) | date: 'short' + }}

diff --git a/src/app/features/administration/success/success.component.ts b/src/app/features/administration/success/success.component.ts index 41af1f86..eb1eb58c 100644 --- a/src/app/features/administration/success/success.component.ts +++ b/src/app/features/administration/success/success.component.ts @@ -15,6 +15,7 @@ export class SuccessComponent { mailToRecieve: string; window: any = window; environment = environment; + today: Date = new Date(); constructor(public pollService: PollService, private dateUtils: DateUtilitiesService, private titleService: Title) { this.titleService.setTitle( environment.appTitle + ' - 🎉 succès de création de sondage - ' + this.pollService.form.value.title