From 4c9ea6787bab3cd8d3ab59747425a58a420aaaf8 Mon Sep 17 00:00:00 2001
From: Jean-Pascal <jean-pascal.aubry@inrae.fr>
Date: Tue, 9 Jan 2024 16:34:16 +0000
Subject: [PATCH] fix: disable generateBackwaterInPAM button and
macrorugoremous calculate button when macrorugo form contains variable
parameters Refs #609
---
src/app/components/generic-calculator/calculator.component.ts | 4 +---
.../select-field-line/select-field-line.component.ts | 3 +++
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/app/components/generic-calculator/calculator.component.ts b/src/app/components/generic-calculator/calculator.component.ts
index 8aec6d7b5..e0977639f 100644
--- a/src/app/components/generic-calculator/calculator.component.ts
+++ b/src/app/components/generic-calculator/calculator.component.ts
@@ -583,7 +583,6 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe
res = res && pstr.getChildren().length > 0;
break;
}
-
res = res && this._formulaire.currentNub.isComputable();
}
@@ -1031,7 +1030,7 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe
}
public get generateCrPamEnabled(): boolean {
- return this.hasResults && !this._formulaire.currentNub.result.hasErrorMessages();
+ return this.hasResults && this.allParamsAreFixed() && !this._formulaire.currentNub.result.hasErrorMessages();
}
public get uitextGenerateParSimulationTitle(): string {
@@ -1274,7 +1273,6 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe
}
public async generateBackwaterInPAM() {
- console.log("generateBackwaterInPAM")
const f: FormulaireDefinition = await this.formulaireService.createFormulaire(CalculatorType.MacrorugoRemous);
const mrr = (f.currentNub as MacrorugoRemous);
mrr.setPropValue("nubMacroRugo", this.formulaire.currentNub.uid);
diff --git a/src/app/components/select-field-line/select-field-line.component.ts b/src/app/components/select-field-line/select-field-line.component.ts
index 7142ef870..a86c9c7cf 100644
--- a/src/app/components/select-field-line/select-field-line.component.ts
+++ b/src/app/components/select-field-line/select-field-line.component.ts
@@ -60,6 +60,9 @@ export class SelectFieldLineComponent implements OnInit {
}
public get isValid(): boolean {
+ if(this._select.errorMessage !== undefined) {
+ return false;
+ }
return (this._select.getValue() !== undefined);
}
--
GitLab