Changeset 11259 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics

Timestamp:

08/04/14 13:01:40 (10 years ago)

Author:

mroscoe

Message:

 

Location:

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3

Files:

• App_Code/ChartHelper.cshtml (modified) (4 diffs)
• Content/Site.css (modified) (2 diffs)
• Controllers/ChartDataController.cs (modified) (6 diffs)
• Scripts/CollapsingSection.js (modified) (5 diffs)
• Views/Home/Index.cshtml (modified) (4 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/App_Code/ChartHelper.cshtml

@@ -448 +448 @@
 }
 
-@helper CreateStreamChart(string dataName, string destinationTag, string url, string title, string format = null, double? maxY = null)
+@helper CreateStreamChart(string dataName, string destinationTag, string url, string title, string slaveState, string format = null, double? maxY = null)
 {
   <text>
@@ -459 +459 @@
   //Get the most recent value(s) from the given URL
   $.ajax({ 
-    async: false, url: '@(url)', datatype: "json", success: function (result) {
+    async: false, url: "@(url)?state=" + @(slaveState), datatype: "json", success: function (result) {
       for(i = 0; i < result.length; i++) {
         @(dataName)CurrentValue[i] = result[i];
@@ -531 +531 @@
 }
 
-@helper UpdateStreamChart(string dataName, string destinationTag, string url, string fixedY = null)
+@helper UpdateStreamChart(string dataName, string destinationTag, string url, string slaveState, string fixedY = null)
 {
   <text>
@@ -543 +543 @@
   //Get the up-to-date data, each result assigned to it's own array
   $.ajax({
-    async: false, url: '@(url)', datatype: "json", success: function (result) {
+    async: false, url: "@(url)?state=" + @(slaveState), datatype: "json", success: function (result) {
       for(i = 0; i < result.length; i++) {
         window[ "@(dataName)Data" + i].push([(new Date()).getTime(), result[i]]);

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Content/Site.css

@@ -560 +560 @@
 }
 
+label.slaveStateFilter {
+  margin-left: 2%;
+  display: inline;
+}
+
+select.slaveStateFilter {
+  margin-top: 2%;
+  display: inline;
+}
+
 /* User Page Styles*/
 #TasksContainer div[id^="Task"] {
@@ -579 +589 @@
 }
 
-.chartContainer > label:first-of-type, .moreTaskInfo {
+.chartContainer > label:first-of-type:not(.slaveStateFilter), .moreTaskInfo {
   margin-bottom: 1%;
   display: block;

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Controllers/ChartDataController.cs

@@ -92 +92 @@
     }
 
-    public JsonResult CurrentCpuUtilization()
+    public JsonResult CurrentCpuUtilization(string state)
     {
       using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString))
@@ -102 +102 @@
                                on clients.ResourceId equals resource.ResourceId
                              where clients.ExpirationTime == null &&
-                             (resource.SlaveState == SlaveState.Calculating || resource.SlaveState == SlaveState.Idle)
+                             (state == "All") ||
+                             (state == "Online") &&
+                             (client.SlaveState == SlaveState.Idle || client.SlaveState == SlaveState.Calculating ) ||
+                             (state == "Available") &&
+                             (client.SlaveState == SlaveState.Idle)
                              select new { client.ClientId, client.CpuUtilization, client.Time })
                              .OrderBy(c => c.Time).GroupBy(c => c.ClientId).ToList();
@@ -113 +117 @@
     }
 
-    public JsonResult CurrentCores()
+    public JsonResult CurrentCores(string state)
     {
       using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString))
@@ -123 +127 @@
                              on clients.ResourceId equals resource.ResourceId
                             where clients.ExpirationTime == null &&
-                            (resource.SlaveState == SlaveState.Calculating || resource.SlaveState == SlaveState.Idle)
+                            (state == "All") ||
+                            (state == "Online") &&
+                            (client.SlaveState == SlaveState.Idle || client.SlaveState == SlaveState.Calculating) ||
+                            (state == "Available") &&
+                            (client.SlaveState == SlaveState.Idle)
                             select new { client.ClientId, client.NumTotalCores, client.NumUsedCores, client.Time })
                             .OrderBy(c => c.Time).GroupBy(c => c.ClientId).ToList();
@@ -135 +143 @@
     }
 
-    public JsonResult CurrentMemory()
+    public JsonResult CurrentMemory(string state)
     {
       using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString))
@@ -145 +153 @@
                               on clients.ResourceId equals resource.ResourceId
                             where clients.ExpirationTime == null &&
-                            (resource.SlaveState == SlaveState.Calculating || resource.SlaveState == SlaveState.Idle)
+                            (state == "All") ||
+                            (state == "Online") &&
+                            (client.SlaveState == SlaveState.Idle || client.SlaveState == SlaveState.Calculating) ||
+                            (state == "Available") &&
+                            (client.SlaveState == SlaveState.Idle)
                             select new { client.ClientId, client.TotalMemory, client.UsedMemory, client.Time })
                             .OrderBy(c => c.Time).GroupBy(c => c.ClientId).ToList();

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Scripts/CollapsingSection.js

@@ -3 +3 @@
 $(".collapse").click(function () {
   if ($(this).html() == "-") {
-    $(this).parent().children("canvas, div, fieldset, label, .chartContainer, a, table").fadeOut();
+    $(this).parent().children("canvas, div, fieldset, label, .chartContainer, a, table, select").fadeOut();
     $(this).html("+");
   }
   else {
-    $(this).parent().children("canvas, div, fieldset, label, .chartContainer, a, table").fadeIn();
+    $(this).parent().children("canvas, div, fieldset, label, .chartContainer, a, table, select").fadeIn();
     $(this).html("-");
   }
@@ -18 +18 @@
   var jqCaller = $(caller);
   if (jqCaller.html() == "-") {
-    jqCaller.parent().children("canvas, div, fieldset, label, .chartContainer, a, table").fadeOut();
+    jqCaller.parent().children("canvas, div, fieldset, label, .chartContainer, a, table, select").fadeOut();
     jqCaller.html("+");
   }
   else {
-    jqCaller.parent().children("canvas, div, fieldset, label, .chartContainer, a, table").fadeIn();
+    jqCaller.parent().children("canvas, div, fieldset, label, .chartContainer, a, table, select").fadeIn();
     jqCaller.html("-");
   }
@@ -30 +30 @@
   section */
 function CollapsedByDefault(caller) {
-  $(caller).parent().children("canvas, div, fieldset, label, .chartContainer, a, table").hide();
+  $(caller).parent().children("canvas, div, fieldset, label, .chartContainer, a, table, select").hide();
 }
 
@@ -36 +36 @@
 function OpenOnError(caller) {
   var jqCaller = $(caller);
-  jqCaller.parent().children("canvas, div, fieldset, label, .chartContainer, a, table").fadeIn();
+  jqCaller.parent().children("canvas, div, fieldset, label, .chartContainer, a, table, select").fadeIn();
   jqCaller.parent().children("button").html("-");
 }
@@ -45 +45 @@
   var jqCaller = $(caller);
   if (jqCaller.html() == "-") {
-    jqCaller.parent().children("canvas, div, fieldset, label, .chartContainer, .tabSection, a, table").hide();
+    jqCaller.parent().children("canvas, div, fieldset, label, .chartContainer, .tabSection, a, table, select").hide();
     jqCaller.html("+");
   }
   else {
-    jqCaller.parent().children("canvas, div, fieldset, label, .chartContainer, .tabSection, a, table").show();
+    jqCaller.parent().children("canvas, div, fieldset, label, .chartContainer, .tabSection, a, table, select").show();
     jqCaller.html("-");
   }

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Views/Home/Index.cshtml

@@ -31 +31 @@
   <h1 class="title">Current Hive Status</h1>
   <button class="collapse">-</button>
+  <label class="slaveStateFilter">Slave State:</label>
+  <select id="SlaveState" class="slaveStateFilter">
+    <option>All</option>
+    <option selected="selected">Online</option>
+    <option>Available</option>
+  </select>
   <div id="CurrentCPUUtilization"></div>
   <div id="CurrentTotalUsedCores"></div>
@@ -104 +110 @@
         RefreshCharts();
       });
+
+      
     });
 
