Changeset 13740 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/wwwroot/js/Scripts/Graphs/GraphDataCollector.js

Timestamp:

03/30/16 17:30:01 (8 years ago)

Author:

jlodewyc

Message:

#2582 Job Manager done. Start user management

File:

• branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/wwwroot/js/Scripts/Graphs/GraphDataCollector.js (modified) (13 diffs)

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/wwwroot/js/Scripts/Graphs/GraphDataCollector.js

@@ -1 @@
-var dataCollection = [];
+//Keeps all the data for the job. Used to communicate through SignalR
+var dataCollection = [];
+//Possible task statusses
 var taskStatus = {
     "Offline": "bar-off",
@@ -11 +13 @@
 }
 
+
 function initSaveData(id, coll, name) {//initial data save
     var temp = dataConversion(coll, name);
@@ -17 +20 @@
     // console.log("#CREATION: " + id);
 }
+//Saves updated info in dataCollection
 function saveData(id, coll, name) {
     var temp = dataConversion(coll, name);
@@ -26 +30 @@
         }
     }
-    //console.log("#SAVEDATA: " + id);
     redrawGraph(id);
 }
+//Returns data for line graph 
+//DISABLED FOR GANTT CHART
+/*
 function getData(id) {
     for (var i = 0; i < dataCollection.length; i++) {
@@ -35 +41 @@
         }
     }
-}
+}*/
+//Returns data needed for Pie chart
 function getDataPie(id) {
     for (var i = 0; i < dataCollection.length; i++) {
@@ -43 +50 @@
     }
 }
+//Returns data needed for Gantt chart
 function getDataGantt(id) {
     for (var i = 0; i < dataCollection.length; i++) {
@@ -50 +58 @@
     }
 }
+//Converts received data from server to data needed for the graphs
 function dataConversion(coll, name) {
-    var line = null;//dataConversionLine(coll, name);
+    //var line = dataConversionLine(coll, name);
     var pie = dataConversionPie(coll);
     var gantt = dataConversionGantt(coll, name);
-    return [line, pie, gantt];
-}
+    return [null, pie, gantt];
+}
+//Creates all data needed for drawing a single Gantt chart for one task
 function dataConversionGantt(coll, nam) {
     var tasks = [];
@@ -93 +103 @@
     return [tasks, nam];
 }
-/*
+/* DISABLED FOR GANTT CHART
 function dataConversionLine(coll, nam) {
     var xarr = [];
@@ -142 +152 @@
     return [data, layout];
 }*/
-
+//Calculates data necessary for drawing  a pie chart for a single task. 
 function dataConversionPie(coll) {
     var waiting = 0;
@@ -172 +182 @@
 }
 
+//Draws and redraws a graph from a single task
 function redrawGraph(val) {
     document.getElementById("graph" + val).style.width = "100%";
@@ -177 +188 @@
     document.getElementById("graph" + val).innerHTML = "";
     document.getElementById("graph" + val).style.marginLeft = "0px";
-    if (document.getElementById("graphtoggle" + val).checked) {
+    if (document.getElementById("graphtoggle" + val).checked)
+    {//Redraws a Gantt chart
         setTimeout(function () {
 
@@ -194 +206 @@
 
 
-        /* setTimeout(function () {
+        /* DISABLED FOR GANTT CHART
+        setTimeout(function () {
             Plotly.newPlot('graph' + val, getData(val)[0], getData(val)[1]);
         }, 100);*/
-        // console.log("#REDRAWN LINE: " + val);
-    } else {
+    }
+    else
+    {//Redraws a pie chart
         document.getElementById("legend" + val).style.display = "none";
         setTimeout(function () {
             Plotly.newPlot('graph' + val, getDataPie(val));
         }, 100);
-        //console.log("#REDRAWN PIE: " + val);
-    }
-
-
-}
+    }
+
+
+}
+//Draws and redraws the main Gantt chart. Taking info from the single task charts
+//And combining these into one big chart
 function redrawMain() {
     document.getElementById("graphMain").innerHTML = "";
@@ -215 +230 @@
     for (var i = 0; i < dataCollection.length; i++) {
         var t = dataCollection[i][3][0].slice();
-        var name =  t[0].taskName.substring(0, 5) + " | " + i + ":";
+        var name =  t[0].taskName.substring(0, 5) + " | " + (i+1);
 
         for (var v = 0; v < t.length; v++) {