From 25f1329cf6a0b673f3325960908a155efe142afa Mon Sep 17 00:00:00 2001
From: Mathias Chouet <mathias.chouet@irstea.fr>
Date: Fri, 3 Apr 2020 15:05:42 +0200
Subject: [PATCH] Hide calculate button and results panel when form is not
calculable
---
.../components/generic-calculator/calculator.component.html | 4 +++-
src/app/components/generic-calculator/calculator.component.ts | 4 ++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/app/components/generic-calculator/calculator.component.html b/src/app/components/generic-calculator/calculator.component.html
index b1b3ec2b0..7b46d2c9e 100644
--- a/src/app/components/generic-calculator/calculator.component.html
+++ b/src/app/components/generic-calculator/calculator.component.html
@@ -76,7 +76,8 @@
<mat-card-actions>
<!-- bouton calculer -->
- <button type="submit" id="trigger-calculate" mat-raised-button color="accent" name="Calculer" (click)="doCompute()" [disabled]="isCalculateDisabled">
+ <button type="submit" id="trigger-calculate" mat-raised-button color="accent" name="Calculer"
+ (click)="doCompute()" [disabled]="isCalculateDisabled" [hidden]="calculateDisabledPermanently">
{{ uitextCalculer }}
</button>
</mat-card-actions>
@@ -84,6 +85,7 @@
<!-- résultats -->
<mat-card id="calc-card-results"
+ [hidden]="calculateDisabledPermanently"
[class.pab-results]="isWide"
[fxFlex.gt-sm]="isWide ? '1 0 auto' : '1 0 400px'"
[fxFlex.lt-md]="isWide ? '1 0 auto' : '1 0 500px'"
diff --git a/src/app/components/generic-calculator/calculator.component.ts b/src/app/components/generic-calculator/calculator.component.ts
index 4d3c377ce..ddb07a6c6 100644
--- a/src/app/components/generic-calculator/calculator.component.ts
+++ b/src/app/components/generic-calculator/calculator.component.ts
@@ -153,6 +153,10 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe
return this._formulaire.kids as FormulaireElement[];
}
+ public get calculateDisabledPermanently(): boolean {
+ return this._formulaire.calculateDisabled;
+ }
+
/**
* détermine si un FormulaireElement est du type FieldSet
*/
--
GitLab