From fbed18e1f5e6f905fc96ed359358cc713ac54f77 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 16 Sep 2021 23:33:30 +0000 Subject: [PATCH] --- server/AyaNova/biz/WorkOrderBiz.cs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs index 180dc10f..18037fc5 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -5109,10 +5109,17 @@ namespace AyaNova.Biz */ string WoStatusName = string.Empty; string WoStatusColor = string.Empty; + bool WoStatusCompleted = false; + bool WoStatusLocked = false; + bool HasWoStatus = false; if (w.States.Count > 0) { - WoStatusName = w.States[w.States.Count - 1].NameViz; - WoStatusColor = w.States[w.States.Count - 1].ColorViz; + var st = w.States[w.States.Count - 1]; + HasWoStatus = true; + WoStatusName = st.NameViz; + WoStatusColor = st.ColorViz; + WoStatusCompleted = st.CompletedViz; + WoStatusLocked = st.LockedViz; } return new @@ -5120,8 +5127,11 @@ namespace AyaNova.Biz serial = w.Serial, w.CustomerViz, wosummary = w.Notes, + haswostatus = HasWoStatus, wostatus = WoStatusName, wostatuscolor = WoStatusColor, + wostatuscompleted = WoStatusCompleted, + wostatuslocked = WoStatusLocked, woitemnotes = w.Items[0].Notes, woitemtechnotes = w.Items[0].TechNotes, woitemstatus = w.Items[0].WorkOrderItemStatusNameViz, @@ -5129,6 +5139,8 @@ namespace AyaNova.Biz woitempriority = w.Items[0].WorkOrderItemPriorityNameViz, woitemprioritycolor = w.Items[0].WorkOrderItemPriorityColorViz, scheduser = w.Items[0].ScheduledUsers[0].UserViz, + w.Items[0].ScheduledUsers[0].StartDate, + w.Items[0].ScheduledUsers[0].StopDate, qty = w.Items[0].ScheduledUsers[0].EstimatedQuantity, rate = w.Items[0].ScheduledUsers[0].ServiceRateViz, wotags = w.Tags,