Changeset 11020

Timestamp:

06/16/14 10:37:22 (10 years ago)

Author:

mroscoe

Message:

First check-in for Matt Roscoe. Major revision, multiple new files created and multiple files changed.

Location:

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

Files:

• App_Code/AdminHelper.cshtml (added)
• App_Code/ChartHelper.cshtml (modified) (5 diffs)
• Content/Site.css (modified) (4 diffs)
• Controllers/AdminDataController.cs (added)
• Controllers/ChartDataController.cs (modified) (6 diffs)
• Controllers/LoginRequiredController.cs (added)
• HeuristicLab.Services.Hive.Statistics-3.3.csproj (modified) (6 diffs)
• Models/AdminModel.cs (added)
• Models/UserModel.cs (added)
• Properties/PublishProfiles/HiveStatistics-3.3.pubxml (added)
• Scripts/CollapsingSection.js (added)
• Scripts/SmoothieChartResize.js (added)
• Scripts/smoothie.js (added)
• Views/Home/Index.cshtml (modified) (4 diffs)
• Views/LoginRequired (added)
• Views/LoginRequired/Admin.cshtml (added)
• Views/LoginRequired/UserTask.cshtml (added)
• Views/Shared/_Layout.cshtml (modified) (1 diff)
• Web.config (modified) (2 diffs)

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

@@ -18 +18 @@
  *@
 
