diff --git a/src/app/formulaire/definition/form-section-parametree.ts b/src/app/formulaire/definition/form-section-parametree.ts index 7f91f2fca963c76ba3e5bae49cfa8adc511afa8b..7ddfdefaf792c204256e0ec9cfebfc86e9d9588a 100644 --- a/src/app/formulaire/definition/form-section-parametree.ts +++ b/src/app/formulaire/definition/form-section-parametree.ts @@ -23,10 +23,6 @@ export class FormulaireSectionParametree extends FormulaireSection { this.reaffectResultComponents(); } - protected runNubCalc(nub: Nub, computedParam?: ParamDefinition): Result { - return nub.CalcSerie(); - } - protected reaffectResultComponents() { this.resetFormResults(); // to avoid adding fixed parameters more than once (see below) const sectNub: SectionParametree = this.currentNub as SectionParametree; diff --git a/src/app/formulaire/definition/form-section.ts b/src/app/formulaire/definition/form-section.ts index bf06c16b257e578889469d86dc696f6ea15249a0..3a6906d1a59621d3fc093beca2e8c6f7c28f76ef 100644 --- a/src/app/formulaire/definition/form-section.ts +++ b/src/app/formulaire/definition/form-section.ts @@ -47,11 +47,6 @@ export class FormulaireSection extends FormulaireFixedVar { const newSect = Session.getInstance().createSection(data.value); (this._currentNub as SectionNub).setSection(newSect); // reflect changes in GUI - for (const fs of this.allFieldsets) { - // show / hide dependent fields - fs.updateFields(); - } - // show / hide dependent fields this.refreshFieldsets(); this.reset(); } diff --git a/src/app/formulaire/elements/fieldset.ts b/src/app/formulaire/elements/fieldset.ts index c1678a93ba7bbc72b6bbba20953523941dc1cf8f..a705ab39225de4afcbe26e0a9d21f9c1691dca30 100644 --- a/src/app/formulaire/elements/fieldset.ts +++ b/src/app/formulaire/elements/fieldset.ts @@ -38,7 +38,6 @@ export class FieldSet extends FormulaireElement implements IProperties { public setNub(sn: Nub, update: boolean = true) { this._nub = sn; - this.setParentNubForAllFields(); if (update) { this.updateFields(); } @@ -135,9 +134,6 @@ export class FieldSet extends FormulaireElement implements IProperties { return this._jsonConfig; } - private setParentNubForAllFields() { - } - /** * crée un input * @param json definition de l'input, extrait du fichier de conf du module de calcul @@ -280,32 +276,6 @@ export class FieldSet extends FormulaireElement implements IProperties { } } - public getNodeParameter(symbol: string): NgParameter { - for (const p of this.kids) { - if (p instanceof NgParameter) { - if (p.isDisplayed && p.symbol === symbol) { - return p; - } - } - } - } - - public getNodeParameterValue(symbol: string): number { - const p = this.getNodeParameter(symbol); - if (!p) { - throw new Error(`FieldSet.getNodeParameterValue() : pas de paramètre ${symbol} trouvé`); - } - - switch (p.radioState) { - case ParamRadioConfig.FIX: - return p.getValue(); - - case ParamRadioConfig.VAR: - case ParamRadioConfig.CAL: - return undefined; - } - } - /** * retourne la valeur actuellement sélectionnée d'un SelectField (qui doit être affiché) * @param selectFieldId id du SelectField