Fix #265 limit nodeType property to sections

src/app/formulaire/definition/concrete/form-courbe-remous.ts

@@ -59,7 +59,7 @@ export class FormulaireCourbeRemous extends FormulaireBase {
             switch (sender.id) {
                 case "fs_section":
                     // replace underlying section without replacing whole Nub
-                    const newSect = Session.getInstance().createSection(sender.properties.getPropValue("nodeType"));
+                    const newSect = Session.getInstance().createSection(data.value);
                     (this._currentNub as SectionNub).setSection(newSect);
                     // reflect changes in GUI
                     for (const fs of this.allFieldsets) {

src/app/formulaire/definition/concrete/form-regime-uniforme.ts

@@ -30,12 +30,14 @@ export class FormulaireRegimeUniforme extends FormulaireBase implements Observer
 
     update(sender: IObservable, data: any) {
 
+        console.log(">> Update Form RU", sender.constructor.name, data);
+
         super.update(sender, data);
 
         // changement de propriété du FieldSet contenant le select de choix du type de section
         if (sender instanceof FieldSet && sender.id === "fs_section" && data.action === "propertyChange") {
             // replace underlying section without replacing whole Nub
-            const newSect = Session.getInstance().createSection(sender.properties.getPropValue("nodeType"));
+            const newSect = Session.getInstance().createSection(data.value);
             (this._currentNub as SectionNub).setSection(newSect);
             // reflect changes in GUI
             for (const fs of this.allFieldsets) {

src/app/formulaire/definition/concrete/form-section-parametree.ts

@@ -34,8 +34,8 @@ export class FormulaireSectionParametree extends FormulaireBase {
     // interface Observer
 
     update(sender: IObservable, data: any) {
-
         // super.update(sender, data);
+
         if (sender instanceof Nub) {
             switch (data.action) {
                 case "resultUpdated":
@@ -50,7 +50,7 @@ export class FormulaireSectionParametree extends FormulaireBase {
             switch (sender.id) {
                 case "fs_section":
                     // replace underlying section without replacing whole Nub
-                    const newSect = Session.getInstance().createSection(sender.properties.getPropValue("nodeType"));
+                    const newSect = Session.getInstance().createSection(data.value);
                     (this._currentNub as SectionNub).setSection(newSect);
                     // reflect changes in GUI
                     for (const fs of this.allFieldsets) {

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

@@ -29,6 +29,9 @@ export abstract class FormulaireDefinition extends FormulaireNode implements Obs
     /** propriétés par défaut (lues si _currentNub === undefined ) */
     protected _props = {};
 
+    /** for SectionNubs only */
+    protected _defaultNodeType;
+
     /** aide en ligne pour les résultats */
     protected _resultsHelpLinks: { [key: string]: string };
 
@@ -100,12 +103,13 @@ export abstract class FormulaireDefinition extends FormulaireNode implements Obs
      */
     public initNub(props?: Props) {
         const p = props ? props : new Props(this.defaultProperties);
-        const p2 = p.clone();
         this.currentNub = Session.getInstance().createSessionNub(p);
+
         if (this.currentNub instanceof SectionNub) {
             // add new Section as first child, from given nodeType
-            p2.setPropValue("calcType", CalculatorType.Section);
-            const section = Session.getInstance().createNub(p2);
+            p.setPropValue("calcType", CalculatorType.Section);
+            p.setPropValue("nodeType", this._defaultNodeType);
+            const section = Session.getInstance().createNub(p);
             this.currentNub.setSection(section as acSection);
         }
     }
@@ -138,7 +142,7 @@ export abstract class FormulaireDefinition extends FormulaireNode implements Obs
     protected parseOptions(json: {}) {
         const dnt = json["defaultNodeType"];
         if (dnt !== undefined) {
-            this._props["nodeType"] = ComputeNodeType[dnt];
+            this._defaultNodeType = ComputeNodeType[dnt];
         }
         this._helpLink = json["help"];
         this._resultsHelpLinks = json["resultsHelp"];

src/app/formulaire/fieldset.ts

@@ -309,11 +309,6 @@ export class FieldSet extends FormulaireElement implements Observer {
         const calc_type: CalculatorType = currentCt ? currentCt : (ct ? CalculatorType[ct] : parentForm.calculatorType);
         this.setPropValue("calcType", calc_type);
 
-        const dnt: string = json["defaultNodeType"];
-        const currentNt = this.properties.getPropValue("nodeType");
-        const node_type: ComputeNodeType = currentNt ? currentNt : (dnt ? ComputeNodeType[dnt] : parentForm.nodeType);
-        this.setPropValue("nodeType", node_type);
-
         this.setPropertyValueFromConfig(json, "defaultStructType", "structureType");
         this.setPropertyValueFromConfig(json, "defaultLoiDebit", "loiDebit", LoiDebit);
         this.setPropertyValueFromConfig(json, "methodeResolution", "methodeResolution", MethodeResolution);
@@ -373,8 +368,17 @@ export class FieldSet extends FormulaireElement implements Observer {
                 case "select":
                     const senderId: string = sender.id.replace(/\d+$/, "");
                     switch (senderId) {
-                        case "select_section": // sections paramétrées
-                            this.setPropValue("nodeType", data.value.value);
+                        case "select_section": // sections paramétrées, courbes de remous, régimes uniformes
+                            // "nodeType" is a property of the section child, not of the parent
+                            const oldNodeType = this.nub.getChildren()[0].properties.getPropValue("nodeType");
+                            if (oldNodeType !== data.value.value) { // avoid infinite loops
+                                // manually notify parent so that it replaces the child Nub @WARNING clodo trick
+                                this.parentForm.update(this, {
+                                    action: "propertyChange",
+                                    name: "nodeType",
+                                    value: data.value.value
+                                });
+                            }
                             break;
                         case "select_structure": // ouvrages parallèles
                             this.setPropValue("structureType", data.value.value);

src/app/formulaire/formulaire-element.ts

@@ -3,6 +3,7 @@ import { StringMap } from "../stringmap";
 import { DeepFormulaireElementIterator } from "./form-iterator/deep-element-iterator";
 import { I18nService } from "../services/internationalisation.service";
 import { ServiceFactory } from "../services/service-factory";
+import { FormulaireDefinition } from "./definition/form-definition";
 
 /**
  * élément (enfant) du formulaire : fieldset, input, container, ...
@@ -55,7 +56,7 @@ export abstract class FormulaireElement extends FormulaireNode {
     /**
      * formulaire parent
      */
-    public get parentForm(): FormulaireNode {
+    public get parentForm(): FormulaireDefinition {
         let res = this.parent;
         // while (!(res instanceof FormulaireDefinition))
         while (!("calculatorName" in res)) {
@@ -63,7 +64,7 @@ export abstract class FormulaireElement extends FormulaireNode {
             // casser les dépendances circulaires d'import
             res = res.parent;
         }
-        return res;
+        return (res as FormulaireDefinition);
     }
 
     /**