Merge branch '271-ajout-du-module-passe-a-macro-rugosites-complexe'

README.md

@@ -274,6 +274,8 @@ Custom Material SVG Icons will only show up when the application is deployed on
 
 5. **Si une nouvelle classe a été créée à l'étape 2**, dans la méthode _FormulaireService.newFormulaire()_, compléter le _switch_ pour fournir la classe à instancier.
 
+6. Dans `config.json`, ajouter si nécessaire le numéro de CalculatorType à un ou plusieurs thèmes afin de classer le module sur la page de liste; dans le cas contraire le nouveau module apparaîtra dans une section "Autres"
+
  # Create PDF from documentation
 
  ```sh

e2e/calculate-all-params.e2e-spec.ts

 import { ListPage } from "./list.po";
 import { CalculatorPage } from "./calculator.po";
 import { Navbar } from "./navbar.po";
+import { browser } from "protractor";
 
 /**
  * For all calculators, try to calculate every parameter: check that only one parameter
  * is set to CAL mode, trigger the calculation, check that result is not empty
  */
-describe("ngHyd − calculate all parameters of all calculators", () => {
+fdescribe("ngHyd − calculate all parameters of all calculators", () => {
   let listPage: ListPage;
   let calcPage: CalculatorPage;
   let navBar: Navbar;
@@ -18,7 +19,7 @@ describe("ngHyd − calculate all parameters of all calculators", () => {
   });
 
   // get calculators list (IDs) @TODO read it from config !
-  const calcTypes = [ 0, 1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 15 ];
+  const calcTypes = [ 0, 1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 15, 17 ];
 
   // for each calculator
   for (const ct of calcTypes) {
@@ -58,6 +59,17 @@ describe("ngHyd − calculate all parameters of all calculators", () => {
             const hasResults = await calcPage.hasResults();
             expect(hasResults).toBe(true);
           }
+        } else {
+          // module has no calculable params, just click the "compute" button
+          // check that "compute" button is active
+          const calcButton = calcPage.getCalculateButton();
+          const disabledState = await calcButton.getAttribute("disabled");
+          expect(disabledState).not.toBe("true");
+          // click "compute" button
+          await calcButton.click();
+          // check that result is not empty
+          const hasResults = await calcPage.hasResults();
+          expect(hasResults).toBe(true);
         }
       });
     });

e2e/calculator.po.ts

@@ -103,6 +103,8 @@ export class CalculatorPage {
       await element(by.css("remous-results #main-chart")).isPresent()
       ||
       await element(by.css("pab-results pab-results-table")).isPresent()
+      ||
+      await element(by.css("macrorugo-compound-results macrorugo-compound-results-table")).isPresent()
     );
   }
 

e2e/clone-all-calc.e2e-spec.ts

@@ -18,7 +18,7 @@ describe("ngHyd − clone all calculators with all possible <select> values", ()
   });
 
   // get calculators list (IDs) @TODO read it from config !
-  const calcTypes = [ 0, 1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 15 ];
+  const calcTypes = [ 0, 1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 15, 17 ];
 
   // for each calculator
   for (const ct of calcTypes) {

jalhyd_branch

-138-lechapt-calmon-enregistrer-la-propriete-materiau-dans-le-nub
+master

package.json

@@ -29,26 +29,26 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^8.1.2",
-    "@angular/cdk": "^8.1.3",
-    "@angular/common": "^8.1.2",
-    "@angular/compiler": "^8.1.2",
-    "@angular/core": "^8.1.2",
-    "@angular/flex-layout": "^8.0.0-beta.26",
-    "@angular/forms": "^8.1.2",
-    "@angular/material": "^8.1.3",
-    "@angular/platform-browser": "^8.1.2",
-    "@angular/platform-browser-dynamic": "^8.1.2",
-    "@angular/router": "^8.1.2",
+    "@angular/animations": "^8.2.4",
+    "@angular/cdk": "^8.1.4",
+    "@angular/common": "^8.2.4",
+    "@angular/compiler": "^8.2.4",
+    "@angular/core": "^8.2.4",
+    "@angular/flex-layout": "^8.0.0-beta.27",
+    "@angular/forms": "^8.2.4",
+    "@angular/material": "^8.1.4",
+    "@angular/platform-browser": "^8.2.4",
+    "@angular/platform-browser-dynamic": "^8.2.4",
+    "@angular/router": "^8.2.4",
     "@types/pako": "^1.0.1",
     "@types/sprintf-js": "^1.1.2",
     "angular2-chartjs": "^0.5.1",
-    "angular2-hotkeys": "^2.1.4",
+    "angular2-hotkeys": "^2.1.5",
     "chartjs-plugin-zoom": "^0.7.3",
     "cordova-android": "^8.0.0",
     "cordova-plugin-device": "^2.0.3",
     "cordova-plugin-whitelist": "^1.3.4",
-    "core-js": "^3.1.4",
+    "core-js": "^3.2.1",
     "file-saver": "^2.0.2",
     "hammerjs": "^2.0.8",
     "he": "^1.2.0",
@@ -59,45 +59,45 @@
     "ngx-konami": "^1.6.0",
     "ngx-material-file-input": "^1.1.1",
     "ngx-md": "^8.0.0",
-    "ngx-webstorage-service": "^4.0.1",
+    "ngx-webstorage-service": "^4.1.0",
     "pako": "^1.0.10",
-    "primeng": "^8.0.1",
+    "primeng": "^8.0.2",
     "roboto-fontface": "^0.10.0",
-    "rxjs": "^6.5.2",
-    "screenfull": "^4.2.0",
     "svg-pan-zoom": "^3.6.0",
+    "rxjs": "^6.5.3",
+    "screenfull": "^4.2.1",
     "tslib": "^1.10.0",
-    "xlsx": "^0.14.4",
+    "xlsx": "^0.14.5",
     "zone.js": "~0.9.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.801.2",
-    "@angular/cli": "^8.1.2",
-    "@angular/compiler-cli": "^8.1.2",
-    "@angular/language-service": "^8.1.2",
+    "@angular-devkit/build-angular": "^0.801.3",
+    "@angular/cli": "^8.3.2",
+    "@angular/compiler-cli": "^8.2.4",
+    "@angular/language-service": "^8.2.4",
     "@compodoc/compodoc": "^1.1.10",
     "@types/file-saver": "^2.0.1",
-    "@types/jasmine": "^3.3.14",
+    "@types/jasmine": "^3.4.0",
     "@types/jasminewd2": "^2.0.6",
-    "@types/node": "^12.6.8",
+    "@types/node": "^12.7.4",
     "codelyzer": "^5.0.1",
     "cordova": "^9.0.0",
-    "electron": "^5.0.7",
-    "electron-builder": "^21.1.1",
+    "electron": "^5.0.10",
+    "electron-builder": "^21.2.0",
     "fs-extra": "^8.1.0",
     "jasmine-core": "^3.4.0",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "^4.2.0",
-    "karma-chrome-launcher": "^3.0.0",
+    "karma": "^4.3.0",
+    "karma-chrome-launcher": "^3.1.0",
     "karma-cli": "~2.0.0",
-    "karma-coverage-istanbul-reporter": "^2.0.6",
+    "karma-coverage-istanbul-reporter": "^2.1.0",
     "karma-jasmine": "^2.0.1",
     "karma-jasmine-html-reporter": "^1.4.2",
     "protractor": "^5.4.2",
     "ts-node": "^8.3.0",
-    "tslint": "^5.18.0",
-    "typescript": "^3.4.5",
-    "webpack-dev-server": "^3.7.2"
+    "tslint": "^5.19.0",
+    "typescript": "^3.5.3",
+    "webpack-dev-server": "^3.8.0"
   },
   "cordova": {
     "plugins": {

src/app/app.module.ts

@@ -85,9 +85,11 @@ import { ParamLinkComponent } from "./components/param-link/param-link.component
 import { SelectModelFieldLineComponent } from "./components/select-model-field-line/select-model-field-line.component";
 import { PabProfileGraphComponent } from "./components/pab-profile-graph/pab-profile-graph.component";
 import { PabTableComponent } from "./components/pab-table/pab-table.component";
-import { PabVariableResultsSelectorComponent } from "./components/pab-results/pab-variable-results-selector.component";
+import { VariableResultsSelectorComponent } from "./components/variable-results-selector/variable-results-selector.component";
 import { QuicknavComponent } from "./components/quicknav/quicknav.component";
 import { ModulesDiagramComponent } from "./components/modules-diagram/modules-diagram.component";
+import { MacrorugoCompoundResultsTableComponent } from "./components/macrorugo-compound-results/macrorugo-compound-results-table.component";
+import { MacrorugoCompoundResultsComponent } from "./components/macrorugo-compound-results/macrorugo-compound-results.component";
 
 import { DialogConfirmEmptySessionComponent } from "./components/dialog-confirm-empty-session/dialog-confirm-empty-session.component";
 import { DialogConfirmCloseCalcComponent } from "./components/dialog-confirm-close-calc/dialog-confirm-close-calc.component";
@@ -199,7 +201,9 @@ const appRoutes: Routes = [
     PabResultsComponent,
     PabResultsTableComponent,
     PabTableComponent,
-    PabVariableResultsSelectorComponent,
+    VariableResultsSelectorComponent,
+    MacrorugoCompoundResultsComponent,
+    MacrorugoCompoundResultsTableComponent,
     ParamComputedComponent,
     ParamFieldLineComponent,
     ParamLinkComponent,

src/app/calculators/macrorugo-compound/macrorugo-compound.config.json

+[
+    {
+        "id": "fs_hydraulique",
+        "type": "fieldset",
+        "fields": [
+            "Z1",
+            "DH"
+        ]
+    },
+    {
+        "id": "fs_pass",
+        "type": "fieldset",
+        "fields": [
+            "If",
+            "Ks",
+            "C"
+        ]
+    },
+    {
+        "id": "fs_bloc",
+        "type": "fieldset",
+        "fields": [
+            "PBD",
+            "PBH",
+            "Cd0"
+        ]
+    },
+    {
+        "id": "fs_pass_type",
+        "type": "fieldset",
+        "fields": [
+            {
+                "id": "select_pass_type",
+                "type": "select",
+                "source": "mrc_pass_type"
+            },
+            "ZRL",
+            "ZRR",
+            "BR"
+        ]
+    },
+    {
+        "id": "fs_macrorugo",
+        "type": "fieldset_template",
+        "calcType": "MacroRugo",
+        "fields": [
+            "ZF1",
+            "B"
+        ]
+    },
+    {
+        "id": "macrorugo_container",
+        "type": "template_container",
+        "templates": [
+            "fs_macrorugo"
+        ]
+    },
+    {
+        "type": "options",
+        "idCal": "Q",
+        "apronTypeSelectId": "select_pass_type",
+        "help": "pam/macrorugo-compound"
+    }
+]
\ No newline at end of file

src/app/calculators/macrorugo-compound/macrorugo-compound.en.json

+{
+    "fs_hydraulique": "Hydraulic parameters",
+    "fs_pass": "Fish pass parameters",
+    "fs_bloc": "Blocks parameters",
+    "fs_pass_type": "Pass type",
+    "macrorugo_container": "Aprons",
+    "fs_macrorugo": "Apron",
+
+    "select_pass_type": "Pass type",
+    "If": "Slope",
+    "Ks": "Bottom roughness",
+    "C": "Block concentration",
+    "PBD": "Diameter",
+    "PBH": "Height",
+    "Cd0": "Shape (1 for round, 2 for square)",
+    "ZRL": "Left apron elevation",
+    "ZRR": "Right apron elevation",
+    "BR": "Total width",
+    "ZF1": "Apron elevation",
+    "B": "Width",
+    "xCenter": "Mid-apron abscissa",
+
+    "select_pass_type_0": "Multiple aprons",
+    "select_pass_type_1": "Inclined apron",
+
+    "UNIT_Q": "m³/s",
+    "UNIT_PV": "W/m³",
+    "UNIT_Q_GUIDETECH": "m³/s",
+    "UNIT_V_GUIDETECH": "m/s",
+    "UNIT_VDEB": "m/s",
+    "UNIT_VMAX": "m/s",
+    "UNIT_ZF2": "m"
+}
\ No newline at end of file

src/app/calculators/macrorugo-compound/macrorugo-compound.fr.json

+{
+    "fs_hydraulique": "Paramètres hydrauliques",
+    "fs_pass": "Paramètres de la passe",
+    "fs_bloc": "Paramètres des blocs",
+    "fs_pass_type": "Type de passe",
+    "macrorugo_container": "Radiers",
+    "fs_macrorugo": "Radier",
+
+    "select_pass_type": "Type de passe",
+    "If": "Pente",
+    "Ks": "Rugosité de fond",
+    "C": "Concentration de blocs",
+    "PBD": "Diamètre",
+    "PBH": "Hauteur",
+    "Cd0": "Forme (1 pour rond, 2 pour carré)",
+    "ZRL": "Cote de radier gauche",
+    "ZRR": "Cote de radier droite",
+    "BR": "Largeur totale",
+    "ZF1": "Cote de radier",
+    "B": "Largeur",
+    "xCenter": "Abscisse du milieu du radier",
+
+    "select_pass_type_0": "Radiers multiples",
+    "select_pass_type_1": "Radier incliné",
+
+    "UNIT_Q": "m³/s",
+    "UNIT_PV": "W/m³",
+    "UNIT_Q_GUIDETECH": "m³/s",
+    "UNIT_V_GUIDETECH": "m/s",
+    "UNIT_VDEB": "m/s",
+    "UNIT_VMAX": "m/s",
+    "UNIT_ZF2": "m"
+}
\ No newline at end of file

src/app/components/app-setup/app-setup.component.scss

@@ -6,8 +6,6 @@
         margin-bottom: 2em;
         min-height: 110px;
 
-        // @WARNING ::ng-deep est déprécié, mais y a rien d'autre pour
-        // l'instant (en attente de normalisation par le W3C)
         ::ng-deep .mat-card-header-text {
             margin: 0;
         }

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

@@ -13,6 +13,7 @@ import { HttpService } from "../../services/http/http.service";
 import { NotificationsService } from "../../services/notifications/notifications.service";
 import { FormulaireService } from "../../services/formulaire/formulaire.service";
 import { AppComponent } from "../../app.component";
+import { FormulaireMacrorugoCompound } from "../../formulaire/definition/concrete/form-macrorugo-compound";
 
 
 @Component({
@@ -130,6 +131,15 @@ export class CalculatorListComponent implements OnInit {
                     }
                 }
             }
+            // adding GUI for default apron, in MacroRugoCompound
+            if (f instanceof FormulaireMacrorugoCompound) {
+                for (const e of f.allFormElements) {
+                    if (e instanceof FieldsetContainer) {
+                        e.addFromTemplate(0, 0, f.mrcNub.children[0]);
+                        break;
+                    }
+                }
+            }
         });
     }
 

src/app/components/calculator-results/calculator-results.component.html

@@ -2,5 +2,6 @@
     <section-results></section-results>
     <remous-results></remous-results>
     <pab-results></pab-results>
+    <macrorugo-compound-results></macrorugo-compound-results>
     <fixedvar-results></fixedvar-results>
 </div>

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

@@ -4,6 +4,7 @@ import { FixedVarResultsComponent } from "../../components/fixedvar-results/fixe
 import { SectionResultsComponent } from "../../components/section-results/section-results.component";
 import { RemousResultsComponent } from "../../components/remous-results/remous-results.component";
 import { PabResultsComponent } from "../../components/pab-results/pab-results.component";
+import { MacrorugoCompoundResultsComponent } from "../macrorugo-compound-results/macrorugo-compound-results.component";
 import { FormulaireDefinition } from "../../formulaire/definition/form-definition";
 
 @Component({
@@ -37,6 +38,12 @@ export class CalculatorResultsComponent implements AfterViewChecked {
     @ViewChild(PabResultsComponent, { static: true })
     private pabResultsComponent: PabResultsComponent;
 
+    /**
+     * composant d'affichage des résultats des passes à macrorugosités complexes
+     */
+    @ViewChild(MacrorugoCompoundResultsComponent, { static: true })
+    private mrcResultsComponent: PabResultsComponent;
+
     /**
      * événement émis à la fin du dessin de la vue
      */
@@ -50,11 +57,13 @@ export class CalculatorResultsComponent implements AfterViewChecked {
             this.sectionResultsComponent.results = undefined;
             this.remousResultsComponent.results = undefined;
             this.pabResultsComponent.results = undefined;
+            this.mrcResultsComponent.results = undefined;
         } else {
             this.fixedVarResultsComponent.results = f.results;
             this.sectionResultsComponent.results = f.results;
             this.remousResultsComponent.results = f.results;
             this.pabResultsComponent.results = f.results;
+            this.mrcResultsComponent.results = f.results;
         }
     }
 
@@ -63,6 +72,7 @@ export class CalculatorResultsComponent implements AfterViewChecked {
         this.sectionResultsComponent.updateView();
         this.remousResultsComponent.updateView();
         this.pabResultsComponent.updateView();
+        this.mrcResultsComponent.updateView();
     }
 
     public ngAfterViewChecked() {

src/app/components/field-set/field-set.component.ts

@@ -6,7 +6,6 @@ import { ParamFieldLineComponent } from "../param-field-line/param-field-line.co
 import { Field } from "../../formulaire/field";
 import { InputField } from "../../formulaire/input-field";
 import { SelectField } from "../../formulaire/select-field";
-import { SelectFieldModel } from "../../formulaire/select-field-model";
 import { FormulairePab } from "../../formulaire/definition/concrete/form-pab";
 import { SelectModelFieldLineComponent } from "../select-model-field-line/select-model-field-line.component";
 import { FieldsetContainer } from "../../formulaire/fieldset-container";
@@ -15,6 +14,8 @@ import { I18nService } from "../../services/internationalisation/internationalis
 
 import { sprintf } from "sprintf-js";
 
+import { capitalize } from "jalhyd";
+
 @Component({
     selector: "field-set",
     templateUrl: "./field-set.component.html",
@@ -343,9 +344,11 @@ export class FieldSetComponent implements DoCheck {
         }
         let msg: string;
         if (this.childrenToAdd === 1) {
-            msg = this.i18nService.localizeText("INFO_DEVICE_ADDED");
+            const cns = this.i18nService.childName(this._fieldSet.nub.parent);
+            msg = sprintf(this.i18nService.localizeText("INFO_STUFF_ADDED"), cns);
         } else {
-            msg = sprintf(this.i18nService.localizeText("INFO_DEVICE_ADDED_N_TIMES"), this.childrenToAdd);
+            const cnp = this.i18nService.childName(this._fieldSet.nub.parent, true);
+            msg = sprintf(this.i18nService.localizeText("INFO_STUFF_ADDED_N_TIMES"), this.childrenToAdd, cnp);
         }
         this.notifService.notify(msg);
         this.childrenToAdd = 1; // reinit to avoid confusion
@@ -363,10 +366,11 @@ export class FieldSetComponent implements DoCheck {
         }
         const pos = (this._fieldSet.parent as FieldsetContainer).getFieldsetPosition(this._fieldSet) + 1;
         let msg: string;
+        const cns = capitalize(this.i18nService.childName(this._fieldSet.nub.parent));
         if (this.childrenToAdd === 1) {
-            msg = sprintf(this.i18nService.localizeText("INFO_DEVICE_COPIED"), pos);
+            msg = sprintf(this.i18nService.localizeText("INFO_STUFF_COPIED"), cns, pos);
         } else {
-            msg = sprintf(this.i18nService.localizeText("INFO_DEVICE_COPIED_N_TIMES"), pos, this.childrenToAdd);
+            msg = sprintf(this.i18nService.localizeText("INFO_STUFF_COPIED_N_TIMES"), cns, pos, this.childrenToAdd);
         }
         this.notifService.notify(msg);
         this.childrenToAdd = 1; // reinit to avoid confusion
@@ -378,8 +382,9 @@ export class FieldSetComponent implements DoCheck {
     private onRemoveClick() {
         const pos = (this._fieldSet.parent as FieldsetContainer).getFieldsetPosition(this._fieldSet) + 1;
         this.removeFieldset.emit(this._fieldSet);
+        const cns = capitalize(this.i18nService.childName(this._fieldSet.nub.parent));
         this.notifService.notify(
-            sprintf(this.i18nService.localizeText("INFO_DEVICE_REMOVED"), pos)
+            sprintf(this.i18nService.localizeText("INFO_STUFF_REMOVED"), cns, pos)
         );
     }
 
@@ -389,8 +394,9 @@ export class FieldSetComponent implements DoCheck {
     private onMoveUpClick() {
         const pos = (this._fieldSet.parent as FieldsetContainer).getFieldsetPosition(this._fieldSet) + 1;
         this.moveFieldsetUp.emit(this._fieldSet);
+        const cns = capitalize(this.i18nService.childName(this._fieldSet.nub.parent));
         this.notifService.notify(
-            sprintf(this.i18nService.localizeText("INFO_DEVICE_MOVED"), pos)
+            sprintf(this.i18nService.localizeText("INFO_STUFF_MOVED"), cns, pos)
         );
     }
 
@@ -400,8 +406,9 @@ export class FieldSetComponent implements DoCheck {
     private onMoveDownClick() {
         const pos = (this._fieldSet.parent as FieldsetContainer).getFieldsetPosition(this._fieldSet) + 1;
         this.moveFieldsetDown.emit(this._fieldSet);
+        const cns = capitalize(this.i18nService.childName(this._fieldSet.nub.parent));
         this.notifService.notify(
-            sprintf(this.i18nService.localizeText("INFO_DEVICE_MOVED"), pos)
+            sprintf(this.i18nService.localizeText("INFO_STUFF_MOVED"), cns, pos)
         );
     }
 

src/app/components/fieldset-container/fieldset-container.component.ts

@@ -116,7 +116,7 @@ export class FieldsetContainerComponent implements DoCheck, AfterViewInit {
     private updateValidity() {
         this._isValid = false;
 
-        if (this._fieldsetComponents !== undefined) {
+        if (this._fieldsetComponents !== undefined && this._fieldsetComponents.length > 0) {
             this._isValid = this._fieldsetComponents.reduce(
                 // callback
                 (
@@ -133,6 +133,9 @@ export class FieldsetContainerComponent implements DoCheck, AfterViewInit {
                 }
                 // valeur initiale
                 , this._fieldsetComponents.length > 0);
+        } else {
+            // empty / hidden container ? everything OK.
+            this._isValid = true;
         }
 
         this.validChange.emit();

src/app/components/fixedvar-results/fixed-results.component.ts

@@ -4,11 +4,15 @@ import { FixedResults } from "../../results/fixed-results";
 import { NgParameter } from "../../formulaire/ngparam";
 import { CalculatorResults } from "../../results/calculator-results";
 import { I18nService } from "../../services/internationalisation/internationalisation.service";
-import * as XLSX from "xlsx";
-import { Structure } from "jalhyd";
 import { FormulaireService } from "../../services/formulaire/formulaire.service";
 import { ResultsComponent } from "./results.component";
 
+import { Structure, capitalize } from "jalhyd";
+
+import * as XLSX from "xlsx";
+
+import { sprintf } from "sprintf-js";
+
 @Component({
     selector: "fixed-results",
     templateUrl: "./fixed-results.component.html",
@@ -101,8 +105,17 @@ export class FixedResultsComponent extends ResultsComponent {
                 if (sn.parent) {
                     ct = sn.parent.calcType;
                 }
+                let unit;
+                // is k the calculated parameter ? If so, extract its unit
+                try {
+                    const p = res.sourceNub.getParameter(k);
+                    if (p) {
+                        unit = p.unit;
+                    }
+                } catch (e) { /* silent fail */ }
+                const label = this.formService.expandVariableNameAndUnit(ct, k, unit);
                 data.push({
-                    label: this.formService.expandVariableNameAndUnit(ct, k),
+                    label: label,
                     value: this.intlService.formatResult(k, er),
                     isCalcResult: true // for CSS
                 });
@@ -118,8 +131,9 @@ export class FixedResultsComponent extends ResultsComponent {
                         if (sn.parent) {
                             ct = sn.parent.calcType;
                         }
+                        const cn = capitalize(this.intlService.childName(sn));
                         data.push({
-                            label: this.intlService.localizeText("INFO_OUVRAGE_N")
+                            label: sprintf(this.intlService.localizeText("INFO_STUFF_N"), cn)
                                     + (c.findPositionInParent() + 1) + " : "
                                     + this.formService.expandVariableNameAndUnit(ct, k),
                             value: this.intlService.formatResult(k, er),

src/app/components/fixedvar-results/var-results.component.ts

@@ -62,9 +62,7 @@ export class VarResultsComponent extends ResultsComponent {
             if (this._messages.length > 0) { // has log messages
                 this._headers.push("logMessagesColumn");
             }
-            for (let i = 0; i < this._varResults.variatedParameters.length; i++) {
-                this._headers.push(this._varResults.variableParamHeaders[i]);
-            }
+            this._headers = this._headers.concat(this._varResults.variableParamHeaders);
             this._headers = this._headers.concat(this._varResults.resultHeaders);
 
             // C. pre-extract variable parameters values

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

@@ -29,7 +29,7 @@
 
     </mat-card-header>
 
-    <quicknav [fxHide.gt-sm]="! isPAB" [items]="quicknavItems" [currentItem]="'input'" [align]="'left'"></quicknav>
+    <quicknav [fxHide.gt-sm]="! isWide" [items]="quicknavItems" [currentItem]="'input'" [align]="'left'"></quicknav>
 
     <form>
 
@@ -39,24 +39,24 @@
             <calc-name id="calculator-name" [title]="uitextCalculatorName"></calc-name>
 
             <div id="calc-cards-container" class="container"
-              [fxLayout]="isPAB ? 'column' : 'row wrap'"
-              [fxLayoutAlign]="isPAB ? 'space-around stretch' : 'space-around start'">
+              [fxLayout]="isWide ? 'column' : 'row wrap'"
+              [fxLayoutAlign]="isWide ? 'space-around stretch' : 'space-around start'">
 
                 <!-- chapitres -->
                 <mat-card id="calc-card-field-sets"
-                  [class.pab-field-sets]="isPAB"
-                  [fxFlex.gt-sm]="isPAB ? '1 0 auto' : '1 0 400px'"
-                  [fxFlex.lt-md]="isPAB ? '1 0 auto' : '1 0 500px'"
-                  [fxFlex.lt-sm]="isPAB ? '1 0 auto' : '1 0 300px'">
+                  [class.pab-field-sets]="isWide"
+                  [fxFlex.gt-sm]="isWide ? '1 0 auto' : '1 0 400px'"
+                  [fxFlex.lt-md]="isWide ? '1 0 auto' : '1 0 500px'"
+                  [fxFlex.lt-sm]="isWide ? '1 0 auto' : '1 0 300px'">
 
                     <ng-template ngFor let-fe [ngForOf]="formElements">
-                        <field-set *ngIf="isFieldset(fe)" [style.display]="getFieldsetStyleDisplay(fe.id)" [fieldSet]=fe
+                        <field-set *ngIf="isFieldset(fe)" [style.display]="getElementStyleDisplay(fe.id)" [fieldSet]=fe
                             (radio)=onRadioClick($event) (validChange)=onElementValid() (inputChange)=onInputChange($event)
                             (tabPressed)="onTabPressed($event)">
                         </field-set>
 
-                        <fieldset-container *ngIf="isFieldsetContainer(fe)" [_container]=fe (radio)=onRadioClick($event)
-                            (validChange)=onElementValid() (inputChange)=onInputChange($event)
+                        <fieldset-container *ngIf="isFieldsetContainer(fe)" [style.display]="getElementStyleDisplay(fe.id)" [_container]=fe
+                            (radio)=onRadioClick($event) (validChange)=onElementValid() (inputChange)=onInputChange($event)
                             (tabPressed)="onTabPressed($event)">
                         </fieldset-container>
 
@@ -75,16 +75,16 @@
 
                 <!-- résultats -->
                 <mat-card id="calc-card-results"
-                  [class.pab-results]="isPAB"
-                  [fxFlex.gt-sm]="isPAB ? '1 0 auto' : '1 0 400px'"
-                  [fxFlex.lt-md]="isPAB ? '1 0 auto' : '1 0 500px'"
-                  [fxFlex.lt-sm]="isPAB ? '1 0 auto' : '1 0 300px'">
+                  [class.pab-results]="isWide"
+                  [fxFlex.gt-sm]="isWide ? '1 0 auto' : '1 0 400px'"
+                  [fxFlex.lt-md]="isWide ? '1 0 auto' : '1 0 500px'"
+                  [fxFlex.lt-sm]="isWide ? '1 0 auto' : '1 0 300px'">
 
                     <div id="fake-results-anchor"></div>
 
-                    <quicknav [ngClass.lt-xs]="'extraSmall'" [fxHide.gt-sm]="! isPAB" [items]="quicknavItems" [currentItem]="'results'" [align]="'left'"></quicknav>
+                    <quicknav [ngClass.lt-xs]="'extraSmall'" [fxHide.gt-sm]="! isWide" [items]="quicknavItems" [currentItem]="'results'" [align]="'left'"></quicknav>
 
-                    <mat-card-header *ngIf="! isPAB" [fxHide.lt-md]="! isPAB">
+                    <mat-card-header *ngIf="! isWide" [fxHide.lt-md]="! isWide">
                         <mat-card-title>
                             <h1 [innerHTML]="uitextResultsTitle"></h1>
                         </mat-card-title>