From 7ed2e0e53c21d0f580f9788a16f29314d7634295 Mon Sep 17 00:00:00 2001
From: Jean-Pascal <jean-pascal.aubry@inrae.fr>
Date: Mon, 12 Feb 2024 16:34:24 +0000
Subject: [PATCH] feat: add fieldset to display discretized aprons in case of
 inclined rugofond type Refs #658

---
 .../calculators/rugofondmultiple/config.json  | 23 ++++++++++++++++++-
 src/app/calculators/rugofondmultiple/en.json  |  6 ++---
 src/app/calculators/rugofondmultiple/fr.json  |  6 ++---
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/app/calculators/rugofondmultiple/config.json b/src/app/calculators/rugofondmultiple/config.json
index 31d40116e..1268a4654 100644
--- a/src/app/calculators/rugofondmultiple/config.json
+++ b/src/app/calculators/rugofondmultiple/config.json
@@ -36,7 +36,6 @@
                 "type": "select",
                 "property": "rugofondType"
             },
-            "ZF1",
             {
                 "id": "ZRR",
                 "allowEmpty": true
@@ -50,5 +49,27 @@
                 "allowEmpty": true
             }
         ]
+    },
+    {
+        "id": "fs_rugofond",
+        "type": "fieldset_template",
+        "calcType": "RugoFond",
+        "fields": [
+            {
+                "id": "ZF1",
+                "help": "pam/macrorugo.html#rugosite-de-fond"
+            }
+        ]
+    },
+    {
+        "id": "rugofond_container",
+        "type": "template_container",
+        "templates": [
+            "fs_rugofond"
+        ]
+    },
+    {
+        "type": "options",
+        "help": "pam/macrorugo_complexe.html"
     }
 ]
diff --git a/src/app/calculators/rugofondmultiple/en.json b/src/app/calculators/rugofondmultiple/en.json
index d985c29e9..b5a8bcb3a 100644
--- a/src/app/calculators/rugofondmultiple/en.json
+++ b/src/app/calculators/rugofondmultiple/en.json
@@ -6,8 +6,8 @@
     "fs_pass": "Fish pass parameters",
     "fs_bloc": "Blocks parameters",
     "fs_pass_type": "Pass type",
-    "macrorugo_container": "Aprons",
-    "fs_macrorugo": "Apron",
+    "rugofond_container": "Aprons",
+    "fs_rugofond": "Apron",
 
     "select_passtype": "Pass type",
     "Q": "Flow",
@@ -16,7 +16,7 @@
     "ZF1": "Upstream ramp bottom elevation",
     "ZRR": "Lower upstream ramp bottom elevation",
     "ZRL": "Upper upstream ramp bottom elevation",
-    "NbT": "Number of baffles",
+    "NbT": "Number of flow sections",
     "L": "Total width of ramp",
     "Cd": "Discharge coefficient",
     "d65": "d65",
diff --git a/src/app/calculators/rugofondmultiple/fr.json b/src/app/calculators/rugofondmultiple/fr.json
index 797c38bb4..6a0e83cff 100644
--- a/src/app/calculators/rugofondmultiple/fr.json
+++ b/src/app/calculators/rugofondmultiple/fr.json
@@ -6,8 +6,8 @@
     "fs_pass": "Paramètres de la passe",
     "fs_bloc": "Paramètres des blocs",
     "fs_pass_type": "Type de passe",
-    "macrorugo_container": "Radiers",
-    "fs_macrorugo": "Radier",
+    "rugofond_container": "Radiers",
+    "fs_rugofond": "Radier",
 
     "select_passtype": "Type de passe",
     "Q": "Débit",
@@ -16,7 +16,7 @@
     "ZF1": "Cote de fond amont rampe",
     "ZRR": "Cote de fond bas amont rampe",
     "ZRL": "Cote de fond haut amont rampe",
-    "NbT": "Nombre de ralentisseurs",
+    "NbT": "Nombre de tranche d'écoulement",
     "L": "Largeur totale de la rampe", 
     "Cd": "Coefficient de débit",
     "d65": "d65",
-- 
GitLab