extractProgress

Author: odeimaiz

services/static-webserver/client/source/class/osparc/dashboard/GridButtonTaskPlaceholder.js

@@ -138,12 +138,12 @@ qx.Class.define("osparc.dashboard.GridButtonTaskPlaceholder", {
       task.addListener("updateReceived", e => {
         const updateData = e.getData();
         if ("task_progress" in updateData) {
-          const progress = updateData["task_progress"];
+          const taskProgress = updateData["task_progress"];
           this.getChildControl("progress-bar").set({
-            value: progress["percent"]*100
+            value: osparc.data.PollTask.extractProgress(updateData) * 100,
           });
           this.getChildControl("state-label").set({
-            value: progress["message"]
+            value: taskProgress["message"]
           });
         }
       }, this);

services/static-webserver/client/source/class/osparc/dashboard/ListButtonTaskPlaceholder.js

@@ -123,7 +123,7 @@ qx.Class.define("osparc.dashboard.ListButtonTaskPlaceholder", {
         if ("task_progress" in updateData) {
           const progress = updateData["task_progress"];
           this.getChildControl("progress-bar").set({
-            value: progress["percent"]*100
+            value: osparc.data.PollTask.extractProgress(updateData) * 100
           });
           this.getChildControl("state-label").set({
             value: progress["message"]

services/static-webserver/client/source/class/osparc/dashboard/TemplateBrowser.js

@@ -380,7 +380,7 @@ qx.Class.define("osparc.dashboard.TemplateBrowser", {
         if ("task_progress" in updateData && toTemplateCard) {
           const progress = updateData["task_progress"];
           toTemplateCard.getChildControl("progress-bar").set({
-            value: progress["percent"]*100
+            value: osparc.data.PollTask.extractProgress(updateData) * 100
           });
           toTemplateCard.getChildControl("state-label").set({
             value: progress["message"]

services/static-webserver/client/source/class/osparc/data/PollTask.js

@@ -99,7 +99,16 @@ qx.Class.define("osparc.data.PollTask", {
       } catch (_) {
         return href;
       }
-    }
+    },
+
+    extractProgress: function(updateData) {
+      if ("task_progress" in updateData) {
+        const taskProgress = updateData["task_progress"];
+        const percent = taskProgress["percent"] ? parseFloat(taskProgress["percent"].toFixed(3)) : taskProgress["percent"];
+        return percent;
+      }
+      return 0;
+    },
   },
 
   members: {

services/static-webserver/client/source/class/osparc/file/FileLabelWithActions.js

@@ -265,9 +265,7 @@ qx.Class.define("osparc.file.FileLabelWithActions", {
                 if ("message" in data["task_progress"] && data["task_progress"]["message"]) {
                   progressWindow.setMessage(data["task_progress"]["message"]);
                 }
-                if ("percent" in data["task_progress"]) {
-                  progressWindow.setProgress(data["task_progress"]["percent"]*100);
-                }
+                progressWindow.setProgress(osparc.data.PollTask.extractProgress(data) * 100);
               }
             }, this);
             task.addListener("resultReceived", e => {

services/static-webserver/client/source/class/osparc/study/Utils.js

@@ -220,9 +220,9 @@ qx.Class.define("osparc.study.Utils", {
                 task.addListener("updateReceived", e => {
                   const updateData = e.getData();
                   if ("task_progress" in updateData && loadingPage) {
-                    const progress = updateData["task_progress"];
-                    const message = progress["message"];
-                    const percent = progress["percent"] ? parseFloat(progress["percent"].toFixed(3)) : progress["percent"];
+                    const taskProgress = updateData["task_progress"];
+                    const message = taskProgress["message"];
+                    const percent = osparc.data.PollTask.extractProgress(updateData);
                     progressSequence.setOverallProgress(percent);
                     const existingTask = progressSequence.getTask(message);
                     if (existingTask) {

services/static-webserver/client/source/class/osparc/task/TaskUI.js

@@ -127,10 +127,7 @@ qx.Class.define("osparc.task.TaskUI", {
           if ("message" in data["task_progress"] && !this.getChildControl("subtitle").getValue()) {
             this.getChildControl("subtitle").setValue(data["task_progress"]["message"]);
           }
-          if ("percent" in data["task_progress"]) {
-            const progress = data["task_progress"]["percent"];
-            this.getChildControl("progress").setValue(progress*100 + "%");
-          }
+          this.getChildControl("progress").setValue((osparc.data.PollTask.extractProgress(data) * 100) + "%");
         }
       }, this);