fix(export-metrics): only first task group take into account first va…

…lue to calculate average
Frown00 · Jul 26, 2022 · af4bd04 · af4bd04
1 parent 725c81b
commit af4bd04
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/src/main/pupillary/export/Worksheet.ts b/src/main/pupillary/export/Worksheet.ts
@@ -112,25 +112,25 @@ export default class Worksheet {
       let value: number | string = '';
       let isCalculating = false;
       for (let i = startFrom; i < taskRow.length; i += 1) {
-        const taskName = taskRow[i];
-        const wantedResult = data.segments.find((s) => s.name === taskName);
-        const calculation = summary.find((s) => s === taskName);
+        const columnName = taskRow[i];
+        const wantedResult = data.segments.find((s) => s.name === columnName);
+        const summaryCalculation = summary.find((s) => s === columnName);
 
-        if (calculation) {
-          value = this.getCalculation(calculation, values, baselines);
+        if (summaryCalculation) {
+          value = this.getCalculation(summaryCalculation, values, baselines);
           isCalculating = true;
         } else {
           value = this.getValue(wantedResult) || '';
-          if (value !== '' && value !== 'INVALID') {
-            values.push(<number>value);
-            if (wantedResult?.baseline?.value)
-              baselines.push(wantedResult?.baseline?.value);
-          }
           if (isCalculating) {
             isCalculating = false;
             values = [];
             baselines = [];
           }
+          if (value !== '' && value !== 'INVALID') {
+            values.push(<number>value);
+            if (wantedResult?.baseline?.value)
+              baselines.push(wantedResult?.baseline?.value);
+          }
         }
         if (value === 'INVALID') {
           row.push(value);