Changeset 12514 for trunk/sources/HeuristicLab.Services.WebApp.Status/3.3

Timestamp:

06/25/15 18:02:47 (9 years ago)

Author:

dglaser

Message:

#2394:

HeuristicLab.Services.WebApp-3.3:

• implemented review comments
• fixed a bug which caused the sidebar menu to collapse on non mobile devices

HeuristicLab.Services.WebApp.Status-3.3:

• fixed calculation of calculating cores

File:

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

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

@@ -81 +81 @@
             FreeCores = onlineSlaves.Sum(s => s.FreeCores ?? 0), // temporary for old chart data
             ActiveCores = activeSlaves.Sum(s => s.Cores ?? 0),
-            CalculatingCores = calculatingSlaves.Sum(s => s.Cores ?? 0)
+            CalculatingCores = calculatingSlaves.Sum(s => s.Cores ?? 0) - calculatingSlaves.Sum(s => s.FreeCores ?? 0)
           },
           CpuUtilizationStatus = new DTO.CpuUtilizationStatus {