@@ -116 +124 @@
 
     $(document).ready(function () {
+      var slaveState;
+      slaveState = $("#SlaveState").val();
+
+      $("#SlaveState").change(function () {
+        slaveState = $(this).val();
+      });
+
       @ChartHelper.UserTasks(Url.Action("UserTasks", "ChartData"), "section.currentStats", "Calculating");
       @ChartHelper.UserTasks(Url.Action("UserTasks", "ChartData"), "section.currentStats", "Waiting");
@@ -121 +136 @@
       @ChartHelper.SetStreamingProperties(1000,20,5)
 
-      @ChartHelper.CreateStreamChart("CurrentCPU", "CurrentCPUUtilization",Url.Action("CurrentCpuUtilization","ChartData"),"Current CPU Utilization","%.2f%%",100.00)
-      @ChartHelper.CreateStreamChart("CurrentCores", "CurrentTotalUsedCores",Url.Action("CurrentCores","ChartData"),"Current Total vs. Used Cores")
-      @ChartHelper.CreateStreamChart("CurrentMemory", "CurrentTotalUsedMemory",Url.Action("CurrentMemory","ChartData"),"Current Total vs. Used Memory")
+      @ChartHelper.CreateStreamChart("CurrentCPU", "CurrentCPUUtilization",Url.Action("CurrentCpuUtilization","ChartData"),"Current CPU Utilization","slaveState","%.2f%%",100.00)
+      @ChartHelper.CreateStreamChart("CurrentCores", "CurrentTotalUsedCores",Url.Action("CurrentCores","ChartData"),"Current Total vs. Used Cores","slaveState")
+      @ChartHelper.CreateStreamChart("CurrentMemory", "CurrentTotalUsedMemory",Url.Action("CurrentMemory","ChartData"),"Current Total vs. Used Memory","slaveState")
 
       function DoUpdate() {
-        @ChartHelper.UpdateStreamChart("CurrentCPU","CurrentCPUUtilization", Url.Action("CurrentCpuUtilization","ChartData"),"FixedY")
-        @ChartHelper.UpdateStreamChart("CurrentCores","CurrentTotalUsedCores", Url.Action("CurrentCores","ChartData"))
-        @ChartHelper.UpdateStreamChart("CurrentMemory","CurrentTotalUsedMemory", Url.Action("CurrentMemory","ChartData"))
+        @ChartHelper.UpdateStreamChart("CurrentCPU","CurrentCPUUtilization", Url.Action("CurrentCpuUtilization","ChartData"),"slaveState","FixedY")
+        @ChartHelper.UpdateStreamChart("CurrentCores","CurrentTotalUsedCores", Url.Action("CurrentCores","ChartData"),"slaveState")
+        @ChartHelper.UpdateStreamChart("CurrentMemory","CurrentTotalUsedMemory", Url.Action("CurrentMemory","ChartData"),"slaveState")
         setTimeout(DoUpdate, refreshRate);
       }