From 3cb605f85245610751f2e393f93c94904993a2a3 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Tue, 14 May 2019 10:18:55 +0200
Subject: [PATCH] =?UTF-8?q?Correction=20bug:=20les=20ent=C3=AAtes=20de=20r?=
=?UTF-8?q?=C3=A9sultats=20de=20PAB=20s'affichaient=20sur=20tous=20les=20m?=
=?UTF-8?q?odules?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/components/pab-results/pab-results-table.component.ts | 4 ++--
src/app/components/pab-results/pab-results.component.ts | 3 ++-
src/app/formulaire/definition/form-compute-pab.ts | 1 -
3 files changed, 4 insertions(+), 4 deletions(-)
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 da5e5ca79..96ada8304 100644
--- a/src/app/components/pab-results/pab-results-table.component.ts
+++ b/src/app/components/pab-results/pab-results-table.component.ts
@@ -53,7 +53,7 @@ export class PabResultsTableComponent {
];
this._dataSet = [];
- if (this._pabResults) {
+ if (this._pabResults && this._pabResults.cloisonsResults && this._pabResults.cloisonsResults.length > 0) {
const pr = this._pabResults;
const nDigits = this.appSetupService.displayDigits;
// line 1
@@ -150,6 +150,6 @@ export class PabResultsTableComponent {
const wb: XLSX.WorkBook = XLSX.utils.book_new();
XLSX.utils.book_append_sheet(wb, ws, "default");
// save and download
- XLSX.writeFile(wb, "VariableResults.xlsx");
+ XLSX.writeFile(wb, "PABResults.xlsx");
}
}
diff --git a/src/app/components/pab-results/pab-results.component.ts b/src/app/components/pab-results/pab-results.component.ts
index d787ca36c..274ace58e 100644
--- a/src/app/components/pab-results/pab-results.component.ts
+++ b/src/app/components/pab-results/pab-results.component.ts
@@ -35,7 +35,8 @@ export class PabResultsComponent implements DoCheck {
) { }
public set results(rs: CalculatorResults[]) {
- if (rs.length > 0) {
+ this._pabResults = undefined;
+ if (rs.length > 0 && rs[0] instanceof PabResults) {
this._pabResults = rs[0] as PabResults;
}
this.updateView();
diff --git a/src/app/formulaire/definition/form-compute-pab.ts b/src/app/formulaire/definition/form-compute-pab.ts
index a3e1d2d22..b1586759d 100644
--- a/src/app/formulaire/definition/form-compute-pab.ts
+++ b/src/app/formulaire/definition/form-compute-pab.ts
@@ -34,7 +34,6 @@ export class FormComputePab extends FormCompute {
const cq: number[] = [];
// valeur de QA pour chaque bassin
const bqa: number[] = [];
- console.log("pab.children[0].result >>", pab.children[0].result);
for (const c of pab.children) {
cr.push(c.result);
cq.push(c.prms.Q.v);
--
GitLab