From 668790ae42f76c20346b0cfa08b9da732eeb41b7 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Thu, 14 Feb 2019 10:20:10 +0100
Subject: [PATCH] =?UTF-8?q?hotfix:=20r=C3=A9sultats=20de=20calcul=20!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../fixedvar-results/fixed-results.component.ts | 17 +++++++++++++----
.../fixedvar-results/var-results.component.ts | 1 -
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/app/components/fixedvar-results/fixed-results.component.ts b/src/app/components/fixedvar-results/fixed-results.component.ts
index d9485bf0e..4e97712b9 100644
--- a/src/app/components/fixedvar-results/fixed-results.component.ts
+++ b/src/app/components/fixedvar-results/fixed-results.component.ts
@@ -74,12 +74,21 @@ export class FixedResultsComponent {
});
}
// 2. calculation results
+ const res = this._fixedResults.result;
if (
- this._fixedResults.result
- && this._fixedResults.result.resultElement
- && this._fixedResults.result.resultElement.extraResults
+ res
+ && res.resultElement
+ && res.extraResults
) {
- const extraResults = this._fixedResults.result.resultElement.extraResults;
+ // 2.1. main result
+ data.push({
+ label: this._fixedResults.calculatedParameterHeader,
+ value: this.intlService.formatResult(res.name, res.resultElement.vCalc),
+ isCalcResult: true // for CSS
+ });
+
+ // 2.2. extra results
+ const extraResults = res.resultElement.extraResults;
for (const k in extraResults) {
if (extraResults.hasOwnProperty(k)) {
const er: number = extraResults[k];
diff --git a/src/app/components/fixedvar-results/var-results.component.ts b/src/app/components/fixedvar-results/var-results.component.ts
index ddc5eee57..7b8ca69eb 100644
--- a/src/app/components/fixedvar-results/var-results.component.ts
+++ b/src/app/components/fixedvar-results/var-results.component.ts
@@ -77,7 +77,6 @@ export class VarResultsComponent {
const list = [ r.param ];
// 2. result
- // list.push(re.vCalc.toFixed(nDigits));
list.push(re.vCalc.toFixed(nDigits));
// 3. extra results
--
GitLab