From 2562e16e2f445e9d73556c1226474dea8dfa02f2 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Wed, 31 Jul 2019 17:48:03 +0200
Subject: [PATCH] Adaptation to jalhyd results refactoring
---
.../fixed-results.component.ts | 2 +-
.../fixedvar-results.component.ts | 4 +--
.../pab-results/pab-results.component.ts | 28 +++++++++----------
src/app/results/pab-results.ts | 18 ++++++------
src/app/results/param-calc-results.ts | 2 +-
5 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/app/components/fixedvar-results/fixed-results.component.ts b/src/app/components/fixedvar-results/fixed-results.component.ts
index 4a9534654..1a9a0f822 100644
--- a/src/app/components/fixedvar-results/fixed-results.component.ts
+++ b/src/app/components/fixedvar-results/fixed-results.component.ts
@@ -91,7 +91,7 @@ export class FixedResultsComponent {
const res = this._fixedResults.result;
if (
res
- && res.nbResultElements > 0
+ && res.resultElements.length > 0
&& res.resultElement
&& res.extraResults
) {
diff --git a/src/app/components/fixedvar-results/fixedvar-results.component.ts b/src/app/components/fixedvar-results/fixedvar-results.component.ts
index d5d9c85cc..87a483a11 100644
--- a/src/app/components/fixedvar-results/fixedvar-results.component.ts
+++ b/src/app/components/fixedvar-results/fixedvar-results.component.ts
@@ -99,8 +99,8 @@ export class FixedVarResultsComponent implements DoCheck {
}
private mergeLog(result: Result, log: cLog) {
- if (result && result.hasLog) {
- if (result.hasGlobalLog) {
+ if (result && result.hasLog()) {
+ if (result.hasGlobalLog()) {
log.addLog(result.globalLog);
} else {
log.addLog(result.log);
diff --git a/src/app/components/pab-results/pab-results.component.ts b/src/app/components/pab-results/pab-results.component.ts
index 4c3418eab..510867ca6 100644
--- a/src/app/components/pab-results/pab-results.component.ts
+++ b/src/app/components/pab-results/pab-results.component.ts
@@ -109,12 +109,12 @@ export class PabResultsComponent implements DoCheck {
private mergeGlobalLog(result: Result, log: cLog) {
if (result) {
- if (result.hasGlobalLog) {
+ if (result.hasGlobalLog()) {
log.addLog(result.globalLog);
}
// if no parameter is varying, 1st element log is considered "global"
if (this.pabResults.variatedParameters.length === 0) {
- if (result.hasResultElements && result.resultElement.hasLog) {
+ if (result.hasResultElements() && result.resultElement.hasLog()) {
log.addLog(result.log);
}
}
@@ -130,9 +130,9 @@ export class PabResultsComponent implements DoCheck {
warning: 0,
error: 0
};
- if (this._pabResults.result && this._pabResults.result.hasLog) {
+ if (this._pabResults.result && this._pabResults.result.hasLog()) {
for (const re of this._pabResults.result.resultElements) {
- if (re.hasLog) {
+ if (re.hasLog()) {
for (const m of re.log.messages) {
const s = m.getSeverity();
switch (s) {
@@ -151,9 +151,9 @@ export class PabResultsComponent implements DoCheck {
}
}
for (const cr of this._pabResults.cloisonsResults) {
- if (cr && cr.hasLog) {
+ if (cr && cr.hasLog()) {
for (const re of cr.resultElements) {
- if (re.hasLog) {
+ if (re.hasLog()) {
for (const m of re.log.messages) {
const s = m.getSeverity();
switch (s) {
@@ -172,9 +172,9 @@ export class PabResultsComponent implements DoCheck {
}
}
}
- if (this._pabResults.cloisonAvalResults && this._pabResults.cloisonAvalResults.hasLog) {
+ if (this._pabResults.cloisonAvalResults && this._pabResults.cloisonAvalResults.hasLog()) {
for (const re of this._pabResults.cloisonAvalResults.resultElements) {
- if (re.hasLog) {
+ if (re.hasLog()) {
for (const m of re.log.messages) {
const s = m.getSeverity();
switch (s) {
@@ -235,19 +235,19 @@ export class PabResultsComponent implements DoCheck {
// log de la PAB pour l'itération en cours
if (
this._pabResults.result
- && this._pabResults.result.hasResultElements
+ && this._pabResults.result.hasResultElements()
&& this._pabResults.result.resultElements[vi]
- && this._pabResults.result.resultElements[vi].hasLog
+ && this._pabResults.result.resultElements[vi].hasLog()
) {
l.addLog(this._pabResults.result.resultElements[vi].log);
}
// logs des enfants pour l'itération en cours
for (const cr of this._pabResults.cloisonsResults) {
- if (cr && cr.hasResultElements && cr.resultElements[vi].hasLog) {
+ if (cr && cr.hasResultElements() && cr.resultElements[vi].hasLog()) {
l.addLog(cr.resultElements[vi].log);
}
}
- if (this._pabResults.cloisonAvalResults && this._pabResults.cloisonAvalResults.resultElements[vi].hasLog) {
+ if (this._pabResults.cloisonAvalResults && this._pabResults.cloisonAvalResults.resultElements[vi].hasLog()) {
l.addLog(this._pabResults.cloisonAvalResults.resultElements[vi].log);
}
} else {
@@ -255,11 +255,11 @@ export class PabResultsComponent implements DoCheck {
this.mergeGlobalLog(this._pabResults.result, l); // faut bien mettre le log global quelque part
// logs des enfants
for (const cr of this._pabResults.cloisonsResults) {
- if (cr && cr.hasResultElements && cr.resultElement.hasLog) {
+ if (cr && cr.hasResultElements() && cr.resultElement.hasLog()) {
l.addLog(cr.resultElement.log);
}
}
- if (this._pabResults.cloisonAvalResults && this._pabResults.cloisonAvalResults.resultElement.hasLog) {
+ if (this._pabResults.cloisonAvalResults && this._pabResults.cloisonAvalResults.resultElement.hasLog()) {
l.addLog(this._pabResults.cloisonAvalResults.resultElement.log);
}
}
diff --git a/src/app/results/pab-results.ts b/src/app/results/pab-results.ts
index 7cf40aad0..a81d37158 100644
--- a/src/app/results/pab-results.ts
+++ b/src/app/results/pab-results.ts
@@ -77,14 +77,14 @@ export class PabResults extends CalculatedParamResults {
public get hasLog(): boolean {
if (this.cloisonsResults) {
for (const cr of this.cloisonsResults) {
- if (cr && cr.hasLog) {
+ if (cr && cr.hasLog()) {
return true;
}
}
}
return (
- (this.result && this.result.hasLog)
- || (this.cloisonAvalResults && this.cloisonAvalResults.hasLog)
+ (this.result && this.result.hasLog())
+ || (this.cloisonAvalResults && this.cloisonAvalResults.hasLog())
);
}
@@ -97,26 +97,26 @@ export class PabResults extends CalculatedParamResults {
public hasError(): boolean {
let err = false;
// log principal
- err = (err || this.result.hasErrorMessages);
+ err = (err || this.result.hasErrorMessages());
// logs des cloisons
for (const c of this.cloisonsResults) {
- err = (err || c.hasErrorMessages);
+ err = (err || c.hasErrorMessages());
}
// log de la cloison aval
- err = (err || this.cloisonAvalResults.hasErrorMessages);
+ err = (err || this.cloisonAvalResults.hasErrorMessages());
return err;
}
/** retourne true si le calcul à l'itération i a échoué */
public iterationHasError(i: number): boolean {
- let err = this.result.resultElements[i].hasErrorMessages;
+ let err = this.result.resultElements[i].hasErrorMessages();
// logs des cloisons
for (const c of this.cloisonsResults) {
- err = (err || c.resultElements[i].hasErrorMessages);
+ err = (err || c.resultElements[i].hasErrorMessages());
}
// log de la cloison aval
- err = (err || this.cloisonAvalResults.resultElements[i].hasErrorMessages);
+ err = (err || this.cloisonAvalResults.resultElements[i].hasErrorMessages());
return err;
}
diff --git a/src/app/results/param-calc-results.ts b/src/app/results/param-calc-results.ts
index bdcabde2d..4867c0e0a 100644
--- a/src/app/results/param-calc-results.ts
+++ b/src/app/results/param-calc-results.ts
@@ -48,7 +48,7 @@ export abstract class CalculatedParamResults extends CalculatorResults {
if (this.result === undefined) {
return false;
}
- return this.result.hasLog;
+ return this.result.hasLog();
}
public get log(): cLog {
--
GitLab