Modifs accompagnant le ticket nghyd/#79 (Gestion des libellés des résultats complémentaires)

spec/structure/parallel_structure.spec.ts

@@ -56,22 +56,21 @@ function itParallelStructure(sVarCalc: string, rVcalc: number, Q?: number) {
     });
     if (Q !== undefined) {
         for (let i = 0; i < pstruct.structures.length; i++) {
-            it(`ExtraResult[${i}.Q] should be ${Q}`, () => {
+            it(`ExtraResult[ouvrage[${i}].Q] should be ${Q}`, () => {
                 expect(
-                    pstruct.Calc(sVarCalc).resultElement.extraResults[`${i}.Q`]
+                    pstruct.Calc(sVarCalc).resultElement.extraResults[`ouvrage[${i}].Q`]
                 ).toBeCloseTo(Q, Math.max(0, precDigits - 1));
             });
-            it(`ExtraResult[${i}.Q_Mode] should be 0`, () => {
+            it(`ExtraResult[ouvrage[${i}].Q_Mode] should be 0`, () => {
                 expect(
-                    pstruct.Calc(sVarCalc).resultElement.extraResults[`${i}.Q_Mode`]
+                    pstruct.Calc(sVarCalc).resultElement.extraResults[`ouvrage[${i}].Q_Mode`]
                 ).toEqual(0);
             });
-            it(`ExtraResult[${i}.Q_Regime] should be 0`, () => {
+            it(`ExtraResult[ouvrage[${i}].Q_Regime] should be 0`, () => {
                 expect(
-                    pstruct.Calc(sVarCalc).resultElement.extraResults[`${i}.Q_Regime`]
+                    pstruct.Calc(sVarCalc).resultElement.extraResults[`ouvrage[${i}].Q_Regime`]
                 ).toEqual(0);
             });
-
         }
     }
 }
@@ -106,7 +105,7 @@ describe("Class ParallelStructure: ", () => {
             // Tests sur les résultats complémentaires
             it(`Calc(Q).extraResults[${i}.Q] should return ${ps2.structures[i].Calc("Q").vCalc}`, () => {
                 expect(
-                    ps2.Calc("Q").extraResults[`${i}.Q`]
+                    ps2.Calc("Q").extraResults[`ouvrage[${i}].Q`]
                 ).toBe(
                     ps2.structures[i].Calc("Q").vCalc
                 );

src/structure/parallel_structure.ts

@@ -161,7 +161,7 @@ export class ParallelStructure extends Nub {
         for (let i = 0; i < this.structures.length; i++) {
             if (i !== iExcept) {
                 const res: Result = this.structures[i].Calc("Q");
-                calcRes.resultElement.AddResultElementToExtra(res.resultElement, `${i}.Q`);
+                calcRes.resultElement.AddResultElementToExtra(res.resultElement, `ouvrage[${i}].Q`);
                 qTot += res.vCalc;
             }
         }