refactor: calculator JSON configuration: remove selectIds, customSelectIds

refs #483

src/app/calculators/bief/config.json

@@ -69,7 +69,6 @@
     {
         "type": "options",
         "defaultNodeType": "SectionRectangle",
-        "selectIds": [ "select_section", "select_regime" ],
         "help": "hsl/cote_amont_aval.html"
     }
 ]

src/app/calculators/cloisons/config.json

@@ -61,7 +61,6 @@
     },
     {
         "type": "options",
-        "selectIds": [ "select_structure", "select_loidebit" ],
         "help": "pab/cloisons.html"
     }
 ]

src/app/calculators/courberemous/config.json

@@ -96,7 +96,6 @@
     {
         "type": "options",
         "defaultNodeType": "SectionRectangle",
-        "selectIds": [ "select_resolution", "select_section", "select_target" ],
         "help": "hsl/courbe_remous.html",
         "resultsHelp": {
             "B": "hsl/section_parametree.html#largeur-au-miroir-surface-et-perimetre-mouille",

src/app/calculators/dever/config.json

@@ -51,7 +51,6 @@
     },
     {
         "type": "options",
-        "selectIds": [ "select_structure", "select_loidebit" ],
         "help": "structures/dever.html"
     }
 ]
\ No newline at end of file

src/app/calculators/espece/config.json

@@ -94,7 +94,6 @@
     {
         "type": "options",
         "help": "verif/especes_predefinies.html",
-        "selectIds": [ "select_divingjetsupported" ],
         "calculateDisabled": true
     }
 ]

src/app/calculators/grille/config.json

@@ -96,7 +96,6 @@
     },
     {
         "type": "options",
-        "selectIds": [ "select_gridtype", "select_gridprofile" ],
         "help": "devalaison/grille.html",
         "resultsHelp": {
             "VAPDG": "devalaison/grille.html#vitesse-dapproche-moyenne-pour-le-debit-maximum-turbine-en-soustrayant-la-partie-superieure-eventuellement-obturee",

src/app/calculators/lechaptcalmon/config.json

@@ -28,7 +28,6 @@
     },
     {
         "type": "options",
-        "selectIds": [ "select_material" ],
         "help": "hyd_en_charge/lechapt-calmon.html"
     }
 ]
\ No newline at end of file

src/app/calculators/macrorugocompound/config.json

@@ -78,7 +78,6 @@
     },
     {
         "type": "options",
-        "selectIds": [ "select_passtype" ],
         "help": "pam/macrorugo_complexe.html"
     }
 ]

src/app/calculators/par/config.json

@@ -38,7 +38,6 @@
     },
     {
         "type": "options",
-        "selectIds": [ "select_partype" ],
         "help": "par/calage.html"
     }
 ]

src/app/calculators/parallelstructure/config.json

@@ -74,7 +74,6 @@
     },
     {
         "type": "options",
-        "selectIds": [ "select_structure", "select_loidebit" ],
         "help": "structures/lois_ouvrages.html",
         "resultsHelp": {
             "ENUM_StructureJetType": "structures/lois_ouvrages.html#type-de-jet"

src/app/calculators/parsimulation/config.json

@@ -54,7 +54,6 @@
     },
     {
         "type": "options",
-        "selectIds": [ "select_partype" ],
         "help": "par/simulation.html"
     }
 ]

src/app/calculators/prebarrage/config.json

@@ -15,10 +15,6 @@
                     "Z1",
                     "Z2"
                 ]
-            },
-            {
-                "type": "options",
-                "selectIds": [ ]
             }
         ]
     },
@@ -41,10 +37,6 @@
                 "templates": [
                     "fs_basin"
                 ]
-            },
-            {
-                "type": "options",
-                "selectIds": [ ]
             }
         ]
     },
@@ -181,17 +173,11 @@
                 "templates": [
                     "fs_ouvrage"
                 ]
