Commit 84440aeb authored by Dorchies David's avatar Dorchies David
Browse files

Fix #109 Remove getter resultsOk in Result and ResultElement

Showing with 5 additions and 23 deletions
+5 -23
......@@ -436,7 +436,7 @@ export abstract class Nub extends ComputeNode implements IObservable {
public V(p: ParamDefinition): number {
if (p.valueMode === ParamValueMode.CALCUL) {
if (this.result !== undefined) {
if (this.result.ok) {
if (this.result.resultElement.ok) {
return this.result.vCalc;
}
}
......@@ -943,12 +943,14 @@ export abstract class Nub extends ComputeNode implements IObservable {
try {
param.defineReference(destNub, p.targetParam);
} catch (err) {
// tslint:disable-next-line:no-console
console.error(`fixLinks: defineReference error`
+ ` (${this.uid}.${param.symbol} => ${destNub.uid}.${p.targetParam})`);
// forward error
ret.hasErrors = true;
}
} else {
// tslint:disable-next-line:no-console
console.error("fixLinks : cannot find target Nub");
// forward error
ret.hasErrors = true;
......
......@@ -279,23 +279,7 @@ export class Result extends JalhydObject implements INamedIterableValues {
* @returns true si le test est valide
*/
public get ok(): boolean {
return this.resultsOk && !this.hasErrorMessages;
}
/**
* Teste si tous les résultats + complémentaires sont valides
* @returns true si le test est valide
*/
public get resultsOk(): boolean {
if (this._resultElements.length === 0) {
return false;
}
for (const r of this._resultElements) {
if (!r.resultsOk) {
return false;
}
}
return true;
return this.resultElement.ok;
}
/**
......
......@@ -57,10 +57,6 @@ export class ResultElement {
return Object.keys(this._extraResults).length > 0;
}
public get resultsOk(): boolean {
return this._vCalc !== undefined || this.hasExtraResults;
}
private get messageCount(): number {
return this.log.messages.length;
}
......@@ -82,7 +78,7 @@ export class ResultElement {
}
public get ok(): boolean {
return this.resultsOk && !this.hasErrorMessages;
return (this._vCalc !== undefined || this.hasExtraResults) && !this.hasErrorMessages;
}
/**
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment