From 564a499c8d6fd53b0e9016ebf8a79af4dd910d02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Fri, 31 Mar 2023 15:28:06 +0200
Subject: [PATCH] fix: simple rock-ramp calculator: enable backwater curve
generation button only if calculation has been run
refs #609
---
.../components/generic-calculator/calculator.component.html | 2 +-
src/app/components/generic-calculator/calculator.component.ts | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/app/components/generic-calculator/calculator.component.html b/src/app/components/generic-calculator/calculator.component.html
index 79dec21bc..d8f4056d3 100644
--- a/src/app/components/generic-calculator/calculator.component.html
+++ b/src/app/components/generic-calculator/calculator.component.html
@@ -214,7 +214,7 @@
</button>
<button mat-raised-button color="accent" id="generate-backwater-curve" *ngIf="isPAM"
- (click)="generateBackwaterInPAM()">
+ (click)="generateBackwaterInPAM()" [disabled]="!generateCrPamEnabled">
{{ uitextGenerateBackwaterInPAM }}
</button>
diff --git a/src/app/components/generic-calculator/calculator.component.ts b/src/app/components/generic-calculator/calculator.component.ts
index 7c249e932..0228b5f3c 100644
--- a/src/app/components/generic-calculator/calculator.component.ts
+++ b/src/app/components/generic-calculator/calculator.component.ts
@@ -1030,6 +1030,10 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe
);
}
+ public get generateCrPamEnabled(): boolean {
+ return this.hasResults && !this._formulaire.currentNub.result.hasErrorMessages();
+ }
+
public get uitextGenerateParSimulationTitle(): string {
const parCalage = (this._formulaire.currentNub as Par);
if (!this.hasResults || parCalage.result.hasErrorMessages()) {
--
GitLab