diff --git a/src/app/calculators/cloisons/cloisons.config.json b/src/app/calculators/cloisons/cloisons.config.json index 958fb294bb8cdd912ebb25719735fcd06216e485..cb9fff4b6da99a03ba6d26e41b950ef56aed1652 100644 --- a/src/app/calculators/cloisons/cloisons.config.json +++ b/src/app/calculators/cloisons/cloisons.config.json @@ -19,16 +19,19 @@ { "type": "input", "id": "LB", + "option": "var", "unit": "m" }, { "type": "input", "id": "BB", + "option": "var", "unit": "m" }, { "type": "input", "id": "PB", + "option": "var", "unit": "m" }, { diff --git a/src/app/calculators/dever/dever.config.json b/src/app/calculators/dever/dever.config.json index 99fe3d0268da196ee09be39173d3a65cf84e8b5d..cb24d0423f216a8661dbbefcf1c10f541e37f7b7 100644 --- a/src/app/calculators/dever/dever.config.json +++ b/src/app/calculators/dever/dever.config.json @@ -19,11 +19,13 @@ { "type": "input", "id": "BR", + "option": "var", "unit": "m" }, { "type": "input", "id": "ZR", + "option": "var", "unit": "m" } ] 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 59b38594abab5f9dd8da14bad4eef6d6afb0689e..8aae7a7c7ba8ccadc1d187812036d7c789e2622d 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 @@ -4,7 +4,7 @@ import { I18nService } from "../../services/internationalisation/internationalis import { NgParameter, ParamRadioConfig } from "../../formulaire/ngparam"; import { NgParamInputComponent } from "../ngparam-input/ngparam-input.component"; import { ServiceFactory } from "../../services/service-factory"; -import { ParamValueMode, ParallelStructure, Nub } from "jalhyd"; +import { ParamValueMode, ParallelStructure } from "jalhyd"; import { FormulaireService } from "../../services/formulaire/formulaire.service"; import { ParamLinkComponent } from "../param-link/param-link.component"; import { ParamComputedComponent } from "../param-computed/param-computed.component"; @@ -45,28 +45,6 @@ export class ParamFieldLineComponent implements OnChanges { return this.intlService.localizeText("INFO_PARAMFIELD_PARAMLIE"); } - /** - * Parameter symbol (Q, Ks, B, ...) input attribute - */ - private get symbol(): string { - return this.param.symbol; - } - - // états des boutons pour l'interface - - private get radioFixCheck(): string { - return this.isRadioFixChecked ? "checked" : undefined; - } - private get radioVarCheck(): string { - return this.isRadioVarChecked ? "checked" : undefined; - } - private get radioCalCheck(): string { - return this.isRadioCalChecked ? "checked" : undefined; - } - private get radioLinkCheck(): string { - return this.isRadioLinkChecked ? "checked" : undefined; - } - // états booléens des boutons public get isRadioFixChecked(): boolean { @@ -149,13 +127,6 @@ export class ParamFieldLineComponent implements OnChanges { @Output() private radio = new EventEmitter<any>(); - /** - * classe du radio "fixé" - */ - private on = true; - private onClass = "btn-on"; - private offClass = "btn-off"; - /** * calcule la présence du radio "paramètre fixé" */ diff --git a/src/app/formulaire/ngparam.ts b/src/app/formulaire/ngparam.ts index 3f9f58711da6fb78f6f1b78e2f5ea7a6dd4ce287..5681b58cdd074bc59d432db93c730e70f5cf4b7b 100644 --- a/src/app/formulaire/ngparam.ts +++ b/src/app/formulaire/ngparam.ts @@ -405,7 +405,7 @@ export class NgParameter extends InputField implements Observer { } public parseConfig(json: {}, data?: {}) { - const radioConfig: string = data["radioConfig"]; + const radioConfig: string = json["option"] || data["radioConfig"]; this._confId = json["id"]; this.unit = json["unit"];