Changeset 11030 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Views/LoginRequired/Admin.cshtml

Timestamp:

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

Author:

mroscoe

Message:

 

File:

• branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Views/LoginRequired/Admin.cshtml (modified) (7 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Views/LoginRequired/Admin.cshtml

@@ -25 +25 @@
       <select id="UserList" class="usersList">
       </select>
-      <label>Start</label>
-      @Html.TextBox("UserStart", (DateTime.Now - new TimeSpan(8, 0, 0, 0)).ToString("yyyy-MM-dd"), new { @class = "date" })
-      <label>End</label>
-      @Html.TextBox("UserEnd", (DateTime.Now + new TimeSpan(1, 0, 0, 0)).ToString("yyyy-MM-dd"), new { @class = "date" })
+      <fieldset id="FilterChoices">
+        <legend>Filter by</legend>
+        <label>Date</label>
+        <input type="checkbox" name="filterChoice" value="Date" checked="checked">
+        <label>Job Name</label>
+        <input type="checkbox" name="filterChoice" value="JobName">
+        <label>Task State</label>
+        <input type="checkbox" name="filterChoice" value="TaskState">
+        <label>Limit</label>
+        <select id="Limit">
+          <option>20</option>
+          <option>50</option>
+          <option selected="selected">100</option>
+          <option>200</option>
+        </select>
+      </fieldset>
     </fieldset>
-    <section id="TasksContainer" class="adminDataContainer"></section>
+    <fieldset id="Filters">
+      <legend>Filters</legend>
+      <fieldset id="FilterDate" class="filterContainer">
+        <legend>Date</legend>
+        <label>Start</label>
+        @Html.TextBox("UserStart", (DateTime.Now - new TimeSpan(1, 0, 0, 0)).ToString("yyyy-MM-dd"), new { @class = "date" })
+        <label>End</label>
+        @Html.TextBox("UserEnd", (DateTime.Now + new TimeSpan(1, 0, 0, 0)).ToString("yyyy-MM-dd"), new { @class = "date" })
+      </fieldset>
+      <fieldset id="FilterJobName" class="filterContainer">
+        <legend>Job Name</legend>
+        @Html.DropDownList("JobNames")
+      </fieldset>
+      <fieldset id="FilterTaskState" class="filterContainer">
+        <legend>Task State</legend>
+        @Html.DropDownList("TaskStates")
+      </fieldset>
+      <button id="Apply">Apply</button>
+    </fieldset>
+    <button id="ScrollTop">^</button>
+    <section id="TasksContainer" class="tabDataContainer"></section>
   </section>
   //Task overview
@@ -39 +71 @@
       </select>
       <label>Start</label>
-      @Html.TextBox("TaskStart", (DateTime.Now - new TimeSpan(8, 0, 0, 0)).ToString("yyyy-MM-dd"), new { @class = "date" })
+      @Html.TextBox("TaskStart", (DateTime.Now - new TimeSpan(1, 0, 0, 0)).ToString("yyyy-MM-dd"), new { @class = "date" })
       <label>End</label>
       @Html.TextBox("TaskEnd", (DateTime.Now + new TimeSpan(1, 0, 0, 0)).ToString("yyyy-MM-dd"), new { @class = "date" })
     </fieldset>
-    <section id="TaskStatsContainer" class="adminDataContainer"></section>
+    <section id="TaskStatsContainer" class="tabDataContainer taskOverview"></section>
   </section>
 }
@@ -55 +87 @@
   @Scripts.Render("~/bundles/jqueryui")
   @Scripts.Render("~/Scripts/CollapsingSection.js")
+  @Scripts.Render("~/Scripts/jquery.scrollstop.js")
   @Scripts.Render("~/Scripts/jqPlot/jquery.jqplot")
   @Scripts.Render("~/Scripts/jqPlot/plugins/jqplot.barRenderer.min.js")
@@ -67 +100 @@
     var endDate;
     var selectedUser;
+    var limit;
+    var pageNumber;
 
     $(document).ready(function () {
@@ -73 +108 @@
         onSelect: function () { RefreshUser(); }
       });
+      $("#TaskStart, #TaskEnd").datepicker({
+        dateFormat: "yy-mm-dd",
+        onSelect: function () { RefreshTask(); }
+      });
+    });
+
+    $("#Apply").button({
+      icons: {
+        primary: "ui-icon-refresh"
+      }
+    });
+
+    $("#Apply").click(function () {
+      RefreshUser();
     });
 
@@ -79 +128 @@
     });
 
-    function RefreshUser () {
+    $("[name='filterChoice']").click(function () {
+      var filterName = $(this).val();
+      if ($(this).is(':checked')) {
+        $("#Filter" + filterName).css("display", "inline-block");
+      }
+      else {
+        $("#Filter" + filterName).css("display", "none");
+      }
+    });
+
+    function RefreshUser() {
       selectedUser = $("#UserList").val();
-      startDate = $('#UserStart').val();
-      endDate = $('#UserEnd').val();
-      @ChartHelper.TasksForUser("TasksContainer", "Task", Url.Action("GetUserTask", "ChartData"),"selectedUser","startDate","endDate")
-      @ChartHelper.ResizeTasks("Task")
+      limit = $("#Limit").val();
+      startDate = null;
+      endDate = null;
+      jobId = null;
+      taskState = null;
+      if ($("[value='Date']").is(":checked")) {
+        startDate = $('#UserStart').val();
+        endDate = $('#UserEnd').val();
+      }
+      if ($("[value='JobName']").is(':checked')) {
+        jobId = $('#JobNames').val();
+      }
+      if ($("[value='TaskState']").is(':checked')) {
+        taskState = $('#TaskState').val();
+      }
+      @ExceptionHelper.UserExceptions("TasksContainer",Url.Action("TaskExceptions", "ExceptionData"),"selectedUser","limit","startDate","endDate","jobId","taskState")
+      @ChartHelper.TasksForUser("TasksContainer","Task",Url.Action("NumberPages", "ChartData"),Url.Action("GetUserTask", "ChartData"),"RefreshUser","selectedUser","limit","startDate","endDate","jobId","taskState","pageNumber")
     }
 
-    $(document).ready(function () {
-      $("#TaskStart, #TaskEnd").datepicker({
-        dateFormat: "yy-mm-dd",
-        onSelect: function () { RefreshTask(); }
-      });
-    });
+    @ChartHelper.ResizeTasks("Task")
+    @ExceptionHelper.ScrollToException()
 
     $("#TaskUserList").change(function () {
@@ -102 +170 @@
       startDate = $('#TaskStart').val();
       endDate = $('#TaskEnd').val();
-      @AdminHelper.UserTaskStats("TaskStatsContainer",Url.Action("AllTaskStats", "AdminData"),Url.Action("UserTaskStats", "AdminData"),"selectedUser","startDate","endDate")
+      @AdminHelper.UserTaskStats("TaskStatsContainer",Url.Action("TaskStats", "AdminData"),"selectedUser","startDate","endDate")
     }