Changeset 12769

Timestamp:

07/16/15 16:55:37 (9 years ago)

Author:

dglaser

Message:

#2429:

• Unused plugins are now sorted by date and name
• Fixed a small bug in the FactClientInfo aggregation

Location:

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi

Files:

• DataTransfer/FactClientInfo.cs (modified) (1 diff)
• FactClientInfoController.cs (modified) (2 diffs)
• PluginController.cs (modified) (1 diff)

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/DataTransfer/FactClientInfo.cs

@@ -20 +20 @@
 #endregion
 
-
 namespace HeuristicLab.Services.WebApp.Maintenance.WebApi.DataTransfer {
   public class FactClientInfo {

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/FactClientInfoController.cs

@@ -70 +70 @@
         var infosToAggregate = new List<FactClientInfo> { e.Current };
         var prev = e.Current;
-        while (infosToAggregate.Count() != entries && e.MoveNext()) {
+        while (e.MoveNext() && infosToAggregate.Count() != entries) {
           var cur = e.Current;
           if (prev.IsAllowedToCalculate != cur.IsAllowedToCalculate || prev.SlaveState != cur.SlaveState)
@@ -77 +77 @@
           prev = cur;
         }
-        if (infosToAggregate.Count() == entries) {
+        if (infosToAggregate.Count() >= 2) {
           AggregateClientInfos(pm, infosToAggregate);
         }
-      } while (e.MoveNext());
+      } while (e.Current != null);
     }
 

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/PluginController.cs

@@ -47 +47 @@
           return new DT.PluginPage {
             TotalPlugins = query.Count(),
-            Plugins = query.OrderBy(x => x.DateCreated)
+            Plugins = query.OrderBy(x => x.DateCreated).ThenBy(x => x.Name)
               .Skip((page - 1) * size)
               .Take(size).Select(x => new DT.Plugin {