From e52682cb1bcf6e9e7bc55a54975282b829c01ea5 Mon Sep 17 00:00:00 2001 From: Jean-Pascal <jean-pascal.aubry@inrae.fr> Date: Tue, 6 Feb 2024 11:21:25 +0000 Subject: [PATCH] fix: reorganize fields and add crest geometry and ramp geometry Refs #657 --- src/app/calculators/rugofond/config.json | 10 ++++++++-- src/app/calculators/rugofond/en.json | 3 ++- src/app/calculators/rugofond/fr.json | 3 ++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/app/calculators/rugofond/config.json b/src/app/calculators/rugofond/config.json index 38289c769..884b56133 100644 --- a/src/app/calculators/rugofond/config.json +++ b/src/app/calculators/rugofond/config.json @@ -8,15 +8,21 @@ ] }, { - "id": "fs_geometry", + "id": "fs_geometry_crete", "type": "fieldset", "fields": [ "L", + "CdT" + ] + }, + { + "id": "fs_geometry_rampe", + "type": "fieldset", + "fields": [ { "id": "If", "help": "hsl/pente.html" }, - "CdT", "d65", "a" ] diff --git a/src/app/calculators/rugofond/en.json b/src/app/calculators/rugofond/en.json index a075a1041..02f50730f 100644 --- a/src/app/calculators/rugofond/en.json +++ b/src/app/calculators/rugofond/en.json @@ -1,6 +1,7 @@ { "fs_hydraulique": "Hydraulic parameters", - "fs_geometry": "Pass geometry", + "fs_geometry_crete": "Crest geometry", + "fs_geometry_rampe": "Ramp geometry", "fs_type": "Ramp type", "fs_pass": "Fish pass parameters", "fs_bloc": "Blocks parameters", diff --git a/src/app/calculators/rugofond/fr.json b/src/app/calculators/rugofond/fr.json index f6883198c..8e91405be 100644 --- a/src/app/calculators/rugofond/fr.json +++ b/src/app/calculators/rugofond/fr.json @@ -1,6 +1,7 @@ { "fs_hydraulique": "Paramètres hydrauliques", - "fs_geometry": "Géométrie de la passe", + "fs_geometry_crete": "Géométrie de la crête", + "fs_geometry_rampe": "Géométrie de la rampe", "fs_type": "Type de rampe", "fs_pass": "Paramètres de la passe", "fs_bloc": "Paramètres des blocs", -- GitLab