diff --git a/src/app/formulaire/elements/select/select-field-species-list.ts b/src/app/formulaire/elements/select/select-field-species-list.ts index 7b94345aa073bbd77580775e01dfc5504d78fb64..7b02467586b34a6bae85efda95917b7600c47fc0 100644 --- a/src/app/formulaire/elements/select/select-field-species-list.ts +++ b/src/app/formulaire/elements/select/select-field-species-list.ts @@ -16,6 +16,7 @@ import { SelectField } from "./select-field"; export class SelectFieldSpeciesList extends SelectField { constructor(parent: FormulaireNode) { super(parent); + this._messageWhenEmpty = "INFO_VERIF_SELECT_SPECIES_FIRST"; this._multiple = true; } diff --git a/src/app/formulaire/elements/select/select-field.ts b/src/app/formulaire/elements/select/select-field.ts index b45f59c42d2581d536dc40659295cb86ed57cc62..59e0c8d2129009c0dda64f6e8d2480e395edcb44 100644 --- a/src/app/formulaire/elements/select/select-field.ts +++ b/src/app/formulaire/elements/select/select-field.ts @@ -292,9 +292,14 @@ export abstract class SelectField extends Field { return this._entriesBaseId; } + public isEmptySelectField() { + return this._selectedEntry !== undefined && Object.keys(this._selectedEntry).length === 0; + } + + public get messageWhenEmpty(): string { let msg: string; - if (this._selectedEntry === undefined && this._messageWhenEmpty) { + if ((this._selectedEntry === undefined && this._messageWhenEmpty) || this.isEmptySelectField()) { msg = ServiceFactory.i18nService.localizeText(this._messageWhenEmpty); } return msg; diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json index 49d04bcaa7a4dbf5e72870eb669396dbf985576c..46a339559719ffa901ec289baac5ad631a0f81e8 100755 --- a/src/locale/messages.en.json +++ b/src/locale/messages.en.json @@ -664,6 +664,7 @@ "INFO_TRIGO_DESCRIPTION": "cosinus sinus tangent arc maths mathematics", "INFO_TRIGO_TITRE_COURT": "Trigo. f.", "INFO_VERIF_CREATE_PASS_FRIST": "Create first a fish ladder, a baffle fishway or a rock-ramp fishpass", + "INFO_VERIF_SELECT_SPECIES_FIRST": "Select first one or several fish species", "INFO_VERIF_OK": "Crossing criteria are met for all species", "INFO_VERIF_VARYING_OK": "Crossing criteria are met for all species and all pass modalities", "WARNING_VERIF_OK_BUT": "Crossing criteria are met for all species, but there are warnings", diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json index 764dfbbbf7eb42a5a05132f83ce0c5025c4123f2..d305b2ecc2cac74e19deac35def21553690daa1f 100755 --- a/src/locale/messages.fr.json +++ b/src/locale/messages.fr.json @@ -665,6 +665,7 @@ "INFO_TRIGO_DESCRIPTION": "cosinus sinus tangente arc maths mathématiques", "INFO_TRIGO_TITRE_COURT": "F. trigo.", "INFO_VERIF_CREATE_PASS_FRIST": "Créer d'abord une passe à bassins, à ralentisseurs, ou à macrorugosités", + "INFO_VERIF_SELECT_SPECIES_FIRST": "Selectionner d'abord une ou plusieurs espèces", "INFO_VERIF_OK": "Les critères de franchissement sont remplis pour toutes les espèces", "INFO_VERIF_VARYING_OK": "Les critères de franchissement sont remplis pour toutes les espèces et toutes les modalités de la passe", "WARNING_VERIF_OK_BUT": "Les critères de franchissement sont remplis pour toutes les espèces, mais il y a des avertissements",