From 9fa635c47bf042568e2795e5163c8d706851e0ff Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Tue, 4 Jun 2019 14:15:02 +0200
Subject: [PATCH] =?UTF-8?q?Meilleure=20propagation=20des=20=C3=A9v=C3=A9ne?=
=?UTF-8?q?ments=20inputChange?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/field-set/field-set.component.html | 2 +-
.../components/field-set/field-set.component.ts | 4 ++--
.../fieldset-container.component.html | 2 +-
.../fieldset-container.component.ts | 4 ++--
.../generic-calculator/calculator.component.html | 5 +++--
.../param-field-line.component.html | 14 ++++++++++----
6 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/app/components/field-set/field-set.component.html b/src/app/components/field-set/field-set.component.html
index c80e4c991..2471c8dcb 100644
--- a/src/app/components/field-set/field-set.component.html
+++ b/src/app/components/field-set/field-set.component.html
@@ -30,7 +30,7 @@
<mat-card-content>
<ng-template ngFor let-p [ngForOf]="fields">
<param-field-line *ngIf="isInputField(p)" [param]=p (radio)=onRadioClick($event) (valid)=onParamLineValid()
- (inputChange)=onInputChange() (tabPressed)="onTabPressed($event)">
+ (inputChange)=onInputChange($event) (tabPressed)="onTabPressed($event)">
</param-field-line>
<select-field-line *ngIf="isSelectField(p)" [_select]=p>
diff --git a/src/app/components/field-set/field-set.component.ts b/src/app/components/field-set/field-set.component.ts
index 1a2a71700..70cd6a4ff 100644
--- a/src/app/components/field-set/field-set.component.ts
+++ b/src/app/components/field-set/field-set.component.ts
@@ -306,8 +306,8 @@ export class FieldSetComponent implements DoCheck {
/**
* réception d'un événement de changement de valeur d'un input
*/
- private onInputChange(event: boolean) {
- this.inputChange.emit();
+ private onInputChange($event) {
+ this.inputChange.emit($event);
}
/**
diff --git a/src/app/components/fieldset-container/fieldset-container.component.html b/src/app/components/fieldset-container/fieldset-container.component.html
index c2f75e4f1..0bb2ea7c2 100644
--- a/src/app/components/fieldset-container/fieldset-container.component.html
+++ b/src/app/components/fieldset-container/fieldset-container.component.html
@@ -6,7 +6,7 @@
<mat-card-content>
<field-set *ngFor="let fs of fieldsets" class="fieldset-inner" [fieldSet]=fs
- (radio)=onRadioClick($event) (validChange)=onFieldsetValid() (inputChange)=onInputChange()
+ (radio)=onRadioClick($event) (validChange)=onFieldsetValid() (inputChange)=onInputChange($event)
(addFieldset)=onAddFieldset($event) (removeFieldset)=onRemoveFieldset($event)
(moveFieldsetDown)=onMoveFieldsetDown($event) (moveFieldsetUp)=onMoveFieldsetUp($event)
(tabPressed)="onTabPressed($event)">
diff --git a/src/app/components/fieldset-container/fieldset-container.component.ts b/src/app/components/fieldset-container/fieldset-container.component.ts
index 2c161f764..e10c849a3 100644
--- a/src/app/components/fieldset-container/fieldset-container.component.ts
+++ b/src/app/components/fieldset-container/fieldset-container.component.ts
@@ -145,8 +145,8 @@ export class FieldsetContainerComponent implements DoCheck, AfterViewInit {
/**
* réception d'un événement de changement de valeur d'un input
*/
- private onInputChange(event: boolean) {
- this.inputChange.emit();
+ private onInputChange($event) {
+ this.inputChange.emit($event);
}
/**
diff --git a/src/app/components/generic-calculator/calculator.component.html b/src/app/components/generic-calculator/calculator.component.html
index db06e3792..4b518f5ab 100644
--- a/src/app/components/generic-calculator/calculator.component.html
+++ b/src/app/components/generic-calculator/calculator.component.html
@@ -33,12 +33,13 @@
<mat-card id="calc-card-field-sets" fxFlex.gt-xs="1 0 400px" fxFlex.lt-sm="1 0 300px">
<ng-template ngFor let-fe [ngForOf]="formElements">
<field-set *ngIf="isFieldset(fe)" [style.display]="getFieldsetStyleDisplay(fe.id)" [fieldSet]=fe
- (radio)=onRadioClick($event) (validChange)=OnFieldsetValid() (inputChange)=onInputChange()
+ (radio)=onRadioClick($event) (validChange)=OnFieldsetValid() (inputChange)=onInputChange($event)
(tabPressed)="onTabPressed($event)">
</field-set>
<fieldset-container *ngIf="isFieldsetContainer(fe)" [_container]=fe (radio)=onRadioClick($event)
- (validChange)=onFieldsetContainerValid() (tabPressed)="onTabPressed($event)">
+ (validChange)=onFieldsetContainerValid() (inputChange)=onInputChange($event)
+ (tabPressed)="onTabPressed($event)">
</fieldset-container>
</ng-template>
diff --git a/src/app/components/param-field-line/param-field-line.component.html b/src/app/components/param-field-line/param-field-line.component.html
index 1c71eb5b9..35c1fd0c8 100644
--- a/src/app/components/param-field-line/param-field-line.component.html
+++ b/src/app/components/param-field-line/param-field-line.component.html
@@ -5,16 +5,22 @@
<div fxFlex="1 0 120px">
<!-- composant pour gérer le cas général (valeur numérique à saisir) -->
<ngparam-input [title]="param.title" [hidden]="! isRadioFixChecked"
- (change)="onInputChange($event)" (tabPressed)="onTabPressed($event)"></ngparam-input>
+ (change)="onInputChange($event)" (tabPressed)="onTabPressed($event)">
+ </ngparam-input>
<!-- composant pour gérer le cas "paramètre calculé" -->
- <param-computed *ngIf="isRadioCalChecked" [title]="title" [param]="param"></param-computed>
+ <param-computed *ngIf="isRadioCalChecked" [title]="title" [param]="param">
+ </param-computed>
<!-- composant pour gérer le cas "paramètre à varier" (min-max/liste de valeurs) -->
- <param-values *ngIf="isRadioVarChecked" [title]="title" [param]="param" (change)="onInputChange($event)" (valid)=onParamValuesValid($event)></param-values>
+ <param-values *ngIf="isRadioVarChecked" [title]="title" [param]="param"
+ (change)="onInputChange($event)" (valid)=onParamValuesValid($event)>
+ </param-values>
<!-- composant pour gérer le cas "paramètre lié" -->
- <param-link *ngIf="isRadioLinkChecked" [title]="title" [param]="param" (change)="onInputChange($event)" (valid)=onParamValuesValid($event)></param-link>
+ <param-link *ngIf="isRadioLinkChecked" [title]="title" [param]="param"
+ (change)="onInputChange($event)" (valid)=onParamValuesValid($event)>
+ </param-link>
</div>
<div class="toggle-group-container" fxFlex="0 0 auto">
--
GitLab