From ea31dc1094749d2e7db5dd1baf317ab4b5929ded Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@irstea.fr>
Date: Fri, 3 Jan 2020 09:57:12 +0100
Subject: [PATCH 1/2]  Fix #352

---
 jalhyd_branch                                               | 2 +-
 .../calculators/lechapt-calmon/lechapt-calmon.config.json   | 3 ++-
 src/app/calculators/lechapt-calmon/lechapt-calmon.en.json   | 6 +++++-
 src/app/calculators/lechapt-calmon/lechapt-calmon.fr.json   | 6 +++++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/jalhyd_branch b/jalhyd_branch
index cbfd46d6c..d0b9a50d4 100644
--- a/jalhyd_branch
+++ b/jalhyd_branch
@@ -1 +1 @@
-52-dever-calcul-du-debit-corrige-en-utilisant-la-charge-dans-les-formules
+172-lechapt-et-calmon-ajouter-les-pertes-de-charges-singulieres
diff --git a/src/app/calculators/lechapt-calmon/lechapt-calmon.config.json b/src/app/calculators/lechapt-calmon/lechapt-calmon.config.json
index 34d15a705..87cf30bd5 100644
--- a/src/app/calculators/lechapt-calmon/lechapt-calmon.config.json
+++ b/src/app/calculators/lechapt-calmon/lechapt-calmon.config.json
@@ -21,7 +21,8 @@
             "Q",
             "D",
             "J",
-            "Lg"
+            "Lg",
+            "Ks"
         ]
     },
     {
diff --git a/src/app/calculators/lechapt-calmon/lechapt-calmon.en.json b/src/app/calculators/lechapt-calmon/lechapt-calmon.en.json
index 1d9ee6024..ac06af18f 100644
--- a/src/app/calculators/lechapt-calmon/lechapt-calmon.en.json
+++ b/src/app/calculators/lechapt-calmon/lechapt-calmon.en.json
@@ -18,6 +18,10 @@
     "Q": "Flow",
     "D": "Pipe diameter",
     "J": "Head drop",
+    "Ks": "Singular head loss coefficient",
     "Lg": "Pipe length",
-    "fs_param_calc": "Calculation parameters"
+    "fs_param_calc": "Calculation parameters",
+    "Jl": "Linear head loss",
+    "Kl": "Linear head loss coefficient",
+    "fD": "Darcy friction factor"
 }
\ No newline at end of file
diff --git a/src/app/calculators/lechapt-calmon/lechapt-calmon.fr.json b/src/app/calculators/lechapt-calmon/lechapt-calmon.fr.json
index dbdb0e4dc..4f1a5506a 100644
--- a/src/app/calculators/lechapt-calmon/lechapt-calmon.fr.json
+++ b/src/app/calculators/lechapt-calmon/lechapt-calmon.fr.json
@@ -17,6 +17,10 @@
     "fs_hydraulique": "Caractéristiques hydrauliques",
     "D": "Diamètre du tuyau",
     "J": "Perte de charge",
+    "Ks": "Coefficient de perte de charge singulière",
     "Lg": "Longueur du tuyau",
-    "fs_param_calc": "Paramètres de calcul"
+    "fs_param_calc": "Paramètres de calcul",
+    "Jl": "Perte de charge linéaire",
+    "Kl": "Coefficient de perte de charge linéaire",
+    "fD": "Coefficient de perte de charge de Darcy"
 }
\ No newline at end of file
-- 
GitLab


From 17d7efa80f2c4b1d5e09492f3abb3202102ed29a Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@irstea.fr>
Date: Fri, 3 Jan 2020 10:12:30 +0100
Subject: [PATCH 2/2] #352 Add unit to extra results

---
 src/app/calculators/lechapt-calmon/lechapt-calmon.en.json | 2 +-
 src/app/calculators/lechapt-calmon/lechapt-calmon.fr.json | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/calculators/lechapt-calmon/lechapt-calmon.en.json b/src/app/calculators/lechapt-calmon/lechapt-calmon.en.json
index ac06af18f..4f54a2db5 100644
--- a/src/app/calculators/lechapt-calmon/lechapt-calmon.en.json
+++ b/src/app/calculators/lechapt-calmon/lechapt-calmon.en.json
@@ -17,7 +17,7 @@
     "fs_hydraulique": "Hydraulic features",
     "Q": "Flow",
     "D": "Pipe diameter",
-    "J": "Head drop",
+    "J": "Total head loss",
     "Ks": "Singular head loss coefficient",
     "Lg": "Pipe length",
     "fs_param_calc": "Calculation parameters",
diff --git a/src/app/calculators/lechapt-calmon/lechapt-calmon.fr.json b/src/app/calculators/lechapt-calmon/lechapt-calmon.fr.json
index 4f1a5506a..734557c79 100644
--- a/src/app/calculators/lechapt-calmon/lechapt-calmon.fr.json
+++ b/src/app/calculators/lechapt-calmon/lechapt-calmon.fr.json
@@ -16,11 +16,13 @@
     "N": "N",
     "fs_hydraulique": "Caractéristiques hydrauliques",
     "D": "Diamètre du tuyau",
-    "J": "Perte de charge",
+    "J": "Perte de charge totale",
     "Ks": "Coefficient de perte de charge singulière",
     "Lg": "Longueur du tuyau",
     "fs_param_calc": "Paramètres de calcul",
     "Jl": "Perte de charge linéaire",
+    "UNIT_JL": "m",
+    "UNIT_V": "m/s",
     "Kl": "Coefficient de perte de charge linéaire",
     "fD": "Coefficient de perte de charge de Darcy"
 }
\ No newline at end of file
-- 
GitLab