From 9a013f6d2cd29832d98fa81352f39db0a12fe60c Mon Sep 17 00:00:00 2001 From: Tykayn Date: Fri, 30 Apr 2021 22:49:55 +0200 Subject: [PATCH] fix get participation url --- src/app/core/models/poll.model.ts | 10 +--------- src/app/core/services/poll.service.ts | 8 ++++++++ .../advanced-config/advanced-config.component.ts | 2 +- .../administration/stepper/stepper.component.ts | 2 +- .../administration/success/success.component.html | 12 ++++++------ .../consultation/consultation.component.html | 10 +++++----- src/environments/environment.ts | 8 ++++---- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/app/core/models/poll.model.ts b/src/app/core/models/poll.model.ts index 3324b3f5..198a7eda 100644 --- a/src/app/core/models/poll.model.ts +++ b/src/app/core/models/poll.model.ts @@ -61,14 +61,6 @@ export class Poll { public dateChoices: DateChoice[] = []; // sets of days as strings, config to set identical time for days in a special days poll 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 { - return `${environment.frontDomain}/poll/admin/${this.admin_key}`; - } - - public getParticipationUrl(): string { - // TODO handle pass access - return `${environment.frontDomain}/poll/${this.custom_url}/consultation`; - } } diff --git a/src/app/core/services/poll.service.ts b/src/app/core/services/poll.service.ts index 72e3f8aa..daeb7811 100644 --- a/src/app/core/services/poll.service.ts +++ b/src/app/core/services/poll.service.ts @@ -225,4 +225,12 @@ export class PollService implements Resolve { console.log('choices before', choices); return choices; } + + public getAdministrationUrl(): string { + return `${environment.frontDomain}#/poll/admin/${this._poll.getValue().admin_key}`; + } + public getParticipationUrl(): string { + // TODO handle pass access + return `${environment.frontDomain}#/poll/${this._poll.getValue().custom_url}/consultation`; + } } diff --git a/src/app/features/administration/form/advanced-config/advanced-config.component.ts b/src/app/features/administration/form/advanced-config/advanced-config.component.ts index cfc1b286..c027d429 100644 --- a/src/app/features/administration/form/advanced-config/advanced-config.component.ts +++ b/src/app/features/administration/form/advanced-config/advanced-config.component.ts @@ -8,7 +8,7 @@ import { FormGroup } from '@angular/forms'; styleUrls: ['./advanced-config.component.scss'], }) export class AdvancedConfigComponent implements OnInit { - public urlPrefix: string = window.location.origin + '/participation/'; + public urlPrefix = '/participation/'; @Input() public poll?: Poll; @Input() diff --git a/src/app/features/administration/stepper/stepper.component.ts b/src/app/features/administration/stepper/stepper.component.ts index 744c9658..52f781b5 100644 --- a/src/app/features/administration/stepper/stepper.component.ts +++ b/src/app/features/administration/stepper/stepper.component.ts @@ -18,7 +18,7 @@ export class StepperComponent implements OnInit { public configurationFormGroup: FormGroup; public choicesFormGroup: FormGroup; - public urlPrefix: string = window.location.origin + '/participation/'; + public urlPrefix = '/participation/'; constructor(private fb: FormBuilder, private uuidService: UuidService) {} diff --git a/src/app/features/administration/success/success.component.html b/src/app/features/administration/success/success.component.html index 9eda1f6f..6288a75b 100644 --- a/src/app/features/administration/success/success.component.html +++ b/src/app/features/administration/success/success.component.html @@ -28,10 +28,10 @@

Pour accéder au sondage et à tous ses paramètres : - {{ poll.getAdministrationUrl() }} + {{ pollService.getAdministrationUrl() }}

- - + + Voir le sondage coté administrateur·ice

@@ -43,10 +43,10 @@

{{ 'resume.users' | translate }}

Pour modifier le sondage : - {{ poll.getAdministrationUrl() }} + {{ pollService.getAdministrationUrl() }}

- - Modifier le sondage + + Modifier le sondage

{{ 'resume.links_mail' | translate }}

diff --git a/src/app/features/consultation/consultation.component.html b/src/app/features/consultation/consultation.component.html index 7c163067..86f5f10f 100644 --- a/src/app/features/consultation/consultation.component.html +++ b/src/app/features/consultation/consultation.component.html @@ -33,15 +33,15 @@

Pour partager le sondage, vous pouvez diffuser ce lien : - - {{ window.location.href }} + + {{ pollService.getParticipationUrl() }}

- -

+ +
Exporter/Imprimer -

+