diff --git a/src/app/components/field-set/field-set.component.html b/src/app/components/field-set/field-set.component.html index c80e4c991ea81b64bdf5f055f9df07cee58a6b46..2471c8dcb4c729e487c16c8e1b9ed2c3f6de27d7 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 1a2a717005c5f774e22bf84e45dfa1f34e582bb2..70cd6a4ffa1295622b1d09750e354fe6b1f84a3d 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 c2f75e4f19ef29b671ec12f24afabd08b67f648b..0bb2ea7c2e091f09bb27b41ed69147fba508ee6a 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 2c161f764a0282e86771fa7bc5c20d70d0787b51..e10c849a3023fc6426758bcfc2f08f99c4a09609 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 db06e3792b10cd0491c1110f404ae9858107af84..4b518f5ab96f9dc279ed229bb9f4cd42c4c44842 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 1c71eb5b957985b949b08b7862ed29578c6bb4e1..35c1fd0c841425b97aef1cbe4bc4c4d16427d3ee 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">