-@helper AjaxDataRenderer() {
+@helper AjaxDataRenderer()
+{
     <script>
         var ajaxDataRenderer = function (url, plot, options) {
@@ -35 +36 @@
 }
 
-@helper LineChartTime(string destinationTag, string url, string title = "", double? minY = null, double? maxY = null, string axisYFormat = null) {
+@helper LineChartTime(string destinationTag, string url, string title = "", double? minY = null, double? maxY = null, string axisYFormat = null)
+{
     <script>
         var @(destinationTag)Plot = $.jqplot("@destinationTag", "@url", {
@@ -53 +55 @@
                 },
                 yaxis: {
-                    @if (axisYFormat != null) {<text>
+                    @if (axisYFormat != null)
+                    {<text>
                     tickOptions: {
                         formatString: "@axisYFormat",
@@ -60 +63 @@
                     autoscale: true,
                     pad: 0,
-                    @if (minY != null) {
+                    @if (minY != null)
+                    {
                         @:min: @minY,
                     }
-                    @if (maxY != null) {
+                    @if (maxY != null)
+                    {
                         @:max: @maxY,
                     }
@@ -93 +98 @@
 }
 
-@helper RefreshChart(string destinationTag, string url, string startDateVar, string endDateVar) {
-    <text>
-    $.ajax({url: "@(new HtmlString(url))?start=" + @startDateVar + "&end=" + @endDateVar, datatype: "json", success: function(result) {
-        for (var i = 0; i < result.length; i++) {
-            @(destinationTag)Plot.series[i].data = result[i];
+@helper RefreshChart(string destinationTag, string url, string startDateVar, string endDateVar)
+{
+  <text>
+  $.ajax({url: "@(new HtmlString(url))?start=" + @startDateVar + "&end=" + @endDateVar, datatype: "json", success: function(result) {
+    for (var i = 0; i < result.length; i++) {
+      @(destinationTag)Plot.series[i].data = result[i];
+    }
+    @(destinationTag)Plot.replot({ resetAxes: true })
+  }});
+  </text>
+}
+
+@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) {
+        $("#@container").append(
+          '<section class="chartContainer"><h1 class="title">' + @userName + ' has no tasks for the given time period!</h1></section>'
+        )
+      }
+      var waitTime;
+      var transferTime;
+      var runTime;
+      var seriesDescriptions = ["Time waiting","Time transferring","Time calculating"];
+
+      //Globally accesible, for use when resizing, eliminates extra DB request
+      window["numberTasks"] = result[0].length;
+
+      //For each result create a seperate collapsable section with a chart and info label
+      for(var i = 0; i < result[0].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 + 
+          '"></div><label id="@(destinationTag)' + i + 'Info"></label></section>'
+        )
+        waitTime = [result[0][i]];
+        transferTime = [result[1][i]];
+        runTime = [result[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'}
+          },
+          series:[
+            {label:'Waiting'},
+            {label:'Transferring'},
+            {label:'Calculating'}
+          ],
+          legend: {
+            show: true,
+            location: 'e',
+            placement: 'outside'
+          },
+          axes: {
+            xaxis: {
+              renderer: $.jqplot.CategoryAxisRenderer,
+              showLabel: false,
+              pad: 0
+            },
+            yaxis: {
+              pad: 0
+            }
+          },
+          cursor: {
+            showTooltip: false
+          }
+        });
+        /* Bind a datalistener to each chart and display details of clicked
+          upon data in the label below the chart */
+        $("#" + "@(destinationTag)" + i).bind('jqplotDataClick', function (ev, seriesIndex, pointIndex, data) {
+          $("#" + $(this).attr('id') + "Info").html(seriesDescriptions[seriesIndex] + ': ' + data[1]);
+        }); 
+      }
+    }});
+  </text>
+}
+
+@helper ResizeTasks(string destinationTag)
+{
+  <text>
+  $(window).resize(function() {
+    for(var i = 0; i < numberTasks; i++) {
+      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) {
+  <text>
+  //Refresh time (in millisec)
+  var refreshRate = @(refresh);
+  //Number of data points on chart
+  var chartSize = @(chartLength);
+  //Amount to add to max Y value
+  var upperYBuffer = @(upperY);
+
+  //Used to return a string containing the names of the series
+  //to be used in plot creation
+  function getSeries(numberData,dataName){ 
+    var result = "[";
+    for(i=0; i < numberData; i++) {
+      if(i < numberData -1) {
+        result += dataName + i + ",";
+      }
+      else {
+        result += dataName + i + "]";
+      }
+    }
+    return result;
+  }
+  </text>
+}
+
+@helper CreateStreamChart(string dataName, string destinationTag, string url, string title, string format = null, double? maxY = null) {
+  <text>
+  //Get current time, used to create initial values
+  var @(dataName)CurrentDate = (new Date()).getTime();
+
+  var @(dataName)Data = [];
+  var @(dataName)CurrentValue = [];
+
+  //Get the most recent value(s) from the given URL
+  $.ajax({ 
+    async: false, url: '@(url)', datatype: "json", success: function (result) {
+      for(i = 0; i < result.length; i++) {
+        @(dataName)CurrentValue[i] = result[i];
+      }
+    }
+  });
+  
+  //Create a chartSize worth of data using CurrentDate and CurrentValue
+  //for each CurrentValue
+  for(i = 0; i < @(dataName)CurrentValue.length; i++) {
+    window["@(dataName)Data" + i] = [];
+    for (j = 0; j < chartSize; j++) {
+      window[ "@(dataName)Data" + i].push([@(dataName)CurrentDate - (chartSize - 1 - j) * refreshRate, @(dataName)CurrentValue[i]]);
+    }
+  }
+
+  //Options for the chart to be created
+  var @(destinationTag)PlotOptions = {
+    title: "@title",
+    axes: {
+      xaxis: {
+        numberTicks: 4,
+        renderer: $.jqplot.DateAxisRenderer,
+        tickOptions: { formatString: '%H:%M:%S' },
+        min: window["@(dataName)Data" + 0][0][0],
+        max: window["@(dataName)Data" + 0][window["@(dataName)Data" + 0].length - 1][0]
+      },
+      yaxis: {
+        @if (format != null)
+        {<text>
+        tickOptions: {
+            formatString: "@format",
+        },
+        </text>}
+        min: 0, 
+        @if (maxY != null) {
+          @:max: @maxY,
         }
-        @(destinationTag)Plot.replot({ resetAxes: true })
-    }});
-    </text>
-}
+        else{
+          @:max: window["@(dataName)Data" + 0][window["@(dataName)Data" + 0].length - 1][1] + upperYBuffer,
+        }
+        numberTicks: 6
+      }
+    },
+    seriesDefaults: {
+      rendererOptions: { smooth: true },
+      markerOptions: {
+        show: false
+      }
+    }
+  };
+
+  //Declares the jqPlot variable, evals the string of series returned
+  //from getSeries which allows for any number of series
+  window[ "@(destinationTag)Plot"] = $.jqplot('@destinationTag', eval(getSeries(@(dataName)CurrentValue.length,"@(dataName)Data")), @(destinationTag)PlotOptions);
+  </text>
+}
+
+@helper UpdateStreamChart(string dataName, string destinationTag, string url, string fixedY = null)
+{
+  <text>
+  //If the data is beyond chartSize use shift to trim one off the end
+  for(i = 0; i < @(dataName)CurrentValue.length; i++) {
+    if (window["@(dataName)Data" + i].length > chartSize - 1) {
+      window["@(dataName)Data" + i].shift();
+    }
+  }
+
+  //Get the up-to-date data, each result assigned to it's own array
+  $.ajax({
+    async: false, url: '@(url)', datatype: "json", success: function (result) {
+      for(i = 0; i < result.length; i++) {
+        window[ "@(dataName)Data" + i].push([(new Date()).getTime(), result[i]]);
+      }
+    }
+  });
+
+  //If the plot exists currently destroy it
+  if ( @(destinationTag)Plot) {
+    @(destinationTag)Plot.destroy();
+  }
+
+  //Assign series
+  for(i = 0; i < @(dataName)CurrentValue.length; i++) {
+    @(destinationTag)Plot.series[i].data = window["@(dataName)Data" + i];
+  }
+
+  //Recalculate x and possibly y axis max and mins
+  @(destinationTag)PlotOptions.axes.xaxis.min = window["@(dataName)Data" + 0][0][0];
+  @(destinationTag)PlotOptions.axes.xaxis.max = window["@(dataName)Data" + 0][window["@(dataName)Data" + 0].length - 1][0];
+  @if (fixedY == null) {
+    @:@(destinationTag)PlotOptions.axes.yaxis.max = window["@(dataName)Data" + 0][window["@(dataName)Data" + 0].length - 1][1] + upperYBuffer;
+  }
+
+  //Re-assigns the jqPlot variable, evals the string of series returned
+  //from getSeries which allows for any number of series
+  @(destinationTag)Plot = $.jqplot('@destinationTag', eval(getSeries(@(dataName)CurrentValue.length,"@(dataName)Data")), @(destinationTag)PlotOptions);
+  </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>
+}

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

@@ -61 +61 @@
 }
 
+/* Progress bar styles */
+.barLabel {
+  margin: 2% 0% 0% 10%;
+  font-size: 1.1em;
+  font-family: inherit;
+  color: #6B6B6B;
+  display: block;
+}
+
+.outerBar {
+  height: 25px;
+  width: 80%;
+  margin-left: 10%;
+  border: 2px outset grey;
+}
+
+.outerBar:last-of-type {
+  margin-bottom: 2%;
+}
+
+.innerBar {
+  height: 100%;
+  vertical-align: middle;
+  background: rgb(32,122,2); /* Old browsers */
+  /* IE9 SVG, needs conditional override of 'filter' to 'none' */
+  background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzIwN2EwMiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iIzQwZDgwNCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMwMDZkMDciIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
+  background: -moz-linear-gradient(top,  rgba(32,122,2,1) 0%, rgba(64,216,4,1) 50%, rgba(0,109,7,1) 100%); /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(32,122,2,1)), color-stop(50%,rgba(64,216,4,1)), color-stop(100%,rgba(0,109,7,1))); /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top,  rgba(32,122,2,1) 0%,rgba(64,216,4,1) 50%,rgba(0,109,7,1) 100%); /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top,  rgba(32,122,2,1) 0%,rgba(64,216,4,1) 50%,rgba(0,109,7,1) 100%); /* Opera 11.10+ */
+  background: -ms-linear-gradient(top,  rgba(32,122,2,1) 0%,rgba(64,216,4,1) 50%,rgba(0,109,7,1) 100%); /* IE10+ */
+  background: linear-gradient(to bottom,  rgba(32,122,2,1) 0%,rgba(64,216,4,1) 50%,rgba(0,109,7,1) 100%); /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#207a02', endColorstr='#006d07',GradientType=0 ); /* IE6-8 */
+  display: inline-block;
+}
+
+.innerBarText, .outerBarText {
+  height: auto;
+  margin: 0%;
+  margin-left: 1%;
+  font-family: inherit;
+  font-size: 1.4em;
+  text-shadow: 0px 0px 6px #D9FCE4;
+  color: #000000;
+  display: inline-block;
+}
+
+.outerBarText {
+  text-align: right;
+}
+
+/* Login Page Styles*/
 #login {
   display: block;
@@ -89 +141 @@
 }
 
-
 #login form {
   display: inline;
+}
+
+#loginForm ol {
+  list-style: none;
 }
 
