From 63a416ce798f76c261358cb3b8b037b983d6cec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr> Date: Thu, 15 Dec 2022 14:45:50 +0100 Subject: [PATCH] fix: pressure loss calculator JSON configuration: bad select id refs #585 --- src/app/calculators/pressureloss/config.json | 2 +- src/app/calculators/pressureloss/en.json | 2 +- src/app/calculators/pressureloss/fr.json | 2 +- src/app/formulaire/definition/form-pressureloss.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/calculators/pressureloss/config.json b/src/app/calculators/pressureloss/config.json index 00befe99f..18f6ed008 100644 --- a/src/app/calculators/pressureloss/config.json +++ b/src/app/calculators/pressureloss/config.json @@ -4,7 +4,7 @@ "type": "fieldset", "fields": [ { - "id": "select_pressureloss_law", + "id": "select_pressurelosstype", "type": "select", "property": "pressureLossType", "default": "LechaptCalmon", diff --git a/src/app/calculators/pressureloss/en.json b/src/app/calculators/pressureloss/en.json index e93afd9bf..d2ffa6aeb 100644 --- a/src/app/calculators/pressureloss/en.json +++ b/src/app/calculators/pressureloss/en.json @@ -1,6 +1,6 @@ { "fs_pressureloss_law": "Pressure loss", - "select_pressureloss_law": "Pressure loss law", + "select_pressurelosstype": "Pressure loss law", "fs_materiau": "Type of material", "select_material": "Choice of material", "MATERIAL_0": "Unlined cast iron - Coarse concrete (corrosive water)", diff --git a/src/app/calculators/pressureloss/fr.json b/src/app/calculators/pressureloss/fr.json index 17965675c..17cde6a02 100644 --- a/src/app/calculators/pressureloss/fr.json +++ b/src/app/calculators/pressureloss/fr.json @@ -1,6 +1,6 @@ { "fs_pressureloss_law": "Perte de charge", - "select_pressureloss_law": "Loi de perte de charge", + "select_pressurelosstype": "Loi de perte de charge", "fs_materiau": "Type du matériau", "select_material": "Choix du matériau", "MATERIAL_0": "Fonte ou acier non revêtus - Béton grossier (eau corrosive)", diff --git a/src/app/formulaire/definition/form-pressureloss.ts b/src/app/formulaire/definition/form-pressureloss.ts index 4ba8f55dd..60c98da99 100644 --- a/src/app/formulaire/definition/form-pressureloss.ts +++ b/src/app/formulaire/definition/form-pressureloss.ts @@ -9,7 +9,7 @@ export class FormulairePressureLoss extends FormulaireFixedVar { super.preparseConfig(json); // get pressure loss law select default value - const dft: string = this.parseSelectDefaultValue(json, "select_pressureloss_law"); + const dft: string = this.parseSelectDefaultValue(json, "select_pressurelosstype"); this.defaultProperties["pressureLossType"] = PressureLossType[dft]; } -- GitLab