diff --git a/src/app/components/fixedvar-results/fixed-results.component.ts b/src/app/components/fixedvar-results/fixed-results.component.ts index d9485bf0e7d14a84175d5a6c78f59869f57aab06..4e97712b9f79d4c3999c8d76c70c7f77342b5b63 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 ddc5eee572aec11b83c9f2db8b9e53a8d498e73d..7b8ca69eb196661c8d0b8619bf10bdad3c314aa2 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