diff --git a/src/app/components/generic-select/generic-select.component.html b/src/app/components/generic-select/generic-select.component.html index 0a75a714e006ecb3a3a4b20d2e946762b82c5831..68c4dfa09741cfb21e6b22ab2cfb938a7f00ed7d 100644 --- a/src/app/components/generic-select/generic-select.component.html +++ b/src/app/components/generic-select/generic-select.component.html @@ -23,3 +23,6 @@ <div *ngIf="messageWhenEmpty" class="message-when-empty"> {{ messageWhenEmpty }} </div> +<div *ngIf="errorMessage" class="message-when-empty"> + {{ errorMessage }} +</div> diff --git a/src/app/components/results-chart/chart-type.component.ts b/src/app/components/results-chart/chart-type.component.ts index 123657c5173e1f09900f327f140c4cdd6eb3dc65..01b12a2a49c7c6040292ef4c808c88eb5612568b 100644 --- a/src/app/components/results-chart/chart-type.component.ts +++ b/src/app/components/results-chart/chart-type.component.ts @@ -53,6 +53,10 @@ export class ChartTypeSelectComponent implements IObservable { return this._select.messageWhenEmpty; } + public get errorMessage(): string { + return undefined; + } + public get enableHelpButton(): boolean { return false; } diff --git a/src/app/components/select-field-line/select-field-line.component.ts b/src/app/components/select-field-line/select-field-line.component.ts index 7c4b067efcece001ba65882f713c0e286d660f48..7142ef8708d89b933f3ae8068f7c8d15cee5bebf 100644 --- a/src/app/components/select-field-line/select-field-line.component.ts +++ b/src/app/components/select-field-line/select-field-line.component.ts @@ -45,6 +45,12 @@ export class SelectFieldLineComponent implements OnInit { return this._select.messageWhenEmpty; } + public get errorMessage(): string { + if (this._select.errorMessage !== undefined) { + return this.i18nService.localizeMessage(this._select.errorMessage); + } + } + protected entryLabel(entry: SelectEntry): string { return decodeHtml(entry.label); } diff --git a/src/app/formulaire/elements/select/select-field.ts b/src/app/formulaire/elements/select/select-field.ts index 2ecfdfa75ebc709676a927847092974ab319edc7..cb0dce965548e01d053ab53a783acec90d184123 100644 --- a/src/app/formulaire/elements/select/select-field.ts +++ b/src/app/formulaire/elements/select/select-field.ts @@ -4,7 +4,7 @@ import { arraysAreEqual } from "../../../util/util"; import { FormulaireNode } from "../formulaire-node"; import { ServiceFactory } from "app/services/service-factory"; import { FormulaireDefinition } from "../../definition/form-definition"; -import { enumValueFromString, Nub } from "jalhyd"; +import { enumValueFromString, Message, Nub } from "jalhyd"; export abstract class SelectField extends Field { @@ -301,6 +301,10 @@ export abstract class SelectField extends Field { return msg; } + public get errorMessage(): Message { + return undefined; + } + public get multiple(): boolean { return this._multiple; }