diff --git a/src/app/core/models/configuration.model.ts b/src/app/core/models/configuration.model.ts index c78595d7..8b723adc 100644 --- a/src/app/core/models/configuration.model.ts +++ b/src/app/core/models/configuration.model.ts @@ -16,7 +16,9 @@ export class PollConfiguration { public isZeroKnoledge: boolean = true, public hasSeveralHours: boolean = false, public hasMaxCountOfAnswers: boolean = false, - public whoCanChangeAnswers: string = 'everybody', + public whoCanChangeAnswers: string = environment.poll.defaultConfig.whoCanChangeAnswers, // everybody, self, nobody (= just admin) + public visibility: string = environment.poll.defaultConfig.visibility, // visible to anyone with the link: + public voteChoices: string = environment.poll.defaultConfig.voteChoices, // possible answers to a vote choice: only "yes", "yes, maybe, no": number = environment.poll.defaultConfig.maxCountOfAnswers, public maxCountOfAnswers: number = environment.poll.defaultConfig.maxCountOfAnswers, public expiresDaysDelay: number = environment.poll.defaultConfig.expiresDaysDelay, public expiracyAfterLastModificationInDays: number = environment.poll.defaultConfig diff --git a/src/app/core/models/poll.model.ts b/src/app/core/models/poll.model.ts index 69674ca9..59c18a49 100644 --- a/src/app/core/models/poll.model.ts +++ b/src/app/core/models/poll.model.ts @@ -13,15 +13,13 @@ export class Poll { public description?: string, public creatorPseudo?: string, public creatorEmail?: string, - public isAboutDate?: boolean, - public isZeroKnoledge?: boolean, public allowSeveralHours?: boolean, public archiveNumberOfDays?: number, public configuration: PollConfiguration = new PollConfiguration(), public comments: Comment[] = [], public choices: Choice[] = [], - public dateChoices: Choice[] = [], - public timeChoices: Choice[] = [] + public dateChoices: Choice[] = [], // 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 getAdministrationUrl(): string { diff --git a/src/app/core/services/poll.service.ts b/src/app/core/services/poll.service.ts index 14477d06..e8d16e15 100644 --- a/src/app/core/services/poll.service.ts +++ b/src/app/core/services/poll.service.ts @@ -86,6 +86,7 @@ export class PollService implements Resolve { * @param config */ makeSlug(config: Poll): string { + console.log('config', config); let str = ''; str = config.configuration.dateCreated.getFullYear() + diff --git a/src/app/features/administration/form/advanced-config/advanced-config.component.html b/src/app/features/administration/form/advanced-config/advanced-config.component.html index 30f01084..1bd574b7 100644 --- a/src/app/features/administration/form/advanced-config/advanced-config.component.html +++ b/src/app/features/administration/form/advanced-config/advanced-config.component.html @@ -95,7 +95,7 @@ - + Les participants pourront consulter les résultats

@@ -103,7 +103,7 @@ Accès sécurisé

- + Le sondage sera protégé par un mot de passe @@ -114,7 +114,7 @@ matInput type="password" placeholder="password" - formControlName="password" + formControlName="configuration.password" required /> @@ -122,13 +122,13 @@ Notifications - + Vous recevrez un mail à chaque nouvelle participation - + Vous recevrez un mail à chaque nouveau commentaire - + La réponse « peut-être » sera disponible @@ -138,27 +138,27 @@ Fonctionnalités pas encore disponibles: - + Spécifier un lien unique de vote à des participants définis - + Autoriser les commentaires - + Nombre de réponses limitées à ce nombre - + Les informations du sondage seront chiffrés en base de données diff --git a/src/app/features/administration/form/form.component.html b/src/app/features/administration/form/form.component.html index 72988e42..9c2fb1b1 100644 --- a/src/app/features/administration/form/form.component.html +++ b/src/app/features/administration/form/form.component.html @@ -26,7 +26,7 @@ - +