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

Timestamp:

07/30/14 16:41:08 (10 years ago)

Author:

mroscoe

Message:

 

File:

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

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

@@ -114 +114 @@
 
     function TaskInformation() {
-      limit = $('#Limit').val();
-      startDate = null;
-      endDate = null;
-      jobId = null;
-      taskState = null;
-      if ($("[value='Date']").is(":checked")) {
-        startDate = $('#InfoStart').val();
-        endDate = $('#InfoEnd').val();
-      }
-      if ($("[value='JobName']").is(':checked')) {
-        jobId = $('#JobNames').val();
-      }
-      if ($("[value='TaskState']").is(':checked')) {
-        taskState = $('#TaskStates').val();
-      }
-      @ExceptionHelper.UserExceptions("TasksContainer",Url.Action("TaskExceptions", "ExceptionData"),"limit","userName","startDate","endDate","jobId","taskState")
-      @ChartHelper.TasksForUser("TasksContainer",Url.Action("UserTask", "ChartData"),"TaskInformation","userName","limit","startDate","endDate","jobId","taskState","pageNumber")
+      CheckFilters();
+      @ExceptionHelper.UserExceptions("TasksContainer",Url.Action("TaskExceptions", "ExceptionData"),"userName","startDate","endDate","jobId","taskState")
+      @ChartHelper.TaskContainers("TasksContainer",Url.Action("GetTasks", "ChartData"),"TaskInformation","userName","limit","startDate","endDate","jobId","taskState","pageNumber")
       pageNumber = null;
     }
 
     function TaskOverview() {
-      startDate = $('#OverviewStart').val();
-      endDate = $('#OverviewEnd').val();
+      CheckFilters();
       @AdminHelper.UserTaskStats("TaskStatsContainer",Url.Action("TaskStats", "AdminData"),"userName","startDate","endDate")
     }
@@ -148 +133 @@
     })
 
+    //General Chart Methods
+    function CheckFilters() {
+      startDate = null;
+      endDate = null;
+      switch ($('.tabSection:visible').attr('id')) {
+        case "TaskInformationTab":
+          limit = $('#Limit').val();
+          jobId = null;
+          taskState = null;
+          if ($("[value='Date']").is(":checked")) {
+            startDate = $('#InfoStart').val();
+            endDate = $('#InfoEnd').val();
+          }
+          if ($("[value='JobName']").is(':checked')) {
+            jobId = $('#JobNames').val();
+          }
+          if ($("[value='TaskState']").is(':checked')) {
+            taskState = $('#TaskStates').val();
+          }
+          break;
+        case "TaskOverviewTab":
+          startDate = $('#OverviewStart').val();
+          endDate = $('#OverviewEnd').val();
+          break;
+      }
+    }
     TaskInformation();
     @ChartHelper.ResizeCharts()
+    @ChartHelper.LoadTask(Url.Action("TaskInfo", "ChartData"))
+    @ChartHelper.LoadJob(Url.Action("JobProgress", "ChartData"))
     @ExceptionHelper.ScrollToException()
+    @ExceptionHelper.ShowFullError()
     @AdminHelper.MoreTaskInfo(Url.Action("MoreTaskInfo","AdminData"))
   </script>