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

Timestamp:

07/04/14 08:59:24 (10 years ago)

Author:

mroscoe

Message:

 

File:

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

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

@@ -139 +139 @@
     }
 
-    public JsonResult NumberPages(string userName, string limit, DateTime? start = null, DateTime? end = null, string jobId = null, string taskState = null)
-    {
-      using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString))
-      {
-        TaskState state = GetTaskState(taskState);
-        var numberRecords =
-          (from tasks in db.FactTasks
-           join jobs in db.DimJobs
-             on tasks.JobId equals jobs.JobId
-           where jobs.UserName == userName &&
-           (!start.HasValue || tasks.StartTime >= start) &&
-           (!end.HasValue || tasks.EndTime < end) &&
-           (string.IsNullOrEmpty(jobId) || tasks.JobId.ToString() == jobId) &&
-           (string.IsNullOrEmpty(taskState) || tasks.TaskState == state)
-           select new
-           {
-             TaskID = tasks.TaskId,
-             StartDate = tasks.StartTime
-           }).OrderByDescending(s => s.StartDate).ToList().Count;
-
-        var numberPages = numberRecords / Convert.ToDecimal(limit);
-        numberPages = Decimal.Truncate(numberPages);
-        numberPages += 1;
-
-        return Json(numberPages, JsonRequestBehavior.AllowGet);
-      }
-    }
-
-    public JsonResult UserTask(string userName, string limit, DateTime? start = null, DateTime? end = null, string jobId = null, string taskState=null)
+    public JsonResult UserTask(string userName, DateTime? start = null, DateTime? end = null, string jobId = null, string taskState=null)
     {
       using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString))
@@ -204 +176 @@
     }
 
-    public JsonResult SlaveInfo(string limit, DateTime? start = null, DateTime? end = null, string userName = null, string slaveId=null)
+    public JsonResult SlaveInfo(DateTime? start = null, DateTime? end = null, string userName = null, string slaveId=null)
     {
       using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString))