Verificateur: reorganize Espece fields, translations

src/app/calculators/espece/config.json

 [
     {
-        "id": "fs_param_pab",
+        "id": "fs_param_pab_s",
         "type": "fieldset",
         "fields": [
             {
-                "id": "DHMax",
+                "id": "DHMaxS",
                 "allowEmpty": true
             },
             {
@@ -12,11 +12,29 @@
                 "allowEmpty": true
             },
             {
-                "id": "PMin",
+                "id": "PMinS",
                 "allowEmpty": true
             },
             {
-                "id": "LMin",
+                "id": "LMinS",
+                "allowEmpty": true
+            }
+        ]
+    },
+    {
+        "id": "fs_param_pab_p",
+        "type": "fieldset",
+        "fields": [
+            {
+                "id": "DHMaxP",
+                "allowEmpty": true
+            },
+            {
+                "id": "PMinP",
+                "allowEmpty": true
+            },
+            {
+                "id": "LMinP",
                 "allowEmpty": true
             },
             {

src/app/calculators/espece/en.json

 {
-    "fs_param_pab": "Fish ladders",
+    "fs_param_pab_s": "Fish ladders, surface jets or orifices",
+    "fs_param_pab_p": "Fish ladders, diving jets",
     "fs_param_pam": "Rock-ramp fishpasses",
     "fs_param_par": "Humpback fishways",
 
-    "DHMax": "Maximal fall",
+    "DHMaxS": "Maximal fall",
+    "DHMaxP": "Maximal fall",
     "BMin": "Minimal slot or weir width",
-    "PMin": "Minimal basin width",
-    "LMin": "Minimal basin length",
+    "PMinS": "Minimal basin width",
+    "PMinP": "Minimal basin width",
+    "LMinS": "Minimal basin length",
+    "LMinP": "Minimal basin length",
     "HMin": "Minimal head on weir",
     "YMin": "Minimal water level",
     "VMax": "Maximal flow velocity",
     "YMinSB": "Minimal water level on superactive baffles",
     "YMinPB": "Minimal water level on plane baffles",
 
-    "UNIT_DHMax": "m",
+    "UNIT_DHMaxS": "m",
+    "UNIT_DHMaxP": "m",
     "UNIT_BMin": "m",
-    "UNIT_PMin": "m",
-    "UNIT_LMin": "m",
+    "UNIT_PMinS": "m",
+    "UNIT_PMinP": "m",
+    "UNIT_LMinS": "m",
+    "UNIT_LMinP": "m",
     "UNIT_HMin": "m",
     "UNIT_YMin": "m",
     "UNIT_VMax": "m/s",

src/app/calculators/espece/fr.json

 {
-    "fs_param_pab": "Passes à bassins",
+    "fs_param_pab_s": "Passes à bassins, jets de surface et orifices",
+    "fs_param_pab_p": "Passes à bassins, jets plongeants",
     "fs_param_pam": "Passes à macrorugosités",
     "fs_param_par": "Passes à ralentisseurs",
 
-    "DHMax": "Chute maximale",
+    "DHMaxS": "Chute maximale",
+    "DHMaxP": "Chute maximale",
     "BMin": "Largeur minimale de fente ou échancrure latérale",
-    "PMin": "Profondeur minimale de bassin",
-    "LMin": "Longueur minimale de bassin",
+    "PMinS": "Profondeur minimale de bassin",
+    "PMinP": "Profondeur minimale de bassin",
+    "LMinS": "Longueur minimale de bassin",
+    "LMinP": "Longueur minimale de bassin",
     "HMin": "Charge minimale sur l'échancrure",
     "YMin": "Tirant d'eau minimal",
     "VMax": "Vitesse d'écoulement maximale",
     "YMinSB": "Tirant d'eau minimal sur les ralentisseurs suractifs de fond",
     "YMinPB": "Tirant d'eau minimal sur les ralentisseurs plans",
 
-    "UNIT_DHMax": "m",
+    "UNIT_DHMaxS": "m",
+    "UNIT_DHMaxP": "m",
     "UNIT_BMin": "m",
-    "UNIT_PMin": "m",
-    "UNIT_LMin": "m",
+    "UNIT_PMinS": "m",
+    "UNIT_PMinP": "m",
+    "UNIT_LMinS": "m",
+    "UNIT_LMinP": "m",
     "UNIT_HMin": "m",
     "UNIT_YMin": "m",
     "UNIT_VMax": "m/s",

src/app/calculators/verificateur/config.json

@@ -7,12 +7,6 @@
                 "id": "select_target_pass",
                 "type": "select_custom",
                 "source": "verificateur_target"
-            },
-            {
-                "type": "select",
-                "id": "select_pab_jet_type",
-                "property": "pabJetType",
-                "default": "SURFACE"
             }
         ]
     },

src/app/formulaire/definition/form-verificateur.ts

@@ -30,7 +30,6 @@ export class FormulaireVerificateur extends FormulaireFixedVar {
             if (sender.id === "select_target_pass" && data.action === "select") {
                 // update Verificateur property: Pass to check
                 this._currentNub.properties.setPropValue("nubToVerify", data.value ? data.value.value : undefined);
-                this.refreshJetTypeSelector();
 
             } else if (sender.id === "select_species_list" && data.action === "select") {
                 // update Verificateur property: Species list (string[])
@@ -45,12 +44,4 @@ export class FormulaireVerificateur extends FormulaireFixedVar {
         // do not refreshFieldsets() (useless here) or jet type selector's disabled state will be reset
     }
 
-    /**
-     * Disables Jet Type selector if target pass is not a Pab
-     */
-    protected refreshJetTypeSelector() {
-        const ntv = (this._currentNub as Verificateur).nubToVerify;
-        (this.getFormulaireNodeById("select_pab_jet_type") as SelectField).disabled = ! (ntv !== undefined && ntv.calcType === CalculatorType.Pab);
-    }
-
 }

src/locale/messages.en.json

@@ -609,12 +609,14 @@
     "WARNING_VERIF_MRC_VMAX_APRON_N": "Apron #%N%: maximum speed %V% too high (maximum: %maxV%)",
     "WARNING_VERIF_MRC_YMIN_APRON_N": "Apron #%N%: water level %Y% too low (minimum: %minY%)",
     "ERROR_VERIF_NO_PRESET": "This species group is not compatible with this pass type",
-    "ERROR_VERIF_PAB_DHMAX": "Wall #%N%: fall %DH% too high (maximum: %maxDH%)",
-    "ERROR_VERIF_PAB_DHMAX_DW": "Downwall: fall %DH% too high (maximum: %maxDH%)",
+    "ERROR_VERIF_PAB_DHMAX": "Wall #%N%: fall %DH% too high (maximum for surface jet: %maxDHS%, maximum for diving jet : %maxDHP%)",
+    "ERROR_VERIF_PAB_DHMAX_DW": "Downwall: fall %DH% too high (maximum for surface jet: %maxDHS%, maximum for diving jet : %maxDHP%)",
+    "ERROR_VERIF_PAB_DHMAX_JET": "Wall #%N%: fall %DH% too high for jet type %jetType% (maximum: %maxDH%)",
+    "ERROR_VERIF_PAB_DHMAX_JET_DW":"Downwall: fall %DH% too high for jet type %jetType% (maximum: %maxDH%)",
+    "WARNING_VERIF_PAB_DHMAX_JET": "Wall #%N%: fall %DH% too high for jet type %jetType% (maximum: %maxDH%)",
+    "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%)",
-    "ERROR_VERIF_PAB_JETS": "Wall #%N%: at least one jet of type %required% is required",
-    "ERROR_VERIF_PAB_JETS_DW": "Downwall: at least one jet of type %required% is required",
     "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%)",
@@ -624,5 +626,6 @@
     "ERROR_VERIF_PAR_YMIN": "Water level %h% too low (minimum: %minY%)",
     "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%",
     "WARNING_VERIF_PAR_SPECIES_GROUP": "Species groups 3a, 3b et 7b are discouraged for this pass type"
 }