refactor: modify parallel structures (add rectangular weir/orifice, rename...

refactor: modify parallel structures (add rectangular weir/orifice, rename rectangular gate to rectangular bottom gate)

refs #511

DEVELOPERS.md

@@ -575,7 +575,7 @@ Dans la configuration du module, dans le "fieldset_template", ajouter un sélect
     "id": "fs_ouvrage",
     "type": "fieldset_template",
     "calcType": "Structure",
-    "defaultStructType": "VanneRectangulaire",
+    "defaultStructType": "VanneFondRectangulaire",
     "defaultLoiDebit": "GateCem88v",
     "fields": [
         {
@@ -594,7 +594,7 @@ Dans la configuration du module, dans le "fieldset_template", ajouter un sélect
                 "SeuilRectangulaire_WeirVillemonte": "structures/kivi.html",
                 "SeuilRectangulaire_WeirSubmergedLarinier": "structures/fente_noyee.html",
                 "SeuilRectangulaire_WeirCunge80": "structures/cunge_80.html",
-                "VanneRectangulaire_GateCunge80": "structures/cunge_80.html",
+                "VanneFondRectangulaire_GateCunge80": "structures/cunge_80.html",
                 "SeuilTriangulaire_TriangularWeirFree": "structures/dever_triang.html",
                 "SeuilTriangulaire_TriangularWeirBroad": "structures/dever_triang.html",
                 "SeuilTriangulaireTrunc_TriangularTruncWeirFree": "structures/dever_triang_tronque.html"

src/app/calculators/parallelstructure/config.json

@@ -13,7 +13,7 @@
         "id": "fs_ouvrage",
         "type": "fieldset_template",
         "calcType": "Structure",
-        "defaultStructType": "VanneRectangulaire",
+        "defaultStructType": "VanneFondRectangulaire",
         "defaultLoiDebit": "GateCem88v",
         "fields": [
             {

src/locale/messages.en.json

@@ -359,9 +359,10 @@
     "INFO_LIB_STRUCT_CONTAINER": "Devices",
     "INFO_LIB_STRUCTURE_ORIFICE": "Orifice",
     "INFO_LIB_STRUCTURE_SEUILRECTANGULAIRE": "Rectangular weir",
+    "INFO_LIB_STRUCTURE_SEUILORIFICERECTANGULAIRE": "Rectangular weir/orifice",
     "INFO_LIB_STRUCTURE_SEUILTRIANGULAIRE": "Triangular weir",
     "INFO_LIB_STRUCTURE_SEUILTRIANGULAIRETRUNC": "Truncated triangular weir",
-    "INFO_LIB_STRUCTURE_VANNERECTANGULAIRE": "Rectangular gate",
+    "INFO_LIB_STRUCTURE_VANNEFONDRECTANGULAIRE": "Rectangular bottom gate",
     "INFO_LIB_STRUCTURE_N_COURT": "D",
     "INFO_LIB_TAU0": "Tractive force",
     "INFO_LIB_TOR": "Supercritical water line",

src/locale/messages.fr.json

@@ -360,9 +360,10 @@
     "INFO_LIB_STRUCT_CONTAINER": "Ouvrages",
     "INFO_LIB_STRUCTURE_ORIFICE": "Orifice",
     "INFO_LIB_STRUCTURE_SEUILRECTANGULAIRE": "Seuil rectangulaire",
+    "INFO_LIB_STRUCTURE_SEUILORIFICERECTANGULAIRE": "Seuil/orifice rectangulaire",
     "INFO_LIB_STRUCTURE_SEUILTRIANGULAIRE": "Seuil triangulaire",
     "INFO_LIB_STRUCTURE_SEUILTRIANGULAIRETRUNC": "Seuil triangulaire tronqué",
-    "INFO_LIB_STRUCTURE_VANNERECTANGULAIRE": "Vanne rectangulaire",
+    "INFO_LIB_STRUCTURE_VANNEFONDRECTANGULAIRE": "Vanne de fond rectangulaire",
     "INFO_LIB_STRUCTURE_N_COURT": "O",
     "INFO_LIB_TAU0": "Force tractrice",
     "INFO_LIB_TOR": "Ligne d'eau torrentielle",