From 1089930743ba9a4072e6bca3412f1c25ca156741 Mon Sep 17 00:00:00 2001
From: Jean-Pascal <jean-pascal.aubry@inrae.fr>
Date: Tue, 19 Mar 2024 11:18:27 +0000
Subject: [PATCH] refactor: update label according to jalhyd variable name in
macrorugocompound and rugofond multiple Refs #658
---
src/app/calculators/macrorugocompound/config.json | 4 ++--
src/app/calculators/macrorugocompound/en.json | 4 ++--
src/app/calculators/macrorugocompound/fr.json | 4 ++--
src/app/calculators/rugofondmultiple/config.json | 2 +-
src/app/calculators/rugofondmultiple/en.json | 2 +-
src/app/calculators/rugofondmultiple/fr.json | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/app/calculators/macrorugocompound/config.json b/src/app/calculators/macrorugocompound/config.json
index 79290dc66..cea0b83b5 100644
--- a/src/app/calculators/macrorugocompound/config.json
+++ b/src/app/calculators/macrorugocompound/config.json
@@ -47,11 +47,11 @@
"property": "inclinedApron"
},
{
- "id": "ZRR",
+ "id": "ZRT",
"help": "pam/macrorugo.html#rugosite-de-fond"
},
{
- "id": "ZRL",
+ "id": "ZRB",
"help": "pam/macrorugo.html#rugosite-de-fond"
},
"BR"
diff --git a/src/app/calculators/macrorugocompound/en.json b/src/app/calculators/macrorugocompound/en.json
index e333dde61..74a0abf89 100644
--- a/src/app/calculators/macrorugocompound/en.json
+++ b/src/app/calculators/macrorugocompound/en.json
@@ -13,8 +13,8 @@
"PBD": "Diameter",
"PBH": "Height",
"Cd0": "Shape (1 for round, 2 for square)",
- "ZRL": "Left ramp bottom elevation",
- "ZRR": "Right ramp bottom elevation",
+ "ZRB": "Lower upstream ramp bottom elevation",
+ "ZRT": "Upper upstream ramp bottom elevation",
"BR": "Total width",
"ZF1": "Upstream ramp bottom elevation",
"B": "Width",
diff --git a/src/app/calculators/macrorugocompound/fr.json b/src/app/calculators/macrorugocompound/fr.json
index 8c276fbd0..642bdf907 100644
--- a/src/app/calculators/macrorugocompound/fr.json
+++ b/src/app/calculators/macrorugocompound/fr.json
@@ -13,8 +13,8 @@
"PBD": "Diamètre",
"PBH": "Hauteur",
"Cd0": "Forme (1 pour rond, 2 pour carré)",
- "ZRL": "Cote de radier gauche",
- "ZRR": "Cote de radier droit",
+ "ZRB": "Cote de fond bas amont",
+ "ZRT": "Cote de fond haut amont",
"BR": "Largeur totale",
"ZF1": "Cote de fond amont rampe",
"B": "Largeur",
diff --git a/src/app/calculators/rugofondmultiple/config.json b/src/app/calculators/rugofondmultiple/config.json
index a48accba6..9758d8939 100644
--- a/src/app/calculators/rugofondmultiple/config.json
+++ b/src/app/calculators/rugofondmultiple/config.json
@@ -37,7 +37,7 @@
"property": "rugofondType"
},
{
- "id": "ZRH",
+ "id": "ZRT",
"allowEmpty": true
},
{
diff --git a/src/app/calculators/rugofondmultiple/en.json b/src/app/calculators/rugofondmultiple/en.json
index 54f8187ed..e16c1d7d3 100644
--- a/src/app/calculators/rugofondmultiple/en.json
+++ b/src/app/calculators/rugofondmultiple/en.json
@@ -14,7 +14,7 @@
"If": "Slope",
"a": "Strickler correction factor",
"ZF1": "Upstream ramp bottom elevation",
- "ZRH": "Upper upstream ramp bottom elevation",
+ "ZRT": "Upper upstream ramp bottom elevation",
"ZRB": "Lower upstream ramp bottom elevation",
"NbT": "Number of flow sections",
"L": "Total width of ramp",
diff --git a/src/app/calculators/rugofondmultiple/fr.json b/src/app/calculators/rugofondmultiple/fr.json
index 725789fdd..6a2ab4707 100644
--- a/src/app/calculators/rugofondmultiple/fr.json
+++ b/src/app/calculators/rugofondmultiple/fr.json
@@ -14,7 +14,7 @@
"If": "Pente",
"a": "Coefficient correcteur du Strickler",
"ZF1": "Cote de fond amont rampe",
- "ZRH": "Cote de fond haut amont",
+ "ZRT": "Cote de fond haut amont",
"ZRB": "Cote de fond bas amont",
"NbT": "Nombre de tranche d'écoulement",
"L": "Largeur totale de la rampe",
--
GitLab