@@ -160 +215 @@
 }
 
+input[type="text"], input[type="password"] {
+  border: 1px solid #CCC;
+}
+
+/*Index Page Styles*/
 fieldset {
   margin: 1em 0;
+  margin-bottom: 2em;
   padding: 1em;
   padding-top: 0;
-  border: 1px solid #CCC;
-}
-
-fieldset ol {
-  padding: 0;
-}
-
-fieldset li {
-  list-style: none;
-  margin: 0.5em 0;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  border: 1px solid #8297F5;
 }
 
@@ -180 +235 @@
   font-weight: 600;
   padding: 2px 4px 8px 4px;
-}
-
-input[type="text"], input[type="password"] {
-  border: 1px solid #CCC;
-}
-
-.charts {
+  color: #6B6B6B;
+}
+
+fieldset > label, fieldset > input {
+  font-size: 1.1em;
+  font-weight: 600;
+  color: #6B6B6B;
+  display: block;
+}
+
+fieldset > input {
+  margin-bottom: 2%;
+}
+
+.charts, .chartContainer, .collapse {
   font-size: 1.5em;
 }
 
-.charts > div {
-  height: 300px;
-  margin-top: 15px;
-  margin-bottom: 5px;
-  margin-left: 10px;
-  margin-right: 20px;
-}
+.chartContainer {
+  width: 90%;
+  padding: 3%;
+  margin: 3% 0% 3% 2%;
+  -webkit-border-radius: 15px;
+  -moz-border-radius: 15px;
+  border-radius: 15px;
+  -webkit-box-shadow: 5px 5px 3px #A3A3A2;
+  box-shadow: 5px 5px 3px #A3A3A2;
+  border: 3px solid #8297F5;
+}
+
+.chartContainer > .title {
+  width: 95%;
+  border-bottom: none;
+  display:inline-block;
+}
+
+.chartContainer canvas {
+  margin: 0% 0% 2% 6%;
+}
+
+.chartContainer > div {
+  width: 90%;
+  height: 180px;
+  margin-left: 3%;
+}
+
+.chartContainer > .smoothieHolder {
+  width: auto;
+  height: auto;
+  margin: 0%;
+}
+
+.chartContainer .smoothieLabel {
+  width: 100%;
+  margin: 10px;
+  display: block;
+  text-align: center;
+  font-family: inherit;
+  font-size: 13pt;
+  color: #707070;
+}
+
+.collapse {
+  width: 3%;
+  min-width: 20px;
+  margin: 0px;
+  background: none;
+  color: #F7921D;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  border: 2px solid #F7921D;
+  text-align: center;
+  font-size: 1em;
+  display: inline-block;
+}
+
+.collapse:hover {
+  background-color: rgba(247,146,29,0.42);
+}
+/* User Page Styles*/
+#tasksContainer div[id^="Task"] {
+  margin: 2% 0%;
+}
+
+#tasksContainer .jqplot-xaxis {
+  display: none;
+}
+
+label[id$="Info"] {
+  font-family: inherit;
+  font-size: 13pt;
+  color: #707070;
+}
+
+#filters {
+  margin: 2% 2% 3% 2%;
+}
+
+#filters legend, #filters label, #filters input {
+  font-size: 1.6em;
+}
+
+/* Admin Page Styles */
+[id$="OverviewButton"] {
+  margin: 3% 0% 0% 0%;
+  background: none;
+  color: #707070;
+  font-size: 1.4em;
+  -webkit-border-radius: 0 3px 0 0;
+  border-radius: 0 5px 0 0;
+  border: 1px solid #8297F5;
+  text-align: center;
+  z-index: 3;
+}
+
+#UserOverviewButton {
+  border-bottom: 1px solid #E0E6FF;
+  background-color: #E0E6FF;
+  margin-left: 3%;
+}
+
+[id$="OverviewButton"]:hover {
+  background-color: #D1D9FF;
+}
+
+[id$="OverviewButton"]:focus {
+  -webkit-border-radius: 0 3px 0 0;
+  border-radius: 0 5px 0 0;
+  border-bottom: 1px solid #FAFAFA;
+}
+
+[id$="OverviewTab"] {
+  width: 90%;
+  padding: 1%;
+  margin: 0% 0% 3% 3%;
+  -webkit-border-radius: 0 15px 15px 15px;
+  border-radius: 0 15px 15px 15px;
+  -webkit-box-shadow: 5px 5px 3px #A3A3A2;
+  box-shadow: 5px 5px 3px #A3A3A2;
+  border: 1px solid #8297F5;
+  display: none;
+}
+
+#UserOverviewTab {
+  display: block;
+}
+
+.usersField {
+  width: 20%;
+  padding: 1% 2% 2% 2%;
+  margin: 1% 0% 2% 2%;
+  font-size: 1.4em;
+  vertical-align: top;
+  display: inline-block;
+}
+
+.usersList {
+  width: 100%;
+  font-family: inherit;
+  font-size: 10pt;
+  color: #707070;
+}
+
+.usersField label {
+  margin-top: 1em;
+}
+
+.adminDataContainer {
+  width: 70%;
+  padding-left: 1%;
+  display: inline-block;
+}

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

