MàJ jalhyd#74 : réglage des paramètres non calculables de Cloisons et Déversoirs

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"
             },
             {

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"
             }
         ]

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é"
      */

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"];