@ejfdelgado/ejflab-common 1.10.0 → 1.10.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ejfdelgado/ejflab-common",
   "type": "commonjs",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ejfdelgado/ejflab-common.git"

package/src/flowchart/steps/CommandTimelineNext.js

@@ -18,9 +18,9 @@ class CommandTimelineNext extends CommandBasic {
         }
         // Compute advance percentage
         const percentage = (timeline.t - timeline.start) / (timeline.end - timeline.start);
-        SimpleObj.recreate(this.context.data, `scope.progress.${timeLineId}`, Math.ceil(percentage * 100));
+        SimpleObj.recreate(this.context.data, `scope.progressEach.${timeLineId}`, Math.ceil(percentage * 100));
         // Compute the overall advance
-        const allProgress = SimpleObj.getValue(this.context.data, `scope.progress`, {});
+        const allProgress = SimpleObj.getValue(this.context.data, `scope.progressEach`, {});
         const keysProgress = Object.keys(allProgress);
         let sum = 0;
         for (let i = 0; i < keysProgress.length; i++) {
@@ -29,7 +29,7 @@ class CommandTimelineNext extends CommandBasic {
             sum += progress;
         }
         const average = sum / keysProgress.length;
-        SimpleObj.recreate(this.context.data, `scope.progressAvg`, Math.ceil(average));
+        SimpleObj.recreate(this.context.data, `scope.progress`, Math.ceil(average));
     }
 }
 

package/src/flowchart/steps/StepTimeLineEnds.js

@@ -10,7 +10,18 @@ class StepTimeLineEnds extends StepBasic {
         }
         const finished = !(timeline.t + timeline.period < timeline.end);
         if (finished) {
-            SimpleObj.recreate(this.context.data, "scope.progress", 100);
+            SimpleObj.recreate(this.context.data, `scope.progressEach.${timeLineId}`, 100);
+            // Compute the overall advance
+            const allProgress = SimpleObj.getValue(this.context.data, `scope.progressEach`, {});
+            const keysProgress = Object.keys(allProgress);
+            let sum = 0;
+            for (let i = 0; i < keysProgress.length; i++) {
+                const oneKey = keysProgress[i];
+                const progress = allProgress[oneKey];
+                sum += progress;
+            }
+            const average = sum / keysProgress.length;
+            SimpleObj.recreate(this.context.data, `scope.progress`, Math.ceil(average));
         }
         return finished;
     }