Changeset 9025 for trunk/sources/HeuristicLab.Services.Hive.Web/Hive-3.3/Status.aspx.cs

Timestamp:

12/11/12 16:27:46 (12 years ago)

Author:

ascheibe

Message:

#1994 added displaying statistics for groups

File:

• trunk/sources/HeuristicLab.Services.Hive.Web/Hive-3.3/Status.aspx.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Services.Hive.Web/Hive-3.3/Status.aspx.cs

@@ -44 +44 @@
     Dictionary<Guid, int> calculatingTasksByUser = new Dictionary<Guid,int>();
     Dictionary<Guid, int> waitingTasksByUser = new Dictionary<Guid, int>();
+    List<DT.Resource> groups = new List<DT.Resource>();
+
+    transactionManager.UseTransaction(() => {
+       groups = dao.GetResources(x => x.ResourceType == "GROUP").ToList();
+    }, false, false);    
 
     if (!string.IsNullOrEmpty(resourceName)) {
@@ -76 +81 @@
 
     slavesLabel.Text = string.Join(", ", onlineSlaves.Select(x => string.Format("<a href=\"?resource={0}\">{0}</a> ({1} %)", x.Name, Math.Round(x.CpuUtilization, 2))));
+    groupsLabel.Text = string.Join(", ", groups.Select(x => string.Format("<a href=\"?resource={0}\">{0}</a>", x.Name)));
 
     overallCpuUtilizationLabel.Text = (onlineSlaves.Count() > 0 ? Math.Round(onlineSlaves.Average(s => s.CpuUtilization), 2).ToString() : "0.0") + " %";
-    cpuUtilizationLabel.Text = (onlineSlaves.Count() > 0 ? Math.Round(onlineSlaves.Where(x => x.IsAllowedToCalculate).Average(s => s.CpuUtilization), 2).ToString() : "0.0") + " %";
+    cpuUtilizationLabel.Text = (onlineSlaves.Count() > 0 && onlineSlaves.Where(x => x.IsAllowedToCalculate).Count() > 0 ? Math.Round(onlineSlaves.Where(x => x.IsAllowedToCalculate).Average(s => s.CpuUtilization), 2).ToString() : "0.0") + " %";
 
     DT.Statistics[] stats = new DT.Statistics[0];