PAB: chargement du <select> avec la valeur de la propriété modeleCloisons

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

@@ -223,9 +223,8 @@ export class FormulairePab extends FormulaireBase {
                             (sender.nub as PabCloisons).setModel(newModeleUID);
                             // treat the fieldset as new to re-subscribe to Nub properties change events
                             this.afterParseFieldset(sender);
-                            // this.reset();
+                            this.reset();
 
-                            // console.log(this.currentNub);
                             this.dumpPabStructure(this.currentNub as Pab);
                             break;
                     }

src/app/formulaire/fieldset.ts

@@ -379,7 +379,11 @@ export class FieldSet extends FormulaireElement implements Observer {
                             this.setPropValue("varCalc", data.value.value);
                             break;
                         case "select_modele_cloisons": // passe à bassins, modèle de cloisons
-                            this.setPropValue("modeleCloisons", data.value.id);
+                            let valToSet;
+                            if (data.value) {
+                                valToSet = data.value.id;
+                            }
+                            this.setPropValue("modeleCloisons", valToSet);
                             break;
                     }
                     break;

src/app/formulaire/select-field-cloisons.ts

 import { SelectField } from "./select-field";
 import { Session } from "jalhyd";
 import { SelectEntry } from "./select-entry";
+import { FormulaireNode } from "./formulaire-node";
+import { FieldSet } from "./fieldset";
 
 /**
  * A select field that populates itself with references to
@@ -8,6 +10,16 @@ import { SelectEntry } from "./select-entry";
  */
 export class SelectFieldCloisons extends SelectField {
 
+    constructor(parent: FormulaireNode) {
+        super(parent);
+        if (this.parent instanceof FieldSet) {
+            const mc = this.parent.nub.properties.getPropValue("modeleCloisons");
+            if (mc) {
+                this._selectedEntry = new SelectEntry(mc, {});
+            } // else if current model is undefined, do not select it so that default Cloisons will be chosen (if available)
+        }
+    }
+
     /**
      * Populates entries with available Cloisons
      */