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

Timestamp:

07/24/14 09:16:42 (10 years ago)

Author:

mroscoe

Message:

 

File:

• branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Controllers/ChartDataController.cs (modified) (7 diffs)

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

@@ -139 +139 @@
     }
 
-    public JsonResult UserTask(string userName, DateTime? start = null, DateTime? end = null, string jobId = null, string taskState=null)
-    {
-      using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString))
-      {
-        TaskState state = GetTaskState(taskState);
+    public JsonResult UserTask(string userName, DateTime? start = null, DateTime? end = null, string jobId = null, string taskState=null) {
+      using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString)) {
+        TaskState? state = GetTaskState(taskState);
+
         var data =
           (from tasks in db.FactTasks
@@ -155 +154 @@
            select new
            {
-             TaskID = tasks.TaskId,
+             JobName = jobs.JobName,
+             JobId = jobs.JobId,
+             TaskId = tasks.TaskId,
              TotalWaiting = tasks.TotalWaitingTime,
              TotalTransfer = tasks.TotalTransferTime,
@@ -162 +163 @@
            }).OrderByDescending(s => s.StartDate).ToList();
 
-        List<KeyValuePair<string, List<double>>> results = new List<KeyValuePair<string, List<double>>>();
-
-        for (int i = 0; i < data.Count; i++) {
-          results.Add(
-            new KeyValuePair<string, List<double>>(
-              data[i].TaskID.ToString(),new List<double>{data[i].TotalWaiting,data[i].TotalTransfer,data[i].TotalRuntime}
-            )  
-          );
-        }
-
-        return Json(results, JsonRequestBehavior.AllowGet);
+        return Json(data, JsonRequestBehavior.AllowGet);
       }
     }
@@ -184 +175 @@
            join users in db.DimUsers
             on slaves.UserId equals users.UserId
+           join clients in db.DimClients
+            on slaves.ClientId equals clients.Id
            where (!start.HasValue || slaves.Time >= start) &&
            (!end.HasValue || slaves.Time < end) &&
@@ -190 +183 @@
            select new
            {
+             ClientName = clients.Name,
              SlaveID = slaves.ClientId,
              Time = slaves.Time,
@@ -203 +197 @@
     }
 
-    private static TaskState GetTaskState(string taskState) {
-      TaskState state = TaskState.Finished;
+    private static TaskState? GetTaskState(string taskState) {
+      TaskState? state;
       switch (taskState)
       {
@@ -230 +224 @@
         case "Waiting":
           state = TaskState.Waiting;
+          break;
+        default :
+          state = null;
           break;
       }