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 da5e5ca7915a2b1984046ba936bf0261458e4052..96ada8304b13eb5f3e4b2fb71ee8d5d9910b3a7d 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 d787ca36cce019b9e5a820d13ecbc94c958b002e..274ace58efd72189663c6dcbabb753e7735a8075 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 a3e1d2d228e66d7807dad418f41ecf0072fde166..b1586759d816fad63a116d294cecf52eb13cb0ee 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);