Merge branch '590-optimiser-l-affichage-des-unites' into 'devel'

Resolve "Optimiser l'affichage des unités"

Closes #590

See merge request !195

e2e/lechapt-calmon.e2e-spec.ts

@@ -36,11 +36,11 @@ describe("Lechapt&Calmon - ", () => {
         await browser.sleep(200);
 
         // open Lechapt-Calmon calculator
-        await listPage.clickMenuEntryForCalcType(1);
+        await listPage.clickMenuEntryForCalcType(35);
         await browser.sleep(200);
     }
 
-    it("when material is modified, results should change", async () => {
+    xit("when material is modified, results should change", async () => { // temporairement débranché, cf. jalhyd#334 / nghyd#585
         await setup();
 
         // select last material type

jalhyd_branch

-334-restructurer-lechapt-et-calmon-pour-de-nouvelles-lois-de-pertes-de-charge
+338-optimiser-l-affichage-des-unites

src/app/formulaire/elements/select/select-field-charttype.ts

@@ -20,7 +20,7 @@ export class SelectFieldChartType extends SelectField {
     protected populate() {
         for (const v of this._entryValues) {
             const id: string = ChartType[v];
-            this.addEntry(new SelectEntry(id, v));
+            this.addEntry(this.createOrGetEntry(id, v));
         }
     }
 
@@ -50,4 +50,4 @@ export class SelectFieldChartType extends SelectField {
 
         this._label = this.intlService.localizeText("INFO_PARAMFIELD_CHART_TYPE");
     }
-}
+}
\ No newline at end of file

src/app/formulaire/elements/select/select-field-device-loi-debit.ts

@@ -47,7 +47,7 @@ export class SelectFieldDeviceLoiDebit extends SelectField {
         const stName = StructureType[stCode];
         if (la[stName] !== undefined) {
             for (const ld of la[stName]) {
-                const e: SelectEntry = new SelectEntry(this._entriesBaseId + LoiDebit[ld], ld);
+                const e: SelectEntry = this.createOrGetEntry(this._entriesBaseId + LoiDebit[ld], ld);
                 this.addEntry(e);
             }
         }

src/app/formulaire/elements/select/select-field-device-structure-type.ts

@@ -24,7 +24,7 @@ export class SelectFieldDeviceStructureType extends SelectField {
     protected populate() {
         // possible values depend on CalcType
         for (const st in (this.nub as ParallelStructure).getLoisAdmissibles()) {
-            const e: SelectEntry = new SelectEntry(this._entriesBaseId + st, StructureType[st]);
+            const e: SelectEntry = this.createOrGetEntry(this._entriesBaseId + st, StructureType[st]);
             this.addEntry(e);
         }
     }

src/app/formulaire/elements/select/select-field-downstream-basin.ts

@@ -19,13 +19,13 @@ export class SelectFieldDownstreamBasin extends SelectField {
         for (const b of preBarrageD.bassins) {
             const pos = b.findPositionInParent();
             if (posUb === undefined || pos > posUb) {
-                const e = new SelectEntry(this._entriesBaseId + b.uid, b.uid);
+                const e = this.createOrGetEntry(this._entriesBaseId + b.uid, b.uid);
                 e.intlInfo = b.description;
                 this.addEntry(e);
             }
         }
         // river downstream
-        const e = new SelectEntry(this._entriesBaseId + "none", undefined);
+        const e = this.createOrGetEntry(this._entriesBaseId + "none", undefined);
         e.intlInfo = "INFO_LIB_AVAL";
         this.addEntry(e);
     }

src/app/formulaire/elements/select/select-field-nub-prop.ts

@@ -31,7 +31,7 @@ export class SelectFieldNubProperty extends SelectField {
         if (enumClass !== undefined) {
             // add one select entry per enum entry, in the enum order
             for (let j = 0; j < Object.keys(enumClass).length / 2; j++) {
-                this.addEntry(new SelectEntry(this._entriesBaseId + j, j));
+                this.addEntry(this.createOrGetEntry(this._entriesBaseId + j, j));
             }
         }
     }

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

@@ -19,9 +19,9 @@ export class SelectFieldRemousTarget extends SelectField {
 
     protected populate() {
         // driven by string[], not enum (easier for variable names)
-        this.addEntry(new SelectEntry(this._entriesBaseId + "none", ""));
+        this.addEntry(this.createOrGetEntry(this._entriesBaseId + "none", ""));
         for (const at of CourbeRemous.availableTargets) {
-            const e: SelectEntry = new SelectEntry(this._entriesBaseId + at, at);
+            const e: SelectEntry = this.createOrGetEntry(this._entriesBaseId + at, at);
             this.addEntry(e);
         }
     }

src/app/formulaire/elements/select/select-field-searched-param.ts

@@ -28,7 +28,7 @@ export class SelectFieldSearchedParam extends SelectField {
                 const calc = fs.getFormulaireFromId(p.originNub.uid).calculatorName;
                 const varName = fs.expandVariableName(p.originNub.calcType, p.symbol);
                 const label = `${p.symbol} - ${varName} (${calc})`;
-                this.addEntry(new SelectEntry(this._entriesBaseId + p.getParentComputeNode(false).uid + "_" + p.symbol, p, decodeHtml(label)));
+                this.addEntry(this.createOrGetEntry(this._entriesBaseId + p.getParentComputeNode(false).uid + "_" + p.symbol, p, decodeHtml(label)));
             }
         }
     }

src/app/formulaire/elements/select/select-field-solver-targeted-result.ts

@@ -24,12 +24,12 @@ export class SelectFieldSolverTargetedResult extends SelectField {
         // 1. calculated param
         const ntc = (this.nub as Solveur).nubToCalculate;
         if (ntc?.calculatedParam !== undefined) { // some nubs have no calculatedParam, for ex. SectionParam
-            this.addEntry(new SelectEntry(this._entriesBaseId + "none", ""));
+            this.addEntry(this.createOrGetEntry(this._entriesBaseId + "none", ""));
         }
         // 2. extra results
         if (ntc?.resultsFamilies !== undefined) {
             for (const er of Object.keys(ntc.resultsFamilies)) {
-                const e: SelectEntry = new SelectEntry(this._entriesBaseId + er, er);
+                const e: SelectEntry = this.createOrGetEntry(this._entriesBaseId + er, er);
                 this.addEntry(e);
             }
         }

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

@@ -33,7 +33,7 @@ export class SelectFieldSolverTarget extends SelectField {
                     const varName = fs.expandVariableName(cn.calcType, cn.calculatedParam.symbol);
                     label += ` / ${varName} (${cn.calculatedParam.symbol})`;
                 }
-                this.addEntry(new SelectEntry(this._entriesBaseId + cn.uid, cn.uid, decodeHtml(label)));
+                this.addEntry(this.createOrGetEntry(this._entriesBaseId + cn.uid, cn.uid, decodeHtml(label)));
             } else {
                 // silent fail, this Solveur nub was probably loaded before all the candidate nubs are done loading
             }

src/app/formulaire/elements/select/select-field-species-list.ts

@@ -24,14 +24,14 @@ export class SelectFieldSpeciesList extends SelectField {
         const especeNubs = Session.getInstance().getAllNubs().filter((element) => element.calcType === CalculatorType.Espece);
         for (const en of especeNubs) {
             const form = ServiceFactory.formulaireService.getFormulaireFromNubId(en.uid);
-            const e = new SelectEntry(this._entriesBaseId + en.uid, en.uid);
+            const e = this.createOrGetEntry(this._entriesBaseId + en.uid, en.uid);
             e.intlInfo = { "isnub": true, "code": "INFO_VERIFICATEUR_CUSTOM_SPECIES", "id": en.uid };
             this.addEntry(e);
         }
         // add all FishSpecies
         for (let j = 1; j < Object.keys(FishSpecies).length / 2; j++) { // exclude "0" (SPECIES_CUSTOM)
             const spgId = FishSpecies[j].substring(FishSpecies[j].lastIndexOf("_") + 1);
-            const e = new SelectEntry(this._entriesBaseId + spgId, FishSpecies[j]);
+            const e = this.createOrGetEntry(this._entriesBaseId + spgId, FishSpecies[j]);
             e.intlInfo = { "isnub": false, "code": FishSpecies[j] }
             this.addEntry(e);
         }

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

@@ -33,7 +33,7 @@ export class SelectFieldTargetPass extends SelectField {
             const nub = fs.getFormulaireFromId(cn.uid);
             if (nub) {
                 const label = nub.calculatorName + " (" + fs.getLocalisedTitleFromCalculatorType(nub.calculatorType) + ")";
-                this.addEntry(new SelectEntry(this._entriesBaseId + cn.uid, cn.uid, decodeHtml(label)));
+                this.addEntry(this.createOrGetEntry(this._entriesBaseId + cn.uid, cn.uid, decodeHtml(label)));
             } else {
                 // silent fail, this Verificateur nub was probably loaded before all the candidate nubs are done loading
             }

src/app/formulaire/elements/select/select-field-upstream-basin.ts

@@ -17,7 +17,7 @@ export class SelectFieldUpstreamBasin extends SelectField {
         const posDb = pbWallU.bassinAval?.findPositionInParent();
 
         // river upstream
-        const e = new SelectEntry(this._entriesBaseId + "none", undefined);
+        const e = this.createOrGetEntry(this._entriesBaseId + "none", undefined);
         e.intlInfo = "INFO_LIB_AMONT";
         this.addEntry(e);
 
@@ -25,7 +25,7 @@ export class SelectFieldUpstreamBasin extends SelectField {
         for (const b of preBarrageU.bassins) {
             const pos = b.findPositionInParent();
             if (posDb === undefined || pos < posDb) {
-                const e = new SelectEntry(this._entriesBaseId + b.uid, b.uid);
+                const e = this.createOrGetEntry(this._entriesBaseId + b.uid, b.uid);
                 e.intlInfo = b.description;
                 this.addEntry(e);
             }

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

@@ -36,6 +36,11 @@ export abstract class SelectField extends Field {
      */
     protected _messageWhenEmpty: string;
 
+    /**
+     * map id <-> select entry
+     */
+    protected _entryMap: { [key: string]: SelectEntry } = {};
+
     constructor(parent: FormulaireNode) {
         super(parent);
         this.clearEntries();
@@ -210,6 +215,15 @@ export abstract class SelectField extends Field {
         this._entries.push(e);
     }
 
+    protected createOrGetEntry(id: string, val: any, lbl?: string): SelectEntry {
+        let res: SelectEntry = this._entryMap[id];
+        if (res === undefined) {
+            res = new SelectEntry(id, val, lbl);
+            this._entryMap[id] = res;
+        }
+        return res;
+    }
+
     public getEntryFromValue(val: any): SelectEntry {
         for (const se of this._entries) {
             if (se.value === val) {

src/app/services/formulaire.service.ts

@@ -58,6 +58,7 @@ import { FormulaireEspece } from "../formulaire/definition/form-espece";
 import { FormulairePrebarrage } from "../formulaire/definition/form-prebarrage";
 import { ServiceFactory } from "./service-factory";
 import { FormulairePressureLoss } from "app/formulaire/definition/form-pressureloss";
+import { getNubResultUnit } from "jalhyd";
 
 @Injectable()
 export class FormulaireService extends Observable {
@@ -194,7 +195,7 @@ export class FormulaireService extends Observable {
      * Returns variable name and unit from symbol
      * @param calcType
      * @param symbol
-     * @param forceUnit if given, will be used as nuit
+     * @param forceUnit if given, will be used as unit
      */
     public expandVariableNameAndUnit(calcType: CalculatorType, symbol: string, forceUnit?: string): string {
         let s = this.expandVariableName(calcType, symbol);
@@ -217,16 +218,8 @@ export class FormulaireService extends Observable {
         if (forceUnit) {
             unit = forceUnit;
         } else {
-            // create dummy Nub from CalcType just to get results units
-            let dummyNub: Nub;
-            try {
-                dummyNub = Session.getInstance().createNub(new Props({ "calcType": calcType }));
-            } catch (e) {
-                // silent fail
-            }
-            if (dummyNub?.resultsUnits && dummyNub.resultsUnits[symbol]) {
-                unit = dummyNub.resultsUnits[symbol];
-            } else {
+            unit = getNubResultUnit(calcType, symbol);
+            if (unit === undefined) {
                 // last chance: if unit cannot be read in model, use translation files
                 const unitKey = "UNIT_" + symbolBase;
                 if (langCache && langCache[unitKey] !== undefined) {