From 1b1a203c34b3fb8ab782e5ee6cb771bd9973f3c5 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 14 Sep 2021 23:07:38 +0000 Subject: [PATCH] --- server/AyaNova/Controllers/ScheduleController.cs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/server/AyaNova/Controllers/ScheduleController.cs b/server/AyaNova/Controllers/ScheduleController.cs index 22c016db..a6c5af55 100644 --- a/server/AyaNova/Controllers/ScheduleController.cs +++ b/server/AyaNova/Controllers/ScheduleController.cs @@ -65,13 +65,17 @@ namespace AyaNova.Api.Controllers if (p.WorkOrders && (UType == UserType.Service || UType == UserType.ServiceContractor)) { r.AddRange(await ct.ViewSchedulePersonalWorkOrder.Where(x => x.SchedUserId == UserId && x.StartDate > dtStart && x.StopDate < dtEnd) - .Select(x => new PersonalScheduleListItem() { Id = x.WoItemSchedUserId, Color = ColorFromWOItem(x, p), Start = x.StartDate, End = x.StopDate, Type = AyaType.WorkOrderItemScheduledUser, Name = NameFromWOItem(x, p) }) + .Select(x => new PersonalScheduleListItem() { Id = x.WoItemSchedUserId, Color = ColorFromWOItem(x, p), Start = EpochSeconds(x.StartDate), End = EpochSeconds(x.StopDate), Type = AyaType.WorkOrderItemScheduledUser, Name = NameFromWOItem(x, p) }) .ToListAsync()); } - - return Ok(ApiOkResponse.Response(r)); + } + private static long? EpochSeconds(DateTime? dt) + { + if (dt == null) return null; + DateTimeOffset dto = new DateTimeOffset((DateTime)dt); + return dto.ToUnixTimeSeconds(); } private static string ColorFromWOItem(ViewSchedulePersonalWorkOrder v, PersonalScheduleParams p) @@ -116,8 +120,8 @@ namespace AyaNova.Api.Controllers public class PersonalScheduleListItem { - public DateTime? Start { get; set; } - public DateTime? End { get; set; } + public long? Start { get; set; } + public long? End { get; set; } public string Name { get; set; } public string Color { get; set; } public AyaType Type { get; set; }