fix: select the right pam when generate back water. Keep session state when a...

fix:  select the right pam when generate back water. Keep session state when a session is saved and loaded after.
Refs #650

src/app/components/generic-calculator/calculator.component.ts

@@ -26,7 +26,8 @@ import {
     Espece,
     VariatedDetails,
     ParallelStructure,
-    MacrorugoRemous
+    MacrorugoRemous,
+    Props
 } from "jalhyd";
 
 import { generateValuesCombination, getUnformattedIthResult, getUnformattedIthValue } from "../../util/util";
@@ -1273,10 +1274,10 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe
     }
 
     public async generateBackwaterInPAM() {
-        const f: FormulaireDefinition = await this.formulaireService.createFormulaire(CalculatorType.MacrorugoRemous);
-        const mrr = (f.currentNub as MacrorugoRemous);
-        mrr.setPropValue("nubMacroRugo", this.formulaire.currentNub.uid);
-        mrr.syncSectionMacroRugo();
+        const nub = Session.getInstance().createSessionNub(
+            new Props({ calcType: CalculatorType.MacrorugoRemous, nubMacroRugo: this.formulaire.currentNub.uid})
+        ) as MacrorugoRemous;
+        const f: FormulaireDefinition = await this.formulaireService.createFormulaire(CalculatorType.MacrorugoRemous, nub);
         this.router.navigate(["/calculator", f.uid]);
     }
 

src/app/formulaire/elements/select/select-field-target-pam.ts

@@ -4,12 +4,13 @@ import { CalculatorType, MacrorugoRemous, Message, MessageCode, Session } from "
 import { SelectField } from "./select-field";
 import { FormulaireNode } from "../formulaire-node";
 import { SelectEntry } from "./select-entry";
+import { VERSION } from "@angular/core";
 
 // Courbe de remous dans une passe à macro-rugo.
 export class SelectFieldTargetPam extends SelectField {
     constructor(parent: FormulaireNode) {
         super(parent);
-        // this._associatedProperty = MacrorugoRemous.nubMacroRugo;
+        this._associatedProperty = "nubMacroRugo";
         this._messageWhenEmpty = "INFO_MACRORUGOREMOUS_CREATE_PAM_FIRST";
     }
 
@@ -23,15 +24,19 @@ export class SelectFieldTargetPam extends SelectField {
         );
         for (const cn of macroForms) {
             const calc = cn.calculatorName;
-            this.addEntry(this.createOrGetEntry(this._entriesBaseId + cn.uid, cn.uid, decodeHtml(calc)));
+            this.addEntry(this.createOrGetEntry(this._entriesBaseId + cn.uid, cn.uid, decodeHtml(calc)));7
         }
     }
 
     protected initSelectedValue() {
-        const mrr = (this.nub as MacrorugoRemous).nubMacroRugo;
-        if (mrr !== undefined) {
-            this.setValueFromId(this._entriesBaseId + mrr.uid);
+        const MrUID = this.nub.getPropValue("nubMacroRugo")
+        if (MrUID !== undefined) {
+            this.setValueFromId(this._entriesBaseId + MrUID);
         }
+        // const ntv = (this.nub as MacrorugoRemous).nubToVerify;
+        // if (ntv !== undefined) {
+        //     this.setValueFromId(this._entriesBaseId + ntv.uid);
+        // }
     }
 
     public updateLocalisation() {