Changeset 11222 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Controllers/ExceptionDataController.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/ExceptionDataController.cs (modified) (6 diffs)

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

@@ -12 +12 @@
     {
       using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString)) {
-        TaskState state = GetTaskState(taskState);
+        TaskState? state = GetTaskState(taskState);
         var data =
         (from tasks in db.FactTasks
@@ -47 +47 @@
          join jobs in db.DimJobs
            on tasks.JobId equals jobs.JobId
+         join clients in db.DimClients
+           on tasks.LastClientId equals clients.Id
          where tasks.Exception != null &&
           !tasks.Exception.Equals(string.Empty) && 
@@ -56 +58 @@
            ErrorMessage = tasks.Exception,
            ClientID = tasks.LastClientId,
+           ClientName = clients.Name,
            UserName = jobs.UserName,
+           JobName = jobs.JobName,
            StartDate = tasks.StartTime
          }).OrderByDescending(s => s.StartDate).ToList();
@@ -64 +68 @@
         for (int i = 0; i < data.Count; i++) {
           results.Add(
-            new List<string> { data[i].TaskID.ToString(), data[i].ErrorMessage, data[i].ClientID.ToString(), data[i].UserName,
-              data[i].StartDate.ToString("dd/MM/yyyy HH:mm")}
+            new List<string> { data[i].TaskID.ToString(), data[i].ErrorMessage, data[i].ClientID.ToString(), data[i].ClientName,
+              data[i].UserName, data[i].JobName, data[i].StartDate.ToString("dd/MM/yyyy HH:mm")
+            }
           );
         }
@@ -72 +77 @@
     }
 
-    private static TaskState GetTaskState(string taskState) {
-      TaskState state = TaskState.Finished;
+    private static TaskState? GetTaskState(string taskState) {
+      TaskState? state;
       switch (taskState) {
         case "Aborted":
@@ -99 +104 @@
           state = TaskState.Waiting;
           break;
+        default :
+          state = null;
+          break;
       }
       return state;