Correction bug introduit dans le merge dd33cab1

src/app/calculators/regime-uniforme/regime-uniforme.config.json

@@ -152,11 +152,7 @@
     },
     {
         "type": "options",
-<<<<<<< HEAD
-        "defaultNodeType": "SectionTrapeze",
-=======
         "defaultNodeType": "SectionRectangle",
->>>>>>> 043f86cae47e4d5e65ba5c91b9e4ede45aff2428
         "idCal": "Q",
         "sectionSourceId": "fs_section"
     }

src/app/calculators/remous/remous.config.json

@@ -260,11 +260,7 @@
     },
     {
         "type": "options",
-<<<<<<< HEAD
-        "defaultNodeType": "SectionTrapeze",
-=======
         "defaultNodeType": "SectionRectangle",
->>>>>>> 043f86cae47e4d5e65ba5c91b9e4ede45aff2428
         "sectionSourceId": "select_section",
         "targetSelectId": "select_target",
         "methodSelectId": "select_resolution"

src/app/calculators/remous/remous.fr.json

@@ -23,7 +23,6 @@
     "Q": "Débit amont",
     "Yaval": "Tirant d'eau imposé à l'aval",
     "Yamont": "Tirant d'eau imposé à l'amont",
-    "fs_param_calc": "Paramètres de calcul",
     "Dx": "Pas de discrétisation",
     "Pr": "Précision de calcul des cotes",
     "select_resolution": "Méthode de résolution",

src/app/calculators/section-param/section-param.config.json

@@ -274,11 +274,7 @@
     },
     {
         "type": "options",
-<<<<<<< HEAD
-        "defaultNodeType": "SectionTrapeze",
-=======
         "defaultNodeType": "SectionRectangle",
->>>>>>> 043f86cae47e4d5e65ba5c91b9e4ede45aff2428
         "sectionSourceId": "select_section",
         "targetSelectId": "select_target"
     }

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

@@ -15,15 +15,17 @@ export class FormComputeFixedVar extends FormCompute {
     }
 
     private getVariatedParameter(): NgParameter {
-        let res = this._formBase.getDisplayedParamFromState(ParamRadioConfig.VAR);
-        if (res !== undefined)
+        const res = this._formBase.getDisplayedParamFromState(ParamRadioConfig.VAR);
+        if (res !== undefined) {
             return res;
+        }
 
         const pms = this._formBase.getDisplayedParamListFromState(ParamRadioConfig.LINK);
-        for (const p of pms)
-            if (p.paramDefinition.hasMultipleValues)
+        for (const p of pms) {
+            if (p.paramDefinition.hasMultipleValues) {
                 return p;
-
+            }
+        }
         return undefined;
     }
 
@@ -43,24 +45,24 @@ export class FormComputeFixedVar extends FormCompute {
 
     protected compute() {
         const nub: Nub = this._formBase.currentSessionNub.nub;
+        let computePrec: number;
+        if (this._formBase.hasParameter("Pr")) {
+            computePrec = this._formBase.getParameterValue("Pr"); // précision de calcul
+        }
 
-        if (this._formBase.hasParameter("Pr"))
-            var computePrec: number = this._formBase.getParameterValue("Pr"); // précision de calcul
-
-        let computedParam: NgParameter = this.getComputedParameter();
+        const computedParam: NgParameter = this.getComputedParameter();
 
         this.formResult.addFixedParameters();
 
-        let varParam: NgParameter = this.getVariatedParameter();
+        const varParam: NgParameter = this.getVariatedParameter();
 
-        if (varParam == undefined) {
+        if (varParam === undefined) {
             // pas de paramètre à varier
 
             const res: Result = this.runNubCalc(nub, computedParam, computePrec);
             this.formResult.fixedResults.result = res;
             this.formResult.fixedResults.calculatedParameter = computedParam;
-        }
-        else {
+        } else {
             // il y a un paramètre à varier
 
             const res: Result = this.runNubCalc(nub, computedParam, computePrec);