Changeset 9628 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Controllers

Timestamp:

06/14/13 10:24:01 (11 years ago)

Author:

pfleck

Message:

#2063:
Added zooming in charts.
Used memory is displayed in GB.

Location:

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

Files:

• ChartDataController.cs (modified) (2 diffs)
• HomeController.cs (modified) (3 diffs)

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

@@ -27 +27 @@
 
 namespace HeuristicLab.Services.Hive.Statistics.Controllers {
+  //[OutputCache(Duration = 60 * 5)]
   public class ChartDataController : Controller {
     private static readonly TimeSpan DefaultDuration = new TimeSpan(1, 0, 0, 0);
@@ -71 +72 @@
           };
 
+        // Return values in GB
         return Json(
-          CreateSeriesData(data.ToList(), x => x.Time, x => x.UsedMemory, x => x.TotalMemory),
+          CreateSeriesData(data.ToList(), x => x.Time, x => x.UsedMemory / 1000, x => x.TotalMemory / 1000),
           JsonRequestBehavior.AllowGet);
       }

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

@@ -29 +29 @@
   public class HomeController : Controller {
     public ActionResult Index() {
-      OverallStatus result = null;
-
       using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString)) {
         var onlineSlaves = (from slave in db.Resources.OfType<Slave>()
@@ -37 +35 @@
                            .ToList();
 
-        result = new OverallStatus {
+        var result = new OverallStatus {
           OverallCurrentlyAvailableCores = onlineSlaves.Sum(s => s.Cores ?? 0),
           CurrentlyAvailableCores = onlineSlaves.Where(s => s.IsAllowedToCalculate).Sum(s => s.Cores ?? 0),
@@ -49 +47 @@
                                     : 0.0
         };
+
+
+        return View(result);
       }
-
-      return View(result);
     }