Changeset 12443

Timestamp:

06/15/15 10:52:01 (9 years ago)

Author:

dglaser

Message:

#2394: Fixed UserTaskQuery and GetStatusHistory in the WebApp.Status plugin

File:

• trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApi/DataController.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApi/DataController.cs

@@ -42 +42 @@
         SELECT 
           DISTINCT UserId,
-          (SELECT Count FROM UserTasks WHERE TaskState = 'Calculating' AND UserId = ut.UserId) AS CalculatingTasks,
-          (SELECT Count FROM UserTasks WHERE TaskState = 'Waiting' AND UserId = ut.UserId) AS WaitingTasks
+          ISNULL((SELECT Count FROM UserTasks WHERE TaskState = 'Calculating' AND UserId = ut.UserId), 0) AS CalculatingTasks,
+          ISNULL((SELECT Count FROM UserTasks WHERE TaskState = 'Waiting' AND UserId = ut.UserId), 0) AS WaitingTasks
         FROM UserTasks ut;";
-
 
     private class UserTaskStatus {
@@ -129 +128 @@
       }
       using (var db = new HiveDataContext()) {
-        var statistics = db.Statistics.Where(s => s.Timestamp >= start && s.Timestamp <= end);
+        var statistics = db.Statistics.Where(s => s.Timestamp >= start && s.Timestamp <= end)
+                                      .OrderBy(s => s.Timestamp);
         var status = new DTO.Status {
           CoreStatus = new DTO.CoreStatus(),