Changeset 11222 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/App_Code

Timestamp:

07/24/14 09:16:42 (10 years ago)

Author:

mroscoe

Message:

 

Location:

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

Files:

• AdminHelper.cshtml (modified) (3 diffs)
• ChartHelper.cshtml (modified) (5 diffs)
• ExceptionHelper.cshtml (modified) (4 diffs)

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

@@ -18 +18 @@
  *@
 
-@helper UserList(string destinationTag, string url, bool multiline) {
+@helper UserList(string destinationTag, string url, bool multiline)
+{
   <script>
     $.ajax({
       url: "@(new HtmlString(url))", datatype: "json", success: function (result) {
         $("#" + "@destinationTag").html("");
-        @if(multiline) {
+        @if (multiline)
+        {
           @:$("#" + "@destinationTag").attr("size", result.length);
         }
-        else {
+        else
+        {
           @:$("#" + "@destinationTag").append("<option></option>");
         }
@@ -39 +42 @@
 @helper UserTaskStats(string destinationTag, string url, string userName, string start, string end)
 {
-  if (userName != "" || userName != null) {
+  if (userName != "" || userName != null)
+  {
     <text>
       $.ajax({
@@ -58 +62 @@
   }
 }
+
+@helper MoreTaskInfo(string url)
+{
+  <text>
+    function MoreTaskInfo(caller) {
+      if($(caller).siblings('.moreInfoTable').length == 0) {
+        var taskId = $(caller).attr('id');
+        $.ajax({
+          url: "@(new HtmlString(url))?taskId=" + taskId, datatype: "json", success: function (result) {
+            var appendString = '<table class="moreInfoTable"><tr>';
+            for (var i = 0; i < result.length; i++) {
+              if(i % 2 == 0 && i != 0) {
+                appendString += '</tr><tr>';
+              }
+              appendString += '<td class="taskInfoCell"><label class="taskInfoKey">' + result[i].Key + '</label>';
+              appendString += '<label class="taskInfoValue">' + +result[i].Value.toFixed(4) + '</label></td>';
+            }
+            appendString += '</tr></table>'
+            $(caller).parent().append(appendString);
+          }
+        });
+        $(caller).html("Less Info");
+      }
+      else {
+        $(caller).siblings('.moreInfoTable').remove();
+        $(caller).html("More Info");
+      }
+    }
+  </text>
+}
+
+@helper MoreSlaveInfo(string url)
+{
+  <text>
+    function MoreSlaveInfo(caller) {
+      if($(caller).siblings('.moreInfoTable').length == 0) {
+        var slaveId = $(caller).attr('id');
+        $.ajax({
+          url: "@(new HtmlString(url))?slaveId=" + slaveId, datatype: "json", success: function (result) {
+            var appendString = '<table class="moreInfoTable"><tr>';
+            for (var i = 0; i < result[0].length; i++) {
+              appendString += '<th class="slaveInfoHeader">' + result[0][i].Key + '</th>'
+            }
+            appendString += '</tr>';
+            for (var j = 0; j < result.length; j++) {
+              appendString += '<tr>';
+              for (var k = 0; k < result[j].length; k++) {
+                appendString += '<td class="slaveInfoCell"><label class="slaveInfoValue">' + result[j][k].Value + '</label></td>';
+              }
+              appendString += '</tr>';
+            }
+            appendString += '</table>'
+            $(caller).parent().append(appendString);
+          }
+        });
+        $(caller).html("Less Info");
+      }
+      else {
+        $(caller).siblings('.moreInfoTable').remove();
+        $(caller).html("More Info");
+      }
+    }
+  </text>
+}

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

@@ -250 +250 @@
         $("#@(destinationTag)").find(".errorContainer, .errorTitle, .errorTask, .errorMessage").css('display','none');
 
+        //Set variable for tracking jobId and open first job grouping
+        var currentJob = result[0].JobId;
+        $("#@(destinationTag)").append('<section class="jobTaskGroup" id="' + result[0].JobId + '"><h1>' + result[0].JobName + '</h1></section>');
+
         //For each result create a seperate collapsable section with a chart and info label
         for(var i = 0; i < result.length; i++){
-          $("#" + "@(destinationTag)").append(
+          if(currentJob != result[i].JobId) {
+            $("#@(destinationTag)").append('<section class="jobTaskGroup" id="' + result[i].JobId + '"><h1>' + result[i].JobName + '</h1></section>');
+            currentJob = result[i].JobId;
+          }
+          $("#" + currentJob).append(
             '<section class="chartContainer">' + 
-              '<h1 class="title" id="@(destinationTag)' + result[i].Key + 'PlotTitle">Task ' + result[i].Key + '</h1>' + 
+              '<h1 class="title" id="@(destinationTag)' + result[i].TaskId + 'PlotTitle">Task ' + result[i].TaskId + '</h1>' + 
               '<button class="collapse" onclick="CollapseSection(this)">+</button>' + 
               '<div id="@(destinationTag)Plot' + i + '"></div>' + 
               '<label id="@(destinationTag)PlotInfo' + i + '"></label>' + 
+              '<a id="' + result[i].TaskId + '" class="moreInfo" onclick="MoreTaskInfo(this)">More Info</a>' +
             '</section>'
           )
@@ -263 +272 @@
           //those of errors
           $(".errorTask","#" + "@(destinationTag)").each(function() { 
-            if($(this).html()==result[i].Key) {
-              $("#@(destinationTag)" + result[i].Key + "PlotTitle").css("color","red");
-              $("#@(destinationTag)" + result[i].Key + "PlotTitle").append(" - ERROR");
+            if($(this).html()==result[i].TaskId) {
+              $("#@(destinationTag)" + result[i].TaskId + "PlotTitle").css("color","red");
+              $("#@(destinationTag)" + result[i].TaskId + "PlotTitle").append(" - ERROR");
               $(".errorContainer, .errorTitle, .underline","#@(destinationTag)").css('display','inline-block');
               $(this).css('display','inline-block');
@@ -271 +280 @@
             }
           });
-          waitTime = [result[i].Value[0]];
-          transferTime = [result[i].Value[1]];
-          runTime = [result[i].Value[2]];
+          waitTime = [result[i].TotalWaiting];
+          transferTime = [result[i].TotalTransfer];
+          runTime = [result[i].TotalRuntime];
           window["@(destinationTag)Plot" + i] = $.jqplot("@(destinationTag)Plot" + i, [waitTime,transferTime,runTime], {
             seriesDefaults:{
@@ -307 +316 @@
             upon data in the label below the chart */
           $("#" + "@(destinationTag)Plot" + i).bind('jqplotDataClick', function (ev, seriesIndex, pointIndex, data) {
-            $(this).siblings("label").html(seriesDescriptions[seriesIndex] + ": " + data[1]);
+            $(this).next("label").html(seriesDescriptions[seriesIndex] + ": " + data[1]);
           });
 
@@ -551 +560 @@
         $('#' + destTag).append(
           '<section class="chartContainer">' + 
-            '<h1 class="title" id="' + destTag + result[i][0].SlaveID + 'PlotTitle">Slave ' + result[i][0].SlaveID + '</h1>' + 
+            '<h1 class="title" id="' + destTag + result[i][0].SlaveID + 'PlotTitle">Slave ' + result[i][0].ClientName + '</h1>' + 
             '<button class="collapse" onclick="CollapseSection(this)">+</button>' + 
             '<div id="' + destTag + slaveChartNames[0] + 'Plot' + i + '"></div>' + 
             '<div id="' + destTag + slaveChartNames[1] + 'Plot' + i + '"></div>' + 
             '<div id="' + destTag + slaveChartNames[2] + 'Plot' + i + '"></div>' + 
+            '<a id="' + result[i][0].SlaveID + '" class="moreInfo" onclick="MoreSlaveInfo(this)">More Info</a>' +
           '</section>');
         for(j = 0; j < result[i].length; j++) {

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

@@ -102 +102 @@
         $("#" + "@destinationTag").append(ErrorHTML);
       }
+      else if("@(destinationTag)" == "ExceptionContainer") {
+        $("#@(destinationTag)").append(
+          '<section class="chartContainer">' + 
+            '<h1 class="title">No errors found for the specified filters!</h1>' + 
+          '</section>'
+        )
+      }
     }
   });
@@ -144 +151 @@
 @helper ShowErrors(string destinationTag) {
   <text>
-  $("#@(destinationTag)").children(".errorContainer, .errorTitle, .errorTask, .errorMessage").css('display','inline-block');
+  $("#@(destinationTag)").find(".errorContainer, .errorTitle, .errorTask, .errorMessage").css('display','inline-block');
   </text>
 }
@@ -200 +207 @@
             '<button class="collapse" onclick="CollapseSection(this)">+</button>' + 
             '<label id="' + result[i][0] + 'ErrorMessage">Error Message: ' + result[i][1] + '</label>' + 
-            '<label id="' + result[i][0] + 'Client">Slave: <a onclick="ShowSlaveInfo(this)">' + result[i][2] + '</a></label>' + 
-            '<label id="' + result[i][0] + 'User">User Name: ' + result[i][3] + '</label>' + 
-            '<label id="' + result[i][0] + 'Date">Date/Time: ' + result[i][4] + '</label>' + 
+            '<label id="' + result[i][0] + 'Client">Slave: <a id="' + result[i][2] + '" onclick="ShowSlaveInfo(this)">' + result[i][3] + '</a></label>' + 
+            '<label id="' + result[i][0] + 'User">User Name: ' + result[i][4] + '</label>' + 
+            '<label id="' + result[i][0] + 'Job">Job Name: ' + result[i][5] + '</label>' + 
+            '<label id="' + result[i][0] + 'Date">Date/Time: ' + result[i][6] + '</label>' + 
           '</section>'
         );
@@ -229 +237 @@
   //Opens a sub-container with slave information
   function ShowSlaveInfo(caller) {
+    var taskSlaveId = $(caller).attr('id');
     if($(caller).parent().parent().children(".chartContainer").length == 0) {
-      @ChartHelper.SlaveInfoChart("caller.parentNode.parentNode.id",url,limit,true,startDate,endDate,null,null,null,"$(caller).html()")
+      @ChartHelper.SlaveInfoChart("caller.parentNode.parentNode.id",url,limit,true,startDate,endDate,null,null,null,"taskSlaveId")
     }
     else {