Changeset 11053 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Views/LoginRequired

Timestamp:

06/27/14 16:39:43 (11 years ago)

Author:

mroscoe

Message:

 

Location:

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

Files:

• Admin.cshtml (modified) (10 diffs)
• UserTask.cshtml (modified) (1 diff)

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

@@ -63 +63 @@
       <button id="UserApply">Apply</button>
     </fieldset>
-    <button id="ScrollTop">^</button>
     <section id="TasksContainer" class="tabDataContainer"></section>
   </section>
@@ -113 +112 @@
     <section id="SlavesContainer" class="tabDataContainer"></section>
   </section>
-  //Slave overview
+  //Exception overview
   <section id="ExceptionOverviewTab" class="tabSection">
     <fieldset class="filterChoices">
@@ -119 +118 @@
       <label>Date</label>
       <input type="checkbox" name="filterChoice" value="ExceptionDate" checked="checked">
-      <label>Users</label>
-      <input type="checkbox" name="filterChoice" value="ExceptionUser">
+      <label>Slave</label>
+      <input type="checkbox" name="filterChoice" value="ExceptionSlave">
       <label>Limit</label>
       <select id="ExceptionLimit">
@@ -138 +137 @@
         @Html.TextBox("ExceptionEnd", (DateTime.Now + new TimeSpan(1, 0, 0, 0)).ToString("yyyy-MM-dd"), new { @class = "date" })
       </fieldset>
-      <fieldset id="FilterExceptionUser" class="filterContainer">
-        <legend>User</legend>
-        <select id="ExceptionUserList">
-        </select>
-      </fieldset>
-      <button id="ExcpetionApply">Apply</button>
+      <fieldset id="FilterExceptionSlave" class="filterContainer">
+        <legend>Slave</legend>
+        @Html.DropDownList("Slaves")
+      </fieldset>
+      <button id="ExceptionApply">Apply</button>
     </fieldset>
     <section id="ExceptionContainer" class="tabDataContainer"></section>
   </section>
+  <button id="ScrollTop">^</button>
 }
 
@@ -171 +170 @@
     var endDate;
     var selectedUser;
+    var selectedSlave;
     var limit;
     var pageNumber;
     var userId;
-    var numberTasks = 0;
 
     $(document).ready(function () {
@@ -218 +217 @@
     });
 
+    $(".tabButton").click(function () {
+      var sender = $(this).attr('id');
+      $(".tabButton").css({ 'border-bottom': '1px solid #8297F5', 'background': 'none' });
+      $(this).css({ 'border-bottom': '1px solid #E0E6FF', 'background-color': '#E0E6FF' });
+      $(".tabSection").css('display', 'none');
+      $("#" + sender.slice(0, -6) + "Tab").css('display', 'block');
+    })
+
+    //User Overview
     function RefreshUser() {
       selectedUser = $("#UserList").val();
@@ -235 +243 @@
         taskState = $('#TaskState').val();
       }
-      @ExceptionHelper.UserExceptions("TasksContainer", Url.Action("TaskExceptions", "ExceptionData"), "selectedUser", "limit", "startDate", "endDate", "jobId", "taskState")
+      @ExceptionHelper.UserExceptions("TasksContainer", Url.Action("TaskExceptions", "ExceptionData"), "limit", "selectedUser", "startDate", "endDate", "jobId", "taskState")
       @ChartHelper.TasksForUser("TasksContainer", "Task", Url.Action("UserTask", "ChartData"), "RefreshUser", "selectedUser", "limit", "startDate", "endDate", "jobId", "taskState", "pageNumber")
       pageNumber = null;
@@ -243 +251 @@
     @ExceptionHelper.ScrollToException()
 
+    //Task Overview
     $("#TaskUserList").change(function () {
       RefreshTask();
@@ -254 +263 @@
     }
 
-    $("#SlaveList").change(function () {
-      RefreshSlave();
-    });
-
+    //Slave Overview
     function RefreshSlave() {
       selectedUser = null;
@@ -270 +276 @@
         selectedUser = $('#SlaveUserList').val();
       }
-      @ChartHelper.SlaveInfoChart("SlavesContainer",Url.Action("SlaveInfo","ChartData"),"limit","startDate","endDate","selectedUser","RefreshSlave","pageNumber")
+      @ChartHelper.SlaveInfoChart("SlavesContainer", Url.Action("SlaveInfo", "ChartData"), "limit", "startDate", "endDate", "selectedUser", "RefreshSlave", "pageNumber")
       pageNumber = null;
     }
 
-    $(".tabButton").click(function () {
-      var sender = $(this).attr('id');
-      $(".tabButton").css({'border-bottom' : '1px solid #8297F5', 'background' : 'none' });
-      $(this).css({ 'border-bottom': '1px solid #E0E6FF', 'background-color': '#E0E6FF' });
-      $(".tabSection").css('display', 'none');
-      $("#" + sender.slice(0, -6) + "Tab").css('display', 'block');
-    })
+    @ChartHelper.ResizeSlaves()
+
+    //Exceptions Overview
+    $("#ExceptionSlaveList").change(function () {
+      RefreshException();
+    });
+
+    function RefreshException() {
+      selectedSlave = null;
+      limit = $("#ExceptionLimit").val();
+      startDate = null;
+      endDate = null;
+      if ($("[value='ExceptionDate']").is(":checked")) {
+        startDate = $('#ExceptionStart').val();
+        endDate = $('#ExceptionEnd').val();
+      }
+      if ($("[value='ExceptionSlave']").is(':checked')) {
+        selectedSlave = $('#Slaves').val();
+      }
+      @ExceptionHelper.UserExceptions("ExceptionContainer", Url.Action("TaskExceptions", "ExceptionData"), "limit", null, "startDate", "endDate", null, null)
+      @ExceptionHelper.ShowErrors("ExceptionContainer")
+      @ExceptionHelper.ErrorsOnSlaves("ExceptionContainer",Url.Action("SlaveExceptions", "ExceptionData"),"limit","startDate", "endDate","selectedSlave")
+    }
+    @*@ExceptionHelper.ShowSlaveInfo(Url.Action("SlaveInfo", "ChartData"),"limit","startDate","endDate")*@
   </script>
 }

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

@@ -129 +129 @@
         taskState = $('#TaskState').val();
       }
-      @ExceptionHelper.UserExceptions("TasksContainer",Url.Action("TaskExceptions", "ExceptionData"),"userName","limit","startDate","endDate","jobId","taskState")
+      @ExceptionHelper.UserExceptions("TasksContainer",Url.Action("TaskExceptions", "ExceptionData"),"limit","userName","startDate","endDate","jobId","taskState")
       @ChartHelper.TasksForUser("TasksContainer","Task",Url.Action("UserTask", "ChartData"),"TaskInformation","userName","limit","startDate","endDate","jobId","taskState","pageNumber")
       pageNumber = null;