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

Timestamp:

07/04/14 08:59:24 (10 years ago)

Author:

mroscoe

Message:

 

File:

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

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

@@ -122 +122 @@
       <label>Limit</label>
       <select id="ExceptionLimit">
-        <option>20</option>
+        <option>2</option>
         <option>50</option>
         <option selected="selected">100</option>
@@ -244 +244 @@
       }
       @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")
+      @ChartHelper.TasksForUser("TasksContainer",Url.Action("UserTask", "ChartData"), "RefreshUser", "selectedUser", "limit", "startDate", "endDate", "jobId", "taskState", "pageNumber")
       pageNumber = null;
     }
-
-    @ChartHelper.ResizeTasks("Task")
-    @ExceptionHelper.ScrollToException()
 
     //Task Overview
@@ -280 +277 @@
     }
 
-    @ChartHelper.ResizeSlaves()
-
     //Exceptions Overview
     $("#ExceptionSlaveList").change(function () {
@@ -299 +294 @@
         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.UserExceptions("ExceptionContainer",Url.Action("TaskExceptions","ExceptionData"),"limit",null,"startDate","endDate",null,null,"selectedSlave")
+      @ExceptionHelper.ErrorsOnSlaves("ExceptionContainer",Url.Action("SlaveExceptions","ExceptionData"),"limit","startDate","endDate","selectedSlave","RefreshException","pageNumber")
     }
-    @ExceptionHelper.ShowSlaveInfo(Url.Action("SlaveInfo", "ChartData"),"limit","startDate","endDate")
+    @ExceptionHelper.ShowSlaveInfo(Url.Action("SlaveInfo","ChartData"),"limit","startDate","endDate")
+
+    //General Chart Methods
+    @ChartHelper.ResizeCharts()
+    @ExceptionHelper.ScrollToException()
   </script>
 }