diff --git a/src/app/components/field-set/field-set.component.ts b/src/app/components/field-set/field-set.component.ts index 1c14aafc4185fa19cc05fc904844a2b2a092313d..cbf78ed49f4f3602b7382efd91d71ac4ca0b0ce1 100644 --- a/src/app/components/field-set/field-set.component.ts +++ b/src/app/components/field-set/field-set.component.ts @@ -261,6 +261,13 @@ export class FieldSetComponent implements DoCheck { this._paramComponents.forEach(fsc => fsc.updateParameterFromUI()); } + /** + * met à jour les paramètres liés + */ + public updateLinkedParameters() { + this._paramComponents.forEach(fsc => fsc.updateLinkedParameter()); + } + /** * clic sur le bouton ajouter */ diff --git a/src/app/components/fieldset-container/fieldset-container.component.ts b/src/app/components/fieldset-container/fieldset-container.component.ts index 240f408b9337099a717173d56df4b9632e1e30ca..947302dee60faf8f7c06174212a4a6641545725d 100644 --- a/src/app/components/fieldset-container/fieldset-container.component.ts +++ b/src/app/components/fieldset-container/fieldset-container.component.ts @@ -161,6 +161,13 @@ export class FieldsetContainerComponent implements DoCheck, AfterViewInit { this._fieldsetComponents.forEach(fsc => fsc.updateParametersFromUI()); } + /** + * met à jour les paramètres liés + */ + public updateLinkedParameters() { + this._fieldsetComponents.forEach(fsc => fsc.updateLinkedParameters()); + } + /** * réception d'un événement de demande d'ajout d'un FieldSet */ diff --git a/src/app/components/generic-calculator/calculator.component.ts b/src/app/components/generic-calculator/calculator.component.ts index b7b8a07fc9487b2738c8179cf7ee0d1090eaf1bc..6a293b7bfc6aaf27fb95d791962443243fe3f2e9 100644 --- a/src/app/components/generic-calculator/calculator.component.ts +++ b/src/app/components/generic-calculator/calculator.component.ts @@ -194,6 +194,7 @@ export class GenericCalculatorComponent extends BaseComponent implements OnInit, */ private onRadioClick(info: any) { this._formulaire.onRadioClick(info); + this.updateLinkedParameters(); } private onCloseForm() { @@ -219,6 +220,14 @@ export class GenericCalculatorComponent extends BaseComponent implements OnInit, this._fieldsetContainerComponents.forEach(fscc => fscc.updateParametersFromUI()); } + /** + * met à jour les paramètres liés + */ + private updateLinkedParameters() { + this._fieldsetComponents.forEach(fsc => fsc.updateLinkedParameters()); + this._fieldsetContainerComponents.forEach(fscc => fscc.updateLinkedParameters()); + } + private doCompute() { this.updateParametersFromUI(); this._formulaire.doCompute(); diff --git a/src/app/components/param-field-line/param-field-line.component.ts b/src/app/components/param-field-line/param-field-line.component.ts index 6b1883394621b387fc860d4d58a620e2cb36e570..a741c7cb283b593ac86999b5055e7b9864ddb7cd 100644 --- a/src/app/components/param-field-line/param-field-line.component.ts +++ b/src/app/components/param-field-line/param-field-line.component.ts @@ -6,6 +6,7 @@ import { NgParamInputComponent } from "../ngparam-input/ngparam-input.component" import { ServiceFactory } from "../../services/service-factory"; import { ParamValueMode, CalculatorType, ParallelStructure } from "jalhyd"; import { FormulaireService } from "../../services/formulaire/formulaire.service"; +import { ParamLinkComponent } from "../param-link/param-link.component"; @Component({ selector: "param-field-line", @@ -34,6 +35,9 @@ export class ParamFieldLineComponent implements OnChanges { @ViewChild(NgParamInputComponent) private _ngParamInputComponent: NgParamInputComponent; + @ViewChild(ParamLinkComponent) + private _paramLinkComponent: ParamLinkComponent; + @Output() private onValid: EventEmitter<void>; @@ -360,4 +364,12 @@ export class ParamFieldLineComponent implements OnChanges { public updateParameterFromUI() { this._ngParamInputComponent.updateModelFromUI(); } + + /** + * met à jour les paramètres liés + */ + public updateLinkedParameter() { + if (this._paramLinkComponent !== undefined) + this._paramLinkComponent.updateParamList(); + } } diff --git a/src/app/components/param-link/param-link.component.ts b/src/app/components/param-link/param-link.component.ts index ab78d4d8553ea4845c5ba2382f74595db39e56ea..8ad07ff0c532bf0f6be8b006ddbde94064365da8 100644 --- a/src/app/components/param-link/param-link.component.ts +++ b/src/app/components/param-link/param-link.component.ts @@ -145,7 +145,7 @@ export class ParamLinkComponent implements OnChanges, Observer, OnDestroy { } } - private updateParamList() { + public updateParamList() { // liste des paramètres liables // this._linkableParams = this._formService.getLinkableParameters(this._param); this._linkableParams = this._formService.getLinkableValues(this._param);