Changeset 11053 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Controllers/ChartDataController.cs

Timestamp:

06/27/14 16:39:43 (10 years ago)

Author:

mroscoe

Message:

 

File:

• branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Controllers/ChartDataController.cs (modified) (3 diffs)

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

@@ -192 +192 @@
         List<KeyValuePair<string, List<double>>> results = new List<KeyValuePair<string, List<double>>>();
 
-        List<string> id = new List<string>();
-        List<double> wait = new List<double>();
-        List<double> transfer = new List<double>();
-        List<double> run = new List<double>();
-        List<double> times = new List<double>();
-        data.ForEach(i => id.Add(i.TaskID.ToString()));
-        data.ForEach(w => wait.Add(w.TotalWaiting));
-        data.ForEach(t => transfer.Add(t.TotalTransfer));
-        data.ForEach(r => run.Add(r.TotalRuntime));
-
-        for (int i = 0; i < id.Count; i++) {
-          results.Add(new KeyValuePair<string, List<double>>(id[i],new List<double>{wait[i],transfer[i],run[i]}));
+        for (int i = 0; i < data.Count; i++) {
+          results.Add(
+            new KeyValuePair<string, List<double>>(
+              data[i].TaskID.ToString(),new List<double>{data[i].TotalWaiting,data[i].TotalTransfer,data[i].TotalRuntime}
+            )  
+          );
         }
 
@@ -210 +204 @@
     }
 
-    public JsonResult SlaveInfo(string limit, DateTime? start = null, DateTime? end = null, string userName = null)
+    public JsonResult SlaveInfo(string limit, DateTime? start = null, DateTime? end = null, string userName = null, string slaveId=null)
     {
       using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString))
@@ -220 +214 @@
            where (!start.HasValue || slaves.Time >= start) &&
            (!end.HasValue || slaves.Time < end) &&
-           (string.IsNullOrEmpty(userName) || users.Name == userName)
+           (string.IsNullOrEmpty(userName) || users.Name == userName) &&
+           (string.IsNullOrEmpty(slaveId) || slaves.ClientId.ToString() == slaveId)
            select new
            {