@@ -24 +24 @@
 using System.Linq;
 using System.Web.Mvc;
+using System.Web.Script.Serialization;
 using HeuristicLab.Services.Hive.DataAccess;
 
@@ -33 +34 @@
     public JsonResult AverageCpuUtilization(DateTime? start = null, DateTime? end = null) {
       using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString)) {
+        //If no given start date, get date of most recent record
+        if (start == null) {
+          start = GetRecentDate(db);
+        }
         var data =
           from facts in GetClientFacts(db, start, end)
@@ -48 +53 @@
     public JsonResult UsedCores(DateTime? start = null, DateTime? end = null) {
       using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString)) {
+        //If no given start date, get date of most recent record
+        if (start == null) {
+          start = GetRecentDate(db);
+        }
         var data =
           from facts in GetClientFacts(db, start, end)
@@ -64 +73 @@
     public JsonResult UsedMemory(DateTime? start = null, DateTime? end = null) {
       using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString)) {
+        //If no given start date, get date of most recent record
+        if (start == null) {
+          start = GetRecentDate(db);
+        }
         var data =
           from facts in GetClientFacts(db, start, end)
@@ -76 +89 @@
           CreateSeriesData(data.ToList(), x => x.Time, x => x.UsedMemory / 1000, x => x.TotalMemory / 1000),
           JsonRequestBehavior.AllowGet);
