Changeset 14722

Timestamp:

03/07/17 09:54:12 (8 years ago)

Author:

jkarder

Message:

#2743: worked on web app

• fixed InvalidOperationException
• fixed date conversion

Location:

trunk/sources

Files:

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

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

@@ -91 +91 @@
           AvgWaitingTime = count > 0 ? (long)calculatingTasks.OrderBy(x => x.StartTime).Take(count).Average(x => x.InitialWaitingTime) : 0,
           AvgCalculatingTime = lastCalculatingTimes != null ? lastCalculatingTimes.Avg : 0,
-          TotalCpuTime = factTasks.Sum(x => Convert.ToInt64(x.CalculatingTime)),
+          TotalCpuTime = factTasks.Sum(x => (long?)x.CalculatingTime) ?? 0,
           StandardDeviationCalculatingTime = (long)StandardDeviation(completedTasks.Select(x => (double)x.CalculatingTime)),
           BeginDate = factTasks.Where(x => x.StartTime.HasValue).OrderBy(x => x.StartTime).Select(x => x.StartTime).FirstOrDefault()

trunk/sources/HeuristicLab.Services.WebApp/3.3/WebApp/helper.js

@@ -31 +31 @@
     var month = (1 + date.getMonth()).zeropad(2);
     var year = date.getFullYear();
-    var hour = (date.getHours() - 2).zeropad(2);
+    var hour = (date.getHours() + date.getTimezoneOffset() / 60).zeropad(2);
     var minute = date.getMinutes().zeropad(2);
     var second = date.getSeconds().zeropad(2);