fixed an issue with the progress bar update script being called every…

… few seconds
ICRAR · Jul 15, 2021 · d563dcd · d563dcd
1 parent de1af47
commit d563dcd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/daliuge-engine/dlg/manager/web/session.html b/daliuge-engine/dlg/manager/web/session.html
@@ -97,6 +97,7 @@
 
 	var status_update_handler = function(statuses)
 	{
+			console.log("status_counts");
 
 		var states = ['completed', 'finished',
 		              'running', 'writing',

diff --git a/daliuge-engine/dlg/manager/web/static/js/dm.js b/daliuge-engine/dlg/manager/web/static/js/dm.js
@@ -260,24 +260,31 @@ function loadSessions(serverUrl, tbodyEl, refreshBtn, selectedNode, delay) {
 		//update status colours and hide cancel button if finished or cancelled
 		$(".status").each(function(){
 			var currentStatus = $(this).html()
+
 			if(currentStatus==="Cancelled"){
 				$(this).css("color","grey");
 				$(this).parent().find(".actions").find("button").hide();
+				$(this).parent().removeClass("progressRunning")
 			}else if(currentStatus==="Deploying"){
 				$(this).css("color","blue");
+				$(this).parent().removeClass("progressRunning")
 			}
 			else if (currentStatus==="Running") {
-				console.log("hi")
 				$(this).text("");
 				$(this).parent().find(".actions").find("button").show();
 				$(this).append("<svg>")
-				startStatusQuery(serverUrl, $(this).parent().find(".id").text(), selectedNode, graph_update_handler,
-					status_update_handler, 1000);
+				if(!$(this).parent().hasClass('progressRunning')){
+					startStatusQuery(serverUrl, $(this).parent().find(".id").text(), selectedNode, graph_update_handler,
+						status_update_handler, 1000);
+					$(this).parent().addClass("progressRunning")
+				}
 			}else if (currentStatus==="Finished"){
 				$(this).css("color","#00af28");
 				$(this).parent().find(".actions").find("button").hide();
+				$(this).parent().removeClass("progressRunning")
 			}else{
 				$(this).css("color","purple");
+				$(this).parent().removeClass("progressRunning")
 			}
 		})