diff --git a/src/app/formulaire/definition/form-verificateur.ts b/src/app/formulaire/definition/form-verificateur.ts index 413343c32814ac681e615a4f6b45c84a4cafd89d..5da57ecf107f0d6ed7018be9f558d241e085c640 100644 --- a/src/app/formulaire/definition/form-verificateur.ts +++ b/src/app/formulaire/definition/form-verificateur.ts @@ -1,7 +1,6 @@ -import { IObservable, Nub, Verificateur, CalculatorType } from "jalhyd"; +import { IObservable, Nub, Verificateur } from "jalhyd"; import { SelectFieldCustom } from "../elements/select-field-custom"; -import { SelectField } from '../elements/select-field'; import { FormulaireFixedVar } from "./form-fixedvar"; /** diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json index c4d50170609c980cf73def0f71a05e08b9eb7f86..96f93168e4eef8bc25f8b6fd0104dda56cc90b5f 100644 --- a/src/locale/messages.en.json +++ b/src/locale/messages.en.json @@ -617,9 +617,17 @@ "WARNING_VERIF_PAB_DHMAX_JET_DW": "Downwall: fall %DH% too high for jet type %jetType% (maximum: %maxDH%)", "ERROR_VERIF_PAB_BMIN": "Wall #%NC%, structure %NS%: slot/weir width %L% too low (minimum: %minB%)", "ERROR_VERIF_PAB_BMIN_DW": "Downwall, structure %NS%: slot/weir width %L% too low (minimum: %minB%)", + "WARNING_VERIF_PAB_BMIN": "Wall #%NC%, structure %NS%: slot/weir width %L% too low (minimum: %minB%)", + "WARNING_VERIF_PAB_BMIN_DW": "Downwall, structure %NS%: slot/weir width %L% too low (minimum: %minB%)", "ERROR_VERIF_PAB_LMIN": "Wall #%N%: basin length %LB% too low (minimum: %minLB%)", "ERROR_VERIF_PAB_HMIN": "Wall #%NC%, structure %NS%: head on weir %h1% too low (minimum: %minH%)", "ERROR_VERIF_PAB_HMIN_DW": "Downwall, structure %NS%: head on weir %h1% too low (minimum: %minH%)", + "WARNING_VERIF_PAB_HMIN": "Wall #%NC%, structure %NS%: head on weir %h1% too low (minimum: %minH%)", + "WARNING_VERIF_PAB_HMIN_DW": "Downwall, structure %NS%: head on weir %h1% too low (minimum: %minH%)", + "ERROR_VERIF_PAB_SMIN": "Wall #%NC%, structure %NS%: orifice surface %S% is too low (minimum: %minS%)", + "ERROR_VERIF_PAB_SMIN_DW": "Downwall, structure %NS%: orifice surface %S% is too low (minimum: %minS%)", + "WARNING_VERIF_PAB_SMIN": "Wall #%NC%, structure %NS%: orifice surface %S% is too low (minimum: %minS%)", + "WARNING_VERIF_PAB_SMIN_DW": "Downwall, structure %NS%: orifice surface %S% is too low (minimum: %minS%)", "ERROR_VERIF_PAB_YMOY": "Wall #%N%: basin depth %PB% too low (minimum: %minPB%)", "ERROR_VERIF_PAB_YMOY_2_DH": "Wall #%N%: basin depth %PB% lower than 2x fall %DH%", "ERROR_VERIF_PAR_DH": "Downstream pass fall prevents crossability", @@ -627,5 +635,7 @@ "ERROR_VERIF_KO": "Crossability criteria are not met for at least one species group", "ERROR_VERIF_SPECIES_KO": "Crossability criteria are not met for species group %speciesGroup%", "INFO_VERIF_SPECIES_OK": "Crossability criteria are met for species group %speciesGroup%", + "ERROR_VERIF_PAB_WALL_NOT_CROSSABLE": "Wall #%N% is not crossable", + "ERROR_VERIF_PAB_DW_NOT_CROSSABLE": "Downwall is not crossable", "WARNING_VERIF_PAR_SPECIES_GROUP": "Species groups 3a, 3b et 7b are discouraged for this pass type" } diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json index 56eddf83d2e29dae6d42a198134e8ecb0380041c..cbea22c5ced2fac73042a68b36e41c3e410f4c1a 100644 --- a/src/locale/messages.fr.json +++ b/src/locale/messages.fr.json @@ -618,9 +618,17 @@ "WARNING_VERIF_PAB_DHMAX_JET_DW": "Cloison aval : chute %DH% trop importante pour le jet %jetType% (maximum : %maxDH%)", "ERROR_VERIF_PAB_BMIN": "Cloison n°%NC%, ouvrage %NS% : largeur de l'échancrure ou de la fente %L% insuffisante (minimum : %minB%)", "ERROR_VERIF_PAB_BMIN_DW": "Cloison aval, ouvrage %NS% : largeur de l'échancrure ou de la fente %L% insuffisante (minimum : %minB%)", + "WARNING_VERIF_PAB_BMIN": "Cloison n°%NC%, ouvrage %NS% : largeur de l'échancrure ou de la fente %L% insuffisante (minimum : %minB%)", + "WARNING_VERIF_PAB_BMIN_DW": "Cloison aval, ouvrage %NS% : largeur de l'échancrure ou de la fente %L% insuffisante (minimum : %minB%)", "ERROR_VERIF_PAB_LMIN": "Cloison n°%N% : longueur de bassin %LB% insuffisante (minimum : %minLB%)", "ERROR_VERIF_PAB_HMIN": "Cloison n°%NC%, ouvrage %NS% : charge sur l'échancrure %h1% insuffisante (minimum : %minH%)", "ERROR_VERIF_PAB_HMIN_DW": "Cloison aval, ouvrage %NS% : charge sur l'échancrure %h1% insuffisante (minimum : %minH%)", + "WARNING_VERIF_PAB_HMIN": "Cloison n°%NC%, ouvrage %NS% : charge sur l'échancrure %h1% insuffisante (minimum : %minH%)", + "WARNING_VERIF_PAB_HMIN_DW": "Cloison aval, ouvrage %NS% : charge sur l'échancrure %h1% insuffisante (minimum : %minH%)", + "ERROR_VERIF_PAB_SMIN": "Cloison n°%NC%, ouvrage %NS% : surface de l'orifice %S% insuffisante (minimum: %minS%)", + "ERROR_VERIF_PAB_SMIN_DW": "Cloison aval, ouvrage %NS% : surface de l'orifice %S% insuffisante (minimum: %minS%)", + "WARNING_VERIF_PAB_SMIN": "Cloison n°%NC%, ouvrage %NS% : surface de l'orifice %S% insuffisante (minimum: %minS%)", + "WARNING_VERIF_PAB_SMIN_DW": "Cloison aval, ouvrage %NS% : surface de l'orifice %S% insuffisante (minimum: %minS%)", "ERROR_VERIF_PAB_YMOY": "Cloison n°%N% : profondeur de bassin %PB% insuffisante (minimum : %minPB%)", "ERROR_VERIF_PAB_YMOY_2_DH": "Cloison n°%N% : profondeur de bassin %PB% inférieure à 2x la chute %DH%", "ERROR_VERIF_PAR_DH": "La chute en pied de passe empêche le franchissement", @@ -628,5 +636,7 @@ "ERROR_VERIF_KO": "Le franchissement est impossible pour au moins un groupe d'espèces", "ERROR_VERIF_SPECIES_KO": "Le franchissement est impossible pour le groupe d'espèces %speciesGroup%", "INFO_VERIF_SPECIES_OK": "Le franchissement est possible pour le groupe d'espèces %speciesGroup%", + "ERROR_VERIF_PAB_WALLS_NOT_CROSSABLE": "La cloison n°%N% n'est pas franchissable", + "ERROR_VERIF_PAB_DW_NOT_CROSSABLE": "La cloison aval n'est pas franchissable", "WARNING_VERIF_PAR_SPECIES_GROUP": "Les groupes d'espèces 3a, 3b et 7b sont déconseillés pour ce type de passe" }