Changeset 14722


Ignore:
Timestamp:
03/07/17 09:54:12 (8 months ago)
Author:
jkarder
Message:

#2743: worked on web app

  • fixed InvalidOperationException
  • fixed date conversion
Location:
trunk/sources
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApi/DataController.cs

    r14185 r14722  
    9191          AvgWaitingTime = count > 0 ? (long)calculatingTasks.OrderBy(x => x.StartTime).Take(count).Average(x => x.InitialWaitingTime) : 0,
    9292          AvgCalculatingTime = lastCalculatingTimes != null ? lastCalculatingTimes.Avg : 0,
    93           TotalCpuTime = factTasks.Sum(x => Convert.ToInt64(x.CalculatingTime)),
     93          TotalCpuTime = factTasks.Sum(x => (long?)x.CalculatingTime) ?? 0,
    9494          StandardDeviationCalculatingTime = (long)StandardDeviation(completedTasks.Select(x => (double)x.CalculatingTime)),
    9595          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

    r12878 r14722  
    3131    var month = (1 + date.getMonth()).zeropad(2);
    3232    var year = date.getFullYear();
    33     var hour = (date.getHours() - 2).zeropad(2);
     33    var hour = (date.getHours() + date.getTimezoneOffset() / 60).zeropad(2);
    3434    var minute = date.getMinutes().zeropad(2);
    3535    var second = date.getSeconds().zeropad(2);
Note: See TracChangeset for help on using the changeset viewer.