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

Timestamp:

06/20/14 16:20:02 (11 years ago)

Author:

mroscoe

Message:

 

Location:

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

Files:

• AdminHelper.cshtml (modified) (1 diff)
• ChartHelper.cshtml (modified) (5 diffs)
• ExceptionHelper.cshtml (added)

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

@@ -37 +37 @@
 }
 
-@helper UserTaskStats(string destinationTag, string overallUrl, string userUrl, string userName, string start, string end)
+@helper UserTaskStats(string destinationTag, string url, string userName, string start, string end)
 {
-  if(userName!="") {
+  if (userName != "" || userName != null) {
     <text>
       $.ajax({
-        url: "@(new HtmlString(overallUrl))?start=" + @start + "&end=" + @end, datatype: "json", success: function (overallResult) {
+        url: "@(new HtmlString(url))?start=" + @start + "&end=" + @end, datatype: "json", success: function (overallResult) {
           $.ajax({
-            url: "@(new HtmlString(userUrl))?userName=" + @userName + "&start=" + @start + "&end=" + @end, datatype: "json", success: function (userResult) {
+            url: "@(new HtmlString(url))?start=" + @start + "&end=" + @end + "&userName=" + @userName, datatype: "json", success: function (userResult) {
               $("#" + "@destinationTag").html("");
               for (var i = 0; i < userResult.length; i++) {
                 $("#" + "@destinationTag").append('<label class="barLabel">' + userResult[i].Key + '</label>');
-                $("#" + "@destinationTag").append('<div class="outerBar"><div class="innerBar" id="InnerBar' + i + '"><p class="innerBarText">' + +userResult[i].Value.toFixed(4) + '</p></div><p class="outerBarText" id="OuterText' + i + '">' + +overallResult[i].toFixed(4) + '</p></div>');
-                $("#InnerBar" + i).css('width',((userResult[i].Value/overallResult[i])*100).toFixed(2) + '%');
-                $("#OuterText" + i).css('width',(98 - ((userResult[i].Value/overallResult[i])*100)).toFixed(2) + '%');
+                $("#" + "@destinationTag").append('<div class="outerBar"><div class="innerBar" id="InnerBar' + i + '"><label class="innerBarText">' + +userResult[i].Value.toFixed(4) + '</label></div></div><label class="outerBarText" id="OuterText' + i + '">' + +overallResult[i].Value.toFixed(4) + '</label>');
+                $("#InnerBar" + i).css('width',((userResult[i].Value/overallResult[i].Value)*100).toFixed(2) + '%');
               }
             }

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

@@ -110 +110 @@
 }
 
-@helper TasksForUser(string container, string destinationTag, string url, string userName, string startDate = null, string endDate = null)
-{
-  <text>
-    $.ajax({url: "@(new HtmlString(url))?userName=" + @(userName) + "&start=" + @startDate + "&end=" + @endDate, datatype: "json", success: function(result) {
-      $("#@container").html("");
-      if(result[0].length==0) {
+@helper TasksForUser(string container, string destinationTag, string pageUrl, string taskUrl, string functionName, string userName, string limit, string startDate = null, string endDate = null, string jobId=null, string taskState=null, string pageNumber=null)
+{
+  <text>
+    var GetRequest = "?userName=" + @(userName) + "&limit=" + @(limit);
+    @if(startDate!=null) {
+      @:if(@(startDate)!=null) {
+        @:GetRequest += "&start=" + @startDate;
+      @:}
+    }
+    @if(endDate!=null) {
+      @:if(@(endDate)!=null) {
+        @:GetRequest += "&end=" + @endDate;
+      @:}
+    }
+    @if(jobId!=null) {
+      @:if(@(jobId)!=null) {
+        @:GetRequest += "&jobId=" + @jobId;
+      @:}
+    }
+    @if(taskState!=null) {
+      @:if(@(taskState)!=null) {
+        @:GetRequest += "&taskState=" + @taskState;
+      @:}
+    }
+    $.ajax({async: false, url: "@(new HtmlString(pageUrl))" + GetRequest, datatype: "json", success: function(result) {
+      if(result > 1) {
+        $("#@container").append('<label class="pageTitle">Page: </label>')
+        for(var i=0; i < result; i++) {
+          $("#" + "@container").append('<a id="Page' + (i + 1) + '" class="page">' + (i + 1) + '</a>')
+        }
+        if(@pageNumber != null) {
+          $("#Page" + @pageNumber).css('color','#F7921D');
+        }
+        else {
+          $("#Page1").css('color','#F7921D');
+        }
+      }
+    }});
+    @if(pageNumber!=null) {
+      @:if(@(pageNumber)!=null) {
+        @:GetRequest += "&currentPage=" + @pageNumber;
+      @:}
+    }
+    $.ajax({url: "@(new HtmlString(taskUrl))" + GetRequest, datatype: "json", success: function(result) {
+      if(result.Key.length==0) {
         $("#@container").append(
-          '<section class="chartContainer"><h1 class="title">' + @userName + ' has no tasks for the given time period!</h1></section>'
+          '<section class="chartContainer"><h1 class="title">' + @userName + ' has no tasks for the specified filters!</h1></section>'
         )
       }
@@ -126 +165 @@
 
       //Globally accesible, for use when resizing, eliminates extra DB request
-      window["numberTasks"] = result[0].length;
+      window["numberTasks"] = result.Key.length;
+
+      //Set display of all errors to none, errors matching the tasks will be reset below
+      $(".errorContainer, .errorTitle, .errorTask, .errorMessage").css('display','none');
 
       //For each result create a seperate collapsable section with a chart and info label
-      for(var i = 0; i < result[0].length; i++){
+      for(var i = 0; i < result.Key.length; i++){
         $("#" + "@container").append(
-          '<section class="chartContainer"><h1 class="title">Task ' + (i + 1) + 
-          '</h1><button class="collapse" onclick="collapseSection(this)">-</button><div id="@(destinationTag)' + i + 
+          '<section class="chartContainer"><h1 class="title" id="' + result.Key[i] + '">Task ' + result.Key[i] + 
+          '</h1><button class="collapse" onclick="collapseSection(this)">+</button><div id="@(destinationTag)' + i + 
           '"></div><label id="@(destinationTag)' + i + 'Info"></label></section>'
         )
-        waitTime = [result[0][i]];
-        transferTime = [result[1][i]];
-        runTime = [result[2][i]];
+        $(".errorTask").each(function() { 
+          if($(this).html()==result.Key[i]) {
+            $("#" + result.Key[i]).css("color","red");
+            $("#" + result.Key[i]).append(" - ERROR");
+            $(".errorContainer, .errorTitle, .underline").css('display','inline-block');
+            $(this).css('display','inline-block');
+            $(this).next().css('display','inline-block');
+          }
+        });
+        waitTime = [result.Value[0][i]];
+        transferTime = [result.Value[1][i]];
+        runTime = [result.Value[2][i]];
         window["@(destinationTag)Plot" + i] = $.jqplot("@destinationTag" + i, [waitTime,transferTime,runTime], {
-          //stackSeries: true,
           seriesDefaults:{
             renderer:$.jqplot.BarRenderer,
             shadowAngle: 135,
-            //rendererOptions: {
-            //  barDirection: 'horizontal'
-            //},
             pointLabels: {show: true, formatString: '%.3f'}
           },
@@ -176 +223 @@
         $("#" + "@(destinationTag)" + i).bind('jqplotDataClick', function (ev, seriesIndex, pointIndex, data) {
           $("#" + $(this).attr('id') + "Info").html(seriesDescriptions[seriesIndex] + ': ' + data[1]);
-        }); 
+        });
+
+        window["@(destinationTag)Plot" + i].replot({ resetAxes: true });
+
+        $('#@destinationTag' + i).contextmenu(function() {
+          window["@(destinationTag)Plot" + i].resetZoom();
+          window["@(destinationTag)Plot" + i].replot({ resetAxes: true });
+          return false;
+        });
+
+        collapsedByDefault(document.getElementById("@(destinationTag)" + i));
       }
     }});
+
+    $(".page").click(function () {
+      pageNumber = $(this).html();
+      @(functionName)();
+    });
   </text>
 }
@@ -187 +249 @@
   $(window).resize(function() {
     for(var i = 0; i < numberTasks; i++) {
-      window[ "@(destinationTag)Plot" + i].replot({ resetAxes: true });
+      $.each(window[ "@(destinationTag)Plot" + i].series, function(index, series) { 
+        series.barWidth = undefined; 
+      });
+      window["@(destinationTag)Plot" + i].replot({ resetAxes: true });
     }
   });
   </text>
 }
-
-@* OLD SMOOTHIE CHART FUNCTIONS *@
-@*@helper CreateSmoothieChart(string destinationTag, string stroke, string fill, string label)
-{
-  <text>
-    var @(destinationTag)Smoothie = new SmoothieChart({
-      grid: {
-        strokeStyle: '@stroke', fillStyle: '@fill',
-        lineWidth: 1, millisPerLine: 450, verticalSections: 4,
-      },
-      labels: {
-        fillStyle: '@label'
-      }
-    });
-
-    var @(destinationTag)TimeSeries = new Array()
-  </text>
-}
-
-@helper SetSmoothieCanvas(string destinationTag, string delay)
-{
-  <text>
-  @(destinationTag)Smoothie.streamTo(document.getElementById("@destinationTag"), @delay);
-  </text>
-}
-
-@helper AssignTimeSeries(string seriesName, string destinationTag, string stroke, string fill)
-{
-  <text>
-  var @(seriesName)TS = new TimeSeries();
-  @(destinationTag)Smoothie.addTimeSeries(@(seriesName)TS, { strokeStyle: '@stroke', fillStyle: '@fill', lineWidth: 3 });
-  @(destinationTag)TimeSeries.push(@(seriesName)TS);
-  </text>
-}
-
-@helper UpdateChartData(string destinationTag, string url)
-{
-  <text>
-  $.ajax({
-    url: '@(url)', datatype: "json", success: function (result) {
-      var i
-      for (i = 0; i < @(destinationTag)TimeSeries.length; i++) {
-        @(destinationTag)TimeSeries[i].append(new Date().getTime(), result[i]);
-      }
-    }
-  });
-  </text>
-}*@
 
 @helper SetStreamingProperties(int refresh, int chartLength, int upperY) {
@@ -376 +393 @@
   </text>
 }
-
-@helper MakeCollapsable()
-{
-  <text>
-  $(document).ready(function() {
-    $(".collapse").click(function () {
-      if ($(this).html() == "-") {
-        $(this).parent().children("canvas, div, fieldset, label").fadeOut();
-        $(this).html("+");
-      }
-      else {
-        $(this).parent().children("canvas, div, fieldset, label").fadeIn();
-        $(this).html("-");
-      }
-    });
-  });
-  </text>
-}