Changeset 13735 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/wwwroot/js

Timestamp:

03/25/16 12:47:31 (9 years ago)

Author:

jlodewyc

Message:

#2582 finish Job manager functionality. Start overhaul client connections (login, hiveclient and fileopening)

Location:

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

Files:

• Graphs/GraphDataCollector.js (modified) (8 diffs)
• hubber.js (modified) (2 diffs)

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

@@ -51 +51 @@
 }
 function dataConversion(coll, name) {
-    var line = dataConversionLine(coll, name);
+    var line = null;//dataConversionLine(coll, name);
     var pie = dataConversionPie(coll);
     var gantt = dataConversionGantt(coll, name);
@@ -93 +93 @@
     return [tasks, nam];
 }
+/*
 function dataConversionLine(coll, nam) {
     var xarr = [];
@@ -140 +141 @@
 
     return [data, layout];
-}
+}*/
 
 function dataConversionPie(coll) {
@@ -163 +164 @@
             'Minutes transferring',
             'Minutes calculating'],
-        type: 'pie'
+        type: 'pie',
+        marker: {
+            colors: ['#f0a742', '#80d4ff', '#2f6fa6']
+        }
     }];
     return datap;
@@ -178 +182 @@
             var temp = getDataGantt(val);
             var w = $("#graph" + val).parent().width() - 30;
-            document.getElementById("graph" + val).style.height = "200px";
+            document.getElementById("graph" + val).style.height = "300px";
             var gantt = d3.gantt().selector('#graph' + val).height('200').width(w).margin({
                 top: 20,
@@ -185 +189 @@
                 left: 20
             }).drawytitles(false).taskTypes([temp[1]]).taskStatus(taskStatus);
-            //    document.getElementById("graph" + val).style.marginLeft = "-40px";
             gantt(temp[0]);
+           document.getElementById("legend" + val).style.display = "";
         }, 100);
 
@@ -195 +199 @@
         // console.log("#REDRAWN LINE: " + val);
     } else {
+        document.getElementById("legend" + val).style.display = "none";
         setTimeout(function () {
             Plotly.newPlot('graph' + val, getDataPie(val));
@@ -226 +231 @@
     document.getElementById("graphMain").style.marginLeft = "20px";
     gantt(tempdata);
+
+
     /* LINE VERSION
     var temp = [];

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/wwwroot/js/Scripts/hubber.js

@@ -23 +23 @@
 
     var jobname = document.getElementById("jname").value;
+    var resource = document.getElementById("jresource").value;
     if (jobname && jobname != "" && jobname != null) {
-        hubber.server.changeName(jobname);
+        hubber.server.changeNameResource(jobname, resource);
         document.getElementById("fakehiveadd").style.display = "none";
         document.getElementById("progdiv").style.display = "";
@@ -40 +41 @@
     else
         $("#childs" + idchilds).css("display", "none");
+    $('body').click();
 }
 function changePriority(arr, prior, idprior) {