From 19a7c8621bc018f77969b11cf3d0930d39477af0 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Wed, 23 Oct 2019 11:14:54 +0200
Subject: [PATCH] Fix #309 - consider children Nubs id Solveur's searched
parameter selector
---
src/app/formulaire/select-field-parameter.ts | 10 ++++++----
src/locale/messages.en.json | 1 +
src/locale/messages.fr.json | 1 +
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/app/formulaire/select-field-parameter.ts b/src/app/formulaire/select-field-parameter.ts
index b979a98f7..c0ddf2b6e 100644
--- a/src/app/formulaire/select-field-parameter.ts
+++ b/src/app/formulaire/select-field-parameter.ts
@@ -32,10 +32,12 @@ export class SelectFieldParameter extends SelectFieldReference {
const ntc: Nub = (this.parentForm.currentNub as Solveur).nubToCalculate;
const searchableParams = Solveur.getDependingNubsSearchableParams(ntc);
for (const p of searchableParams) {
- const calc = fs.getFormulaireFromId(p.parentNub.uid).calculatorName;
- const varName = fs.expandVariableName(p.parentNub.calcType, p.symbol);
- const label = `${p.symbol} - ${varName} (${calc})`;
- this.addEntry(new SelectEntry(this._entriesBaseId + p.nubUid + "_" + p.symbol, p, decodeHtml(label)));
+ if (p.visible) {
+ const calc = fs.getFormulaireFromId(p.originNub.uid).calculatorName;
+ const varName = fs.expandVariableName(p.originNub.calcType, p.symbol);
+ const label = `${p.symbol} - ${varName} (${calc})`;
+ this.addEntry(new SelectEntry(this._entriesBaseId + p.originNub.uid + "_" + p.symbol, p, decodeHtml(label)));
+ }
}
break;
}
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index b6db3ee32..44ccd65e3 100644
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -264,6 +264,7 @@
"INFO_LIB_VDEB": "Conveyance speed",
"INFO_LIB_VMAX": "Maximal speed",
"INFO_LIB_W": "Gate opening",
+ "INFO_LIB_X": "Value for searched parameter",
"INFO_LIB_YC": "Critical depth",
"INFO_LIB_YCON": "Conjugate depth",
"INFO_LIB_YCOR": "Corresponding depth",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index f7dd7975f..d20566b46 100644
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -263,6 +263,7 @@
"INFO_LIB_VDEB": "Vitesse débitante",
"INFO_LIB_VMAX": "Vitesse maximale",
"INFO_LIB_W": "Ouverture de vanne",
+ "INFO_LIB_X": "Valeur du paramètre recherché",
"INFO_LIB_YC": "Tirant d'eau critique",
"INFO_LIB_YCON": "Tirant d'eau conjugué",
"INFO_LIB_YCOR": "Tirant d'eau correspondant",
--
GitLab