From c541fe8a74642f5ec5e4c17c5e88d032702cd166 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Fri, 5 Jul 2019 15:20:39 +0200
Subject: [PATCH] Work on #232
---
.../pab-results/pab-results-table.component.ts | 16 +++++++++++++++-
src/locale/messages.en.json | 1 +
src/locale/messages.fr.json | 1 +
3 files changed, 17 insertions(+), 1 deletion(-)
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 707d73cf9..2bcfa689b 100644
--- a/src/app/components/pab-results/pab-results-table.component.ts
+++ b/src/app/components/pab-results/pab-results-table.component.ts
@@ -1,8 +1,10 @@
import { Component, ViewChild, ElementRef } from "@angular/core";
-import { PabResults } from "../../results/pab-results";
+import { CloisonAval } from "jalhyd";
import * as XLSX from "xlsx";
+
+import { PabResults } from "../../results/pab-results";
import { ApplicationSetupService } from "../../services/app-setup/app-setup.service";
import { I18nService } from "../../services/internationalisation/internationalisation.service";
import { ResultsComponent } from "../fixedvar-results/results.component";
@@ -99,6 +101,18 @@ export class PabResultsTableComponent extends ResultsComponent {
rln.Q.toFixed(nDigits),
"", "", "", ""
]);
+ // extra lift gate ?
+ const cloisonAval = (pr.cloisonAvalResults.sourceNub as CloisonAval);
+ if (cloisonAval && cloisonAval.hasVanneLevante()) {
+ const vanneZDV = cloisonAval.result.resultElements[vi].getExtraResult("ZDV");
+ if (vanneZDV) {
+ this._dataSet.push([
+ this.intlService.localizeText("INFO_LIB_COTE_VANNE_LEVANTE"),
+ vanneZDV.toFixed(nDigits),
+ "", "", "", "", "", "", ""
+ ]);
+ }
+ }
}
}
}
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index 7523d3ebf..f51fe3182 100644
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -123,6 +123,7 @@
"INFO_LIB_BT": "Half opening of the triangle",
"INFO_LIB_CD": "Discharge coefficient",
"INFO_LIB_CLOISON": "Cross wall #",
+ "INFO_LIB_COTE_VANNE_LEVANTE": "Lift gate elevation",
"INFO_LIB_CV": "Cv: Velocity coefficient",
"INFO_LIB_CVQT": "CV.QT: Corrected discharge",
"INFO_LIB_DH": "Fall",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index 84adca352..baf4af6ee 100644
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -123,6 +123,7 @@
"INFO_LIB_BT": "Demi-ouverture du triangle",
"INFO_LIB_CD": "Coefficient de débit",
"INFO_LIB_CLOISON": "Cloison n°",
+ "INFO_LIB_COTE_VANNE_LEVANTE": "Cote vanne levante",
"INFO_LIB_CV": "Cv: Coefficient de vitesse d'approche",
"INFO_LIB_CVQT": "CV.QT: Débit corrigé",
"INFO_LIB_DH": "Chute",
--
GitLab