Fix #121 : résultats de calcul rétablis sous la section paramétrée

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

-<div class="container-fluid">
-    <fixedvar-results></fixedvar-results>
+<div>
     <section-results></section-results>
     <remous-results></remous-results>
+    <fixedvar-results></fixedvar-results>
 </div>

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

@@ -80,12 +80,14 @@ export class FixedResultsComponent {
             && res.resultElement
             && res.extraResults
         ) {
-            // 2.1. main result
-            data.push({
-                label: this._fixedResults.calculatedParameterHeader,
-                value: this.intlService.formatResult(res.name, res.resultElement.vCalc),
-                isCalcResult: true // for CSS
-            });
+            // 2.1. main result (sometimes empty, for ex. in "Section paramétrée")
+            if (res.name && res.resultElement.vCalc) {
+                data.push({
+                    label: this._fixedResults.calculatedParameterHeader,
+                    value: this.intlService.formatResult(res.name, res.resultElement.vCalc),
+                    isCalcResult: true // for CSS
+                });
+            }
 
             // 2.2. extra results
             const extraResults = res.resultElement.extraResults;

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

@@ -13,18 +13,8 @@
         </div>
 
         <!-- graphique -->
-        <div class="row">
-            <div class="col" style="text-align: center">
-                <section-canvas></section-canvas>
-            </div>
+        <div class="canvas-container">
+            <section-canvas></section-canvas>
         </div>
     </div>
 </div>
-
-<!-- tableau de valeurs -->
-<div class="col mx-auto">
-    <table style="width: 100%" cellpadding="15">
-        <tr vertical-result-element [result-element]=resultElement>
-        </tr>
-    </table>
-</div>

src/app/components/section-results/section-results.component.scss

@@ -21,3 +21,8 @@
         }
     }
 }
+
+.canvas-container {
+    // border: dashed red 2px;
+    text-align: center;
+}

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

@@ -6,6 +6,7 @@ import { SectionCanvasComponent } from "../section-canvas/section-canvas.compone
 import { SectionResults } from "../../results/section-results";
 import { ApplicationSetupService } from "../../services/app-setup/app-setup.service";
 import { CalculatorResults } from "../../results/calculator-results";
+import { FixedResults } from "../../results/fixed-results";
 
 @Component({
     selector: "section-results",
@@ -22,19 +23,18 @@ export class SectionResultsComponent implements DoCheck {
 
     public set results(rs: CalculatorResults[]) {
         this._resultElement = undefined;
-
         this._results = undefined;
         if (rs) {
             for (const r of rs) {
                 if (r instanceof SectionResults) {
                     this._results = r;
-                    break;
                 }
             }
         }
         this.updateView();
     }
 
+    /** détermine s'il y a des résultats de section "fixes" (pas de paramètre varié, graphique de la section) */
     public get hasResults(): boolean {
         return this._results && this._results.hasResults;
     }
@@ -52,9 +52,8 @@ export class SectionResultsComponent implements DoCheck {
         "Yc": { r: 255, g: 128, b: 0 },
         "Yco": { r: 255, g: 0, b: 255 },
     };
-    /**
-    * résultats non mis en forme
-    */
+
+    /**  résultats non mis en forme */
     private _results: SectionResults;
 
     /**

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

-import { CalculatorType, acSection, ParamsEquation, ComputeNodeType, IObservable } from "jalhyd";
+import { IObservable } from "jalhyd";
 
 import { FormResultSection } from "../form-result-section";
 import { FormDefSection } from "../form-def-section";
-import { NgParameter } from "../../ngparam";
-import { InputField } from "../../input-field";
 import { FormComputeSectionParametree } from "../form-compute-section-parametree";
 import { FormulaireDefinition } from "../form-definition";
-import { I18nService } from "../../../services/internationalisation/internationalisation.service";
 import { CalculatorResults } from "../../../results/calculator-results";
 import { FormDefFixedVar } from "../form-def-fixedvar";
 import { FieldSet } from "../../fieldset";
-import { SelectField } from "../../select-field";
 
 export class FormulaireSectionParametree extends FormulaireDefinition {
     private _formFixedVar: FormDefFixedVar;

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

-import { SectionParametree, acSection } from "jalhyd";
+import { SectionParametree, acSection, Result } from "jalhyd";
 
 import { FormCompute } from "./form-compute";
 import { NgParameter } from "../ngparam";
@@ -80,9 +80,16 @@ export class FormComputeSectionParametree extends FormCompute {
         this._sectionResults.section = sect;
 
         const computePrec: number = this._formBase.getParameterValue("Pr"); // précision de calcul
-        this._sectionResults.result = sectNub.CalcSerie(computePrec,
+        const tmpResult: Result = sectNub.CalcSerie(computePrec,
             undefined, // valeur initiale, non utilisée dans ce cas
             undefined // variable à calculer, non utilisée
         );
+
+        // résultats de section (avec le graphique de section)
+        this._sectionResults.result = tmpResult;
+
+        // résultats complémentaires des paramètres fixés
+        this._formSectionResult.addSectionFixedParameters(false);
+        this._formSectionResult.fixedResults.result = tmpResult;
     }
 }

src/app/results/section-results.ts

-import { acSection, Result, ResultElement } from "jalhyd";
+import { acSection, Result } from "jalhyd";
 
 import { CalculatorResults } from "./calculator-results";
-import { NgParameter } from "../formulaire/ngparam";
 
 export class SectionResults extends CalculatorResults {
     private _result: Result;