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

Timestamp:

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

Author:

mroscoe

Message:

 

File:

• branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/App_Code/ChartHelper.cshtml (modified) (5 diffs)

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++) {