-            },
-            {
-                "type": "options",
-                "selectIds": [ "select_structure", "select_loidebit" ],
-                "customSelectIds": [ "select_upstream_basin", "select_downstream_basin" ]
             }
         ]
     },
     {
         "type": "options",
-        "selectIds": [ ],
         "upstreamSelectId": "select_upstream",
         "downstreamSelectId": "select_downstream",
         "help": "pab/prebarrage.html"

src/app/calculators/regimeuniforme/config.json

@@ -50,7 +50,6 @@
     {
         "type": "options",
         "defaultNodeType": "SectionRectangle",
-        "selectIds": [ "select_section" ],
         "help": "hsl/regime_uniforme.html",
         "resultsHelp": {
             "V": "hsl/section_parametree.html#la-vitesse-moyenne-ms"

src/app/calculators/sectionparametree/config.json

@@ -50,7 +50,6 @@
     {
         "type": "options",
         "defaultNodeType": "SectionRectangle",
-        "selectIds": [ "select_section" ],
         "help": "hsl/section_parametree.html",
         "resultsHelp": {
             "B": "hsl/section_parametree.html#largeur-au-miroir-surface-et-perimetre-mouille",

src/app/calculators/solveur/config.json

@@ -27,8 +27,6 @@
     },
     {
         "type": "options",
-        "selectIds": [ "select_target_result" ],
-        "customSelectIds": [ "select_target_nub", "select_searched_param" ],
         "targettedResultSelectId": "select_target_result",
         "help": "maths/solver.html"
     }

src/app/calculators/spp/config.json

@@ -31,7 +31,6 @@
     },
     {
         "type": "options",
-        "selectIds": [ "select_sppoperation" ],
         "help": "maths/operators.html#somme-et-produit-de-puissances"
     }
 ]
\ No newline at end of file

src/app/calculators/trigo/config.json

@@ -24,7 +24,6 @@
     },
     {
         "type": "options",
-        "selectIds": [ "select_operation", "select_unit" ],
         "help": "maths/operators.html#fonction-trigonometrique"
     }
 ]
\ No newline at end of file

src/app/calculators/verificateur/config.json

@@ -21,8 +21,6 @@
     },
     {
         "type": "options",
-        "selectIds": [ "select_pab_jet_type" ],
-        "customSelectIds": [ "select_target_pass", "select_species_list" ],
         "help": "verif/principe.html"
     }
 ]

src/app/formulaire/definition/form-definition.ts

@@ -26,6 +26,7 @@ import { ServiceFactory } from "../../services/service-factory";
 import { PabTable } from "../elements/pab-table";
 import { SelectEntry } from "../elements/select/select-entry";
 import { SelectField } from "../elements/select/select-field";
+import { DeepSelectFieldIterator } from "../form-iterator/deep-selectfield-iterator";
 
 /**
  * classe de base pour tous les formulaires
@@ -410,6 +411,13 @@ export abstract class FormulaireDefinition extends FormulaireNode implements Obs
         return new TopFormulaireElementIterator(this);
     }
 
+    /**
+     * itère sur tous les SelectField
+     */
+    public get allSelectFields(): IterableIterator<SelectField> {
+        return new DeepSelectFieldIterator(this);
+    }
+
     //  interface Observer
 
     public update(sender: any, data: any) {

src/app/formulaire/definition/form-fixedvar.ts

@@ -14,12 +14,6 @@ export class FormulaireFixedVar extends FormulaireDefinition {
     protected _fixedResults: FixedResults;
     protected _varResults: VarResults;
 
-    /** ids of select fields */
-    private _selectIds: string[] = [];
-
-    /** ids of "custom" select fields */
-    private _customSelectIds: string[] = [];
-
     constructor(parent?: FormulaireNode) {
         super(parent);
         this._fixedResults = new FixedResults();
@@ -31,10 +25,6 @@ export class FormulaireFixedVar extends FormulaireDefinition {
         return this._fixedResults;
     }
 
-    public get selectids(): string[] {
-        return this._selectIds;
-    }
-
     public resetFormResults() {
         this._fixedResults.reset();
         this._varResults.reset();
@@ -73,24 +63,14 @@ export class FormulaireFixedVar extends FormulaireDefinition {
 
     public afterParseFieldset(fs: FieldSet) {
         // observe all Select fields @see this.update()
-        if (this._selectIds.length > 0) {
-            for (const sId of this._selectIds) {
-                const sel = fs.getFormulaireNodeById(sId);
-                if (sel) {
-                    // Formulaire is listening to FieldSet properties (@TODO why not directly Select ?)
-                    fs.properties.addObserver(this);
-                }
-            }
-        }
+        fs.properties.addObserver(this);
     }
 
     protected completeParse(firstNotif: boolean = true) {
         super.completeParse(firstNotif);
         // observe all CustomSelect fields @TODO move to afterParseFieldset ?
-        if (this._customSelectIds.length > 0) {
-            for (const csId of this._customSelectIds) {
-                const sel = this.getFormulaireNodeById(csId);
-                // Formulaire is listening to Select value
+        for (const sel of this.allSelectFields) {  // Formulaire is listening to Select value
+            if (!sel.hasAssociatedNubProperty) { // only to "custom" selects
                 sel.addObserver(this);
                 if (firstNotif) {
                     // force 1st observation
@@ -100,14 +80,6 @@ export class FormulaireFixedVar extends FormulaireDefinition {
         }
     }
 
-    protected parseOptions(json: {}) {
-        super.parseOptions(json);
-        // get ids of all select fields
-        this._selectIds = this.getOption(json, "selectIds") || [];
-        // get ids of all "custom" select fields
-        this._customSelectIds = this.getOption(json, "customSelectIds") || [];
-    }
-
     protected compute() {
         this.runNubCalc(this.currentNub);
         this.refreshFieldsets(); // important: before reaffectResultComponents() or it will break results components localization