+      }
+    }
+
+    public JsonResult CurrentCores()
+    {
+      using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString))
+      {
+        var currentCores = (from client in db.FactClientInfos
+                            select new { client.NumTotalCores, client.NumUsedCores })
+                            .ToList();
+
+        List<int> result = new List<int>();
+        result.Add(currentCores.Sum(c => c.NumTotalCores));
+        result.Add(currentCores.Sum(s => s.NumUsedCores));
+
+        return Json(result, JsonRequestBehavior.AllowGet);
+      }
+    }
+
+    public JsonResult CurrentCpuUtilization()
+    {
+      using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString))
+      {
+        var currentCpuUtil = (from client in db.FactClientInfos
+                            select new { client.CpuUtilization })
+                            .ToList();
+
+        List<double> result = new List<double>();
+        result.Add(Math.Round(currentCpuUtil.Average(s => s.CpuUtilization), 2));
+
+        return Json(result, JsonRequestBehavior.AllowGet);
+      }
+    }
+
+    public JsonResult CurrentMemory()
+    {
+      using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString))
+      {
+        var currentMemory = (from client in db.FactClientInfos
+                            select new { client.TotalMemory, client.UsedMemory })
+                            .ToList();
+
+        List<int> result = new List<int>();
+        result.Add(currentMemory.Sum(c => c.TotalMemory)/1000);
+        result.Add(currentMemory.Sum(s => s.UsedMemory)/1000);
+
+        return Json(result, JsonRequestBehavior.AllowGet);
+      }
+    }
+
+    public JsonResult GetUserTask(string userName, DateTime? start = null, DateTime? end = null)
+    {
+      start = start ?? DateTime.Now - DefaultDuration;
+      end = end ?? DateTime.Now;
+      using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString))
+      {
+        var data =
+          (from tasks in db.FactTasks
+          join jobs in db.DimJobs
+            on tasks.JobId equals jobs.JobId
+          where jobs.UserName == userName &&
+          tasks.StartTime >= start &&
+          tasks.EndTime < end
+          select new
+          {
+            TotalWaiting = tasks.TotalWaitingTime,
+            TotalTransfer = tasks.TotalTransferTime,
+            TotalRuntime = tasks.TotalRuntime
+          }).ToList();
+
+        List<List<double>> overallResult = new List<List<double>>();
+        List<double> wait = new List<double>();
+        List<double> transfer = new List<double>();
+        List<double> run = new List<double>();
+        data.ForEach(w => wait.Add(w.TotalWaiting));
+        data.ForEach(t => transfer.Add(t.TotalTransfer));
+        data.ForEach(r => run.Add(r.TotalRuntime));
+        overallResult.Add(wait);
+        overallResult.Add(transfer);
+        overallResult.Add(run);
+
+        return Json(overallResult,JsonRequestBehavior.AllowGet);
       }
     }
@@ -98 +193 @@
       );
     }
+
+    private static DateTime GetRecentDate(HiveDataContext db)
+    {
+      var mostRecent = from dates in db.FactClientInfos
+        group dates by dates.Time into startDate
+        select startDate.OrderByDescending(t=>t.Time).FirstOrDefault();
+      return mostRecent.Max(t=>t.Time);
+    }
   }
 

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

@@ -108 +108 @@
     <Compile Include="App_Start\RouteConfig.cs" />
     <Compile Include="Controllers\AccountController.cs" />
+    <Compile Include="Controllers\AdminDataController.cs" />
     <Compile Include="Controllers\ChartDataController.cs" />
     <Compile Include="Controllers\HomeController.cs" />
+    <Compile Include="Controllers\LoginRequiredController.cs" />
+    <Compile Include="Models\AdminModel.cs" />
     <Compile Include="Models\OverallStatistics.cs" />
     <Compile Include="Global.asax.cs">
@@ -116 +119 @@
     <Compile Include="Helper\HtmMenulHelper.cs" />
     <Compile Include="Models\AccountModels.cs" />
+    <Compile Include="Models\UserModel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Content Include="App_Code\ChartHelper.cshtml" />
+    <Content Include="App_Code\AdminHelper.cshtml" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
+    <Content Include="Scripts\CollapsingSection.js" />
+    <Content Include="Scripts\SmoothieChartResize.js" />
+    <Content Include="Views\LoginRequired\UserTask.cshtml" />
+    <Content Include="Views\LoginRequired\Admin.cshtml" />
   </ItemGroup>
   <ItemGroup>
@@ -177 +186 @@
     <Content Include="Content\hl-logo.png" />
     <Content Include="Global.asax" />
+    <None Include="Properties\PublishProfiles\HiveStatistics-3.3.pubxml" />
     <None Include="Scripts\jquery-1.8.2.intellisense.js" />
     <Content Include="HeuristicLab.ico" />
@@ -266 +276 @@
     <Content Include="Scripts\jquery.validate.unobtrusive.min.js" />
     <Content Include="Scripts\modernizr-2.6.2.js" />
+    <Content Include="Scripts\smoothie.js" />
     <Content Include="Web.config" />
     <Content Include="Web.Debug.config">
@@ -283 +294 @@
     <Content Include="Views\Shared\_LoginPartial.cshtml" />
     <Content Include="Views\Shared\_Layout.cshtml" />
-    <Content Include="Views\Web.config" />
+    <Content Include="Views\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
   </ItemGroup>
   <ItemGroup>
@@ -316 +329 @@
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <UseIIS>True</UseIIS>
+          <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>0</DevelopmentServerPort>
+          <DevelopmentServerPort>4496</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:2088/</IISUrl>
+          <IISUrl>
+          </IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>

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

@@ -2 +2 @@
 
 @{
-    ViewBag.Title = "Status Monitor";
+  ViewBag.Title = "Status Monitor";
 }
 
 <h1>Current Status</h1>
 
+@*
+Original code
 <section>
-    <table>
-        <tr>
-            <td>Overall Available Cores</td>
-            <td>@Model.OverallCurrentlyAvailableCores</td>
-        </tr>
-        <tr>
-            <td>Availabe Cores (real)</td>
-            <td>@Model.CurrentlyAvailableCores</td>
-        </tr>
-        <tr>
-            <td>Used Cores</td>
-            <td>@Model.CurrentlyUsedCores</td>
-        </tr>
-        <tr>
-            <td>System-Wide Waiting Tasks</td>
-            <td>@Model.CurrentlyJobsWaiting</td>
-        </tr>
-        <tr>
-            <td>Overall Avg. CPU Utilization</td>
-            <td>@Model.OverallCpuUtilization</td>
-        </tr>
-        <tr>
-            <td>Available Avg. CPU Utilization</td>
-            <td>@Model.AvailableCpuUtilization</td>
-        </tr>
-    </table>
+  <table>
+    <tr>
+      <td>Overall Available Cores</td>
+      <td>@Model.OverallCurrentlyAvailableCores</td>
+    </tr>
+    <tr>
+      <td>Availabe Cores (real)</td>
+      <td>@Model.CurrentlyAvailableCores</td>
+    </tr>
+    <tr>
+      <td>Used Cores</td>
+      <td>@Model.CurrentlyUsedCores</td>
+    </tr>
+    <tr>
+      <td>System-Wide Waiting Tasks</td>
+      <td>@Model.CurrentlyJobsWaiting</td>
+    </tr>
+    <tr>
+      <td>Overall Avg. CPU Utilization</td>
+      <td>@Model.OverallCpuUtilization</td>
+    </tr>
+    <tr>
+      <td>Available Avg. CPU Utilization</td>
+      <td>@Model.AvailableCpuUtilization</td>
+    </tr>
+  </table>
+</section>*@
+
+<section class="chartContainer">
+  <h1 class="title">Current Hive Status</h1>
+  <button class="collapse">-</button>
+@*  <label id="lblCurrentCPUUtilization" class="smoothieLabel">Current CPU Utilization</label>
+  <div class="smoothieHolder">
+    <canvas id="CurrentCPUUtilization" class="smoothieChart"></canvas>
+  </div>
+  <label id="lblCurrentTotalUsedCores" class="smoothieLabel">Current Total and Used Cores</label>
+  <div class="smoothieHolder">
+    <canvas id="CurrentTotalUsedCores" class="smoothieChart"></canvas>
+  </div>
+  <label id="lblCurrentTotalUsedMemory" class="smoothieLabel">Current Total and Used Memory</label>
+  <div class="smoothieHolder">
+    <canvas id="CurrentTotalUsedMemory" class="smoothieChart"></canvas>
+  </div>*@
+  <div id="CurrentCPUUtilization"></div>
+  <div id="CurrentTotalUsedCores"></div>
+  <div id="CurrentTotalUsedMemory"></div>
 </section>
 
-<fieldset>
-        <legend>Range</legend>
-        <ol>
-            <li>Start</li>
-            <li>
-                @Html.TextBox("Start", (DateTime.Now - new TimeSpan(1, 0, 0, 0)).ToString("yyyy-MM-dd"), new { @class = "date" })
-            </li>
-            <li>End</li>
-            <li>
-                @Html.TextBox("End", (DateTime.Now + new TimeSpan(1, 0, 0, 0)).ToString("yyyy-MM-dd"), new { @class = "date" })
-            </li>
-        </ol>
-        <button id="refresh">Refresh</button>
-    </fieldset>
-
-<section class="charts">
-    <div id="AverageCpuUtilization"></div>
-    <div id="UsedCores"></div>
-    <div id="UsedMemory"></div>
+<section class="chartContainer">
+  <h1 class="title">Historic Hive Status</h1>
+  <button class="collapse">-</button>
+  <fieldset>
+    <legend>Range</legend>
+    <label>Start</label>
+    @Html.TextBox("Start", (DateTime.Now - new TimeSpan(1, 0, 0, 0)).ToString("yyyy-MM-dd"), new { @class = "date" })
+    <label>End</label>
+    @Html.TextBox("End", (DateTime.Now + new TimeSpan(1, 0, 0, 0)).ToString("yyyy-MM-dd"), new { @class = "date" })
+    <button id="Refresh">Refresh</button>
+  </fieldset>
+  <div id="AverageCpuUtilization"></div>
+  <div id="UsedCores"></div>
+  <div id="UsedMemory"></div>
 </section>
 
 @section Styles {
-    @Styles.Render("~/Styles/jqPlot/jquery.jqplot")
-    @Styles.Render("~/Content/themes/base/css")
+  @Styles.Render("~/Styles/jqPlot/jquery.jqplot")
+  @Styles.Render("~/Content/themes/base/css")
 }
 
 @section Scripts {
-    @Scripts.Render("~/bundles/jqueryui")
-    <script>
-    $("#refresh").button({
-        icons: {
-            primary: "ui-icon-refresh"
-        }
+  @Scripts.Render("~/bundles/jqueryui")
+  @Scripts.Render("~/Scripts/smoothie.js")
+  @Scripts.Render("~/Scripts/SmoothieChartResize.js")
+  @Scripts.Render("~/Scripts/CollapsingSection.js")
+  <script>
+    $("#Refresh").button({
+      icons: {
+        primary: "ui-icon-refresh"
+      }
     });
-    </script>
+  </script>
 
-    @Scripts.Render("~/Scripts/jqPlot/jquery.jqplot")
-    @ChartHelper.AjaxDataRenderer()
+  @Scripts.Render("~/Scripts/jqPlot/jquery.jqplot")
+  @ChartHelper.AjaxDataRenderer()
 
-    @ChartHelper.LineChartTime(
+  @ChartHelper.LineChartTime(
         "AverageCpuUtilization",
         Url.Action("AverageCpuUtilization", "ChartData"),
@@ -82 +102 @@
         minY: 0, maxY: 100)
 
-    @ChartHelper.LineChartTime(
+  @ChartHelper.LineChartTime(
         "UsedCores",
         Url.Action("UsedCores", "ChartData"),
@@ -88 +108 @@
         minY: 0)
 
-    @ChartHelper.LineChartTime(
+  @ChartHelper.LineChartTime(
         "UsedMemory",
         Url.Action("UsedMemory", "ChartData"),
@@ -94 +114 @@
         minY: 0)
 
-    <script>
-        $(document).ready(function () {
-            $(".date").datepicker({
-                dateFormat: "yy-mm-dd",
-                onSelect: function () { refreshCharts(); }
-            });
+  <script>
+    $(document).ready(function () {
+      $(".date").datepicker({
+        dateFormat: "yy-mm-dd",
+        onSelect: function () { refreshCharts(); }
+      });
 
-            $("#refresh").click(function() {
-                refreshCharts();
-            });
+      $("#Refresh").click(function () {
+        refreshCharts();
+      });
 
-            
-        });
-        
-        function refreshCharts() {
-            var startDate = $('#Start').val();
-            var endDate = $('#End').val();
+      //resizeSmoothie();
+      //createSmoothie();
+    });
 
-            @ChartHelper.RefreshChart("AverageCpuUtilization", Url.Action("AverageCpuUtilization", "ChartData"), "startDate", "endDate")
-            @ChartHelper.RefreshChart("UsedCores", Url.Action("UsedCores", "ChartData"), "startDate", "endDate")
-            @ChartHelper.RefreshChart("UsedMemory", Url.Action("UsedMemory", "ChartData"), "startDate", "endDate")
-        }
-    </script>
+    function refreshCharts() {
+      var startDate = $('#Start').val();
+      var endDate = $('#End').val();
+
+      @ChartHelper.RefreshChart("AverageCpuUtilization", Url.Action("AverageCpuUtilization", "ChartData"), "startDate", "endDate")
+      @ChartHelper.RefreshChart("UsedCores", Url.Action("UsedCores", "ChartData"), "startDate", "endDate")
+      @ChartHelper.RefreshChart("UsedMemory", Url.Action("UsedMemory", "ChartData"), "startDate", "endDate")
+    }
+
+@*    function createSmoothie() {
+      //Create new SmoothieChart(s)
+      @ChartHelper.CreateSmoothieChart("CurrentCPUUtilization","rgb(179, 179, 179)","rgb(242, 242, 242)","rgb(0, 22, 84)")
+      @ChartHelper.CreateSmoothieChart("CurrentTotalUsedCores","rgb(179, 179, 179)","rgb(242, 242, 242)","rgb(0, 22, 84)")
+      @ChartHelper.CreateSmoothieChart("CurrentTotalUsedMemory","rgb(179, 179, 179)","rgb(242, 242, 242)","rgb(0, 22, 84)")
+
+      //Second argument is delay in chart display, used to make drawing smooth,
+      //Should be matched to interval time below
+      @ChartHelper.SetSmoothieCanvas("CurrentCPUUtilization","5000")
+      @ChartHelper.SetSmoothieCanvas("CurrentTotalUsedCores","5000")
+      @ChartHelper.SetSmoothieCanvas("CurrentTotalUsedMemory","5000")
+
+      //Set interval to run ajax and get new values
+      @ChartHelper.AssignTimeSeries("averageUsage", "CurrentCPUUtilization", "rgb(0, 255, 0)", "rgba(0, 255, 0, 0.4)")
+      @ChartHelper.AssignTimeSeries("overallCore", "CurrentTotalUsedCores", "rgb(0, 255, 0)", "rgba(0, 255, 0, 0.4)")
+      @ChartHelper.AssignTimeSeries("usedCore", "CurrentTotalUsedCores", "rgb(242, 182, 70)", "rgba(255, 199, 94, 0.4)")
+      @ChartHelper.AssignTimeSeries("overallMemory", "CurrentTotalUsedMemory", "rgb(0, 255, 0)", "rgba(0, 255, 0, 0.4)")
+      @ChartHelper.AssignTimeSeries("usedMemory", "CurrentTotalUsedMemory", "rgb(242, 182, 70)", "rgba(255, 199, 94, 0.4)")
+
+      setInterval(function () { getChartUpdate() }, 5000);
+
+      //Hit by interval, jQuery ajax request to get new data from db
+      function getChartUpdate() {
+        @ChartHelper.UpdateChartData("CurrentCPUUtilization", Url.Action("CurrentCpuUtilization","ChartData"))
+        @ChartHelper.UpdateChartData("CurrentTotalUsedCores", Url.Action("CurrentCores","ChartData"))
+        @ChartHelper.UpdateChartData("CurrentTotalUsedMemory", Url.Action("CurrentMemory","ChartData"))
+      }
+    }*@
+
+    $(document).ready(function () {
+      @ChartHelper.SetStreamingProperties(1000,20,10)
+
+      @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")
+
+      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"))
+        setTimeout(doUpdate, refreshRate);
+      }
+
+      doUpdate();
+
+    });
+  </script>
 }

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Views/Shared/_Layout.cshtml

@@ -22 +22 @@
             <ul>
                 <li>@Html.MenuItem("Home", "Index", "Home")</li>
+                <li>@Html.MenuItem("User", "UserTask", "LoginRequired")</li>
+                <li>@Html.MenuItem("Admin", "Admin", "LoginRequired")</li>
                 <li>@Html.MenuItem("About", "About", "Home")</li>
                 <li>@Html.MenuItem("Contact", "Contact", "Home")</li>

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

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <!--
   For more information on how to configure your ASP.NET application, please visit
@@ -6 +6 @@
 <configuration>
   <connectionStrings>
-    <add name="HeuristicLab.Authentication" connectionString="data source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
-    <!--<add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;" providerName="System.Data.SqlClient" />-->
+    <add name="HeuristicLab.Authentication" connectionString="data source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication"/>
+    <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;" providerName="System.Data.SqlClient"/>
   </connectionStrings>
   <appSettings>
-    <add key="webpages:Version" value="2.0.0.0" />
-    <add key="webpages:Enabled" value="false" />
-    <add key="PreserveLoginUrl" value="true" />
-    <add key="ClientValidationEnabled" value="true" />
-    <add key="UnobtrusiveJavaScriptEnabled" value="true" />
+    <add key="webpages:Version" value="2.0.0.0"/>
+    <add key="webpages:Enabled" value="false"/>
+    <add key="PreserveLoginUrl" value="true"/>
+    <add key="ClientValidationEnabled" value="true"/>
+    <add key="UnobtrusiveJavaScriptEnabled" value="true"/>
   </appSettings>
   <system.web>
-    <compilation debug="true" targetFramework="4.0" />
+    <compilation targetFramework="4.0" debug="true"/>
     <authentication mode="Forms">
-      <forms loginUrl="~/Account/Login" timeout="2880" />
+      <forms loginUrl="~/Account/Login" timeout="2880"/>
     </authentication>
     <membership>
       <providers>
-        <clear />
-        <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="HeuristicLab.Authentication" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="HeuristicLab.Authentication" />
+        <clear/>
+        <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="HeuristicLab.Authentication" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="HeuristicLab.Authentication"/>
       </providers>
     </membership>
     <roleManager enabled="true">
       <providers>
-        <clear />
-        <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="HeuristicLab.Authentication" applicationName="HeuristicLab.Authentication" />
+        <clear/>
+        <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="HeuristicLab.Authentication" applicationName="HeuristicLab.Authentication"/>
       </providers>
     </roleManager>
     <pages>
       <namespaces>
-        <add namespace="System.Web.Helpers" />
-        <add namespace="System.Web.Mvc" />
-        <add namespace="System.Web.Mvc.Ajax" />
-        <add namespace="System.Web.Mvc.Html" />
-        <add namespace="System.Web.Optimization" />
-        <add namespace="System.Web.Routing" />
-        <add namespace="System.Web.WebPages" />
+        <add namespace="System.Web.Helpers"/>
+        <add namespace="System.Web.Mvc"/>
+        <add namespace="System.Web.Mvc.Ajax"/>
+        <add namespace="System.Web.Mvc.Html"/>
+        <add namespace="System.Web.Optimization"/>
+        <add namespace="System.Web.Routing"/>
+        <add namespace="System.Web.WebPages"/>
       </namespaces>
     </pages>
   </system.web>
   <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
-    <modules runAllManagedModulesForAllRequests="true" />
+    <validation validateIntegratedModeConfiguration="false"/>
+    <modules runAllManagedModulesForAllRequests="true"/>
   </system.webServer>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
+        <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
+        <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
+        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0"/>
       </dependentAssembly>
     </assemblyBinding>