From 5771637896a3af155dbe9ca0cb4ada8461e977f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Mon, 19 Sep 2022 16:21:19 +0200
Subject: [PATCH] feat: fish ladder: add upstream/downstream head, submergence
results
refs #518
---
src/app/calculators/pab/en.json | 5 ++-
src/app/calculators/pab/fr.json | 5 ++-
.../pab-results-table.component.ts | 38 +++++++++++++------
src/app/results/pab-results.ts | 18 +++++++--
4 files changed, 50 insertions(+), 16 deletions(-)
diff --git a/src/app/calculators/pab/en.json b/src/app/calculators/pab/en.json
index db6cefb8a..d3fda007d 100644
--- a/src/app/calculators/pab/en.json
+++ b/src/app/calculators/pab/en.json
@@ -25,5 +25,8 @@
"UNIT_Z": "m",
"UNIT_ZRAM": "m",
"UNIT_ZRB": "m",
- "UNIT_ZRMB": "m"
+ "UNIT_ZRMB": "m",
+ "UNIT_H1": "m",
+ "UNIT_H2": "m",
+ "UNIT_SUBMERGENCE": "%"
}
\ No newline at end of file
diff --git a/src/app/calculators/pab/fr.json b/src/app/calculators/pab/fr.json
index c08b87e1f..d951248b7 100644
--- a/src/app/calculators/pab/fr.json
+++ b/src/app/calculators/pab/fr.json
@@ -25,5 +25,8 @@
"UNIT_Z": "m",
"UNIT_ZRAM": "m",
"UNIT_ZRB": "m",
- "UNIT_ZRMB": "m"
+ "UNIT_ZRMB": "m",
+ "UNIT_H1": "m",
+ "UNIT_H2": "m",
+ "UNIT_SUBMERGENCE": "%"
}
\ No newline at end of file
diff --git a/src/app/components/pab-results/pab-results-table.component.ts b/src/app/components/pab-results/pab-results-table.component.ts
index 3591658a7..b541cdc52 100644
--- a/src/app/components/pab-results/pab-results-table.component.ts
+++ b/src/app/components/pab-results/pab-results-table.component.ts
@@ -46,7 +46,7 @@ export class PabResultsTableComponent extends ResultsComponentDirective implemen
this.results
&& this.results.cloisonsResults
&& this.results.cloisonsResults.length > 0
- && ! this.results.hasOnlyErrors()
+ && !this.results.hasOnlyErrors()
) {
const pr = this.results;
// when a parameter is variating, index of the variating parameter
@@ -88,7 +88,10 @@ export class PabResultsTableComponent extends ResultsComponentDirective implemen
fv(r2n.YMOY),
fv(r2n.ZRMB),
fv(r2n.QA),
- this.getJetTypes(pr.cloisonsResults[i], vi)
+ this.getJetTypes(pr.cloisonsResults[i], vi),
+ this.getStructuresParam(pr.cloisonsResults[i], vi,"H1"),
+ this.getStructuresParam(pr.cloisonsResults[i], vi,"H2"),
+ this.getStructuresParam(pr.cloisonsResults[i], vi,"SUBMERGENCE"),
]);
}
}
@@ -104,7 +107,10 @@ export class PabResultsTableComponent extends ResultsComponentDirective implemen
fv(rln.DH),
fv(rln.Q),
"", "", "", "",
- this.getJetTypes(pr.cloisonAvalResults, vi)
+ this.getJetTypes(pr.cloisonAvalResults, vi),
+ this.getStructuresParam(pr.cloisonAvalResults, vi, "H1"),
+ this.getStructuresParam(pr.cloisonAvalResults, vi, "H2"),
+ this.getStructuresParam(pr.cloisonAvalResults, vi, "SUBMERGENCE"),
]);
// extra lift gate ?
if (cloisonAval && cloisonAval.hasVanneLevante()) {
@@ -122,19 +128,29 @@ export class PabResultsTableComponent extends ResultsComponentDirective implemen
}
private getJetTypes(re: Result, vi: number): string {
- // jet type for each device
+ return this.getStructuresParam(re, vi, "ENUM_StructureJetType", "INFO_ENUM_STRUCTUREJETTYPE_");
+ }
+
+ private getStructuresParam(re: Result, vi: number, propName: string, localisationCode?: string): string {
const devices = re.sourceNub.getChildren();
- const jetTypes: string[] = devices.map((device) => {
- const jt = device.result.resultElements[vi].getValue("ENUM_StructureJetType");
- let jetType = this.intlService.localizeText("INFO_ENUM_STRUCTUREJETTYPE_" + jt);
+ // parameter for each device
+ const params: string[] = devices.map((device) => {
+ const val = device.result.resultElements[vi].getValue(propName);
+ let sVal;
+ if (localisationCode !== undefined) {
+ sVal = this.intlService.localizeText(localisationCode + val);
+ }
+ else {
+ sVal = fv(val);
+ }
if (devices.length > 1) {
// evil HTML injection in table cell (simpler)
- jetType = this.intlService.localizeText("INFO_LIB_FS_OUVRAGE") + " n°"
- + (device.findPositionInParent() + 1) + ": " + jetType;
+ sVal = this.intlService.localizeText("INFO_LIB_FS_OUVRAGE") + " n°"
+ + (device.findPositionInParent() + 1) + ": " + sVal;
}
- return jetType;
+ return sVal;
});
- return `<div class="inner-cell-line">` + jetTypes.join(`, </div><div class="inner-cell-line">`) + `</div>`;
+ return `<div class="inner-cell-line">` + params.join(`, </div><div class="inner-cell-line">`) + `</div>`;
}
public get headers() {
diff --git a/src/app/results/pab-results.ts b/src/app/results/pab-results.ts
index 2f9605369..155d7bbfd 100644
--- a/src/app/results/pab-results.ts
+++ b/src/app/results/pab-results.ts
@@ -40,7 +40,10 @@ export class PabResults extends MultiDimensionResults implements PlottableData {
"YMOY",
"ZRMB",
"QA",
- "ENUM_StructureJetType"
+ "ENUM_StructureJetType",
+ "H1",
+ "H2",
+ "SUBMERGENCE"
];
// axes par défaut
this.chartX = this.chartX || "CLOISON";
@@ -61,7 +64,7 @@ export class PabResults extends MultiDimensionResults implements PlottableData {
if (sn.parent) {
ct = sn.parent.calcType;
}
- let label = ServiceFactory.formulaireService.expandVariableNameAndUnit(ct , h);
+ let label = ServiceFactory.formulaireService.expandVariableNameAndUnit(ct, h);
label += this.getHelpLink(h);
return label;
});
@@ -94,7 +97,7 @@ export class PabResults extends MultiDimensionResults implements PlottableData {
// do not test result.ok else log messages will prevent partial results from being displayed
public get hasResults(): boolean {
- return this.result !== undefined && ! this.result.hasOnlyErrors;
+ return this.result !== undefined && !this.result.hasOnlyErrors;
}
/** retourne true si au moins un calcul a échoué (le log a un code négatif) */
@@ -231,6 +234,15 @@ export class PabResults extends MultiDimensionResults implements PlottableData {
data.push(this.Z2[vi]);
break;
+ case "H1":
+ case "H2":
+ case "SUBMERGENCE":
+ for (let i = 0; i < l; i++) {
+ data.push(this.cloisonsResults[i].resultElements[vi].vCalc);
+ }
+ data.push(this.cloisonAvalResults.resultElements[vi].vCalc);
+ break;
+
case "PV":
case "YMOY":
case "ZRMB":
--
GitLab