diff --git a/src/app/calculators/lechapt-calmon/lechapt-calmon.en.json b/src/app/calculators/lechapt-calmon/lechapt-calmon.en.json index 983b3941249649334ce353338a0d453194f6e953..47b3a9b00faeaab095e1c60c8a544e5662bce852 100644 --- a/src/app/calculators/lechapt-calmon/lechapt-calmon.en.json +++ b/src/app/calculators/lechapt-calmon/lechapt-calmon.en.json @@ -10,6 +10,9 @@ "select_material_7": "PVC - Polyethylene", "select_material_8": "Hydraulically smooth pipe - 0.05 ≤ D ≤ 0.2", "select_material_9": "Hydraulically smooth pipe - 0.25 ≤ D ≤ 1", + "L": "L", + "M": "M", + "N": "N", "fs_hydraulique": "Hydraulic features", "Q": "Flow", "D": "Pipe diameter", diff --git a/src/app/calculators/lechapt-calmon/lechapt-calmon.fr.json b/src/app/calculators/lechapt-calmon/lechapt-calmon.fr.json index 81976f36abb93e57fbf1ec54130d2be5dd29d26c..f3b6465da14b5fe31e8f0752672a27f472f9e096 100644 --- a/src/app/calculators/lechapt-calmon/lechapt-calmon.fr.json +++ b/src/app/calculators/lechapt-calmon/lechapt-calmon.fr.json @@ -10,6 +10,9 @@ "select_material_7": "PVC - Polyéthylène", "select_material_8": "Tuyau hydrauliquement lisse - 0.05 ≤ D ≤ 0.2", "select_material_9": "Tuyau hydrauliquement lisse - 0.25 ≤ D ≤ 1", + "L": "L", + "M": "M", + "N": "N", "fs_hydraulique": "Caractéristiques hydrauliques", "Q": "Débit", "D": "Diamètre du tuyau", diff --git a/src/app/components/calculator-results/calculator-results.component.ts b/src/app/components/calculator-results/calculator-results.component.ts index 64e5ff7558d5c2cb76bc84deee3b8ced6ef995cf..70c923d706fe1308600a51cdc10b94c8234697ff 100644 --- a/src/app/components/calculator-results/calculator-results.component.ts +++ b/src/app/components/calculator-results/calculator-results.component.ts @@ -156,11 +156,12 @@ export class CalculatorResultsComponent { let res = ""; if (displaySymbol) res += p.symbol; - if (p.label != undefined && p.label != "") { - if (res.length > 0) - res += ":"; - res += p.label; - } + if (p.label != undefined && p.label != "") + if (p.symbol != p.label || !displaySymbol) { + if (res.length > 0) + res += ":"; + res += p.label; + } if (p.unit != undefined && p.unit != "") res += " (" + p.unit + ")"; return res;