server/AyaNova/Controllers/ScheduleController.cs

@@ -55,21 +55,26 @@ namespace AyaNova.Api.Controllers
 
             var UserId = UserIdFromContext.Id(HttpContext.Items);
             var UType = UserTypeFromContext.Type(HttpContext.Items);
+            //this covers the largest possible window that could display due to nearly a week of the last or next month showing
+            DateTime dtStart = p.Start.AddDays(-6);
+            DateTime dtEnd = p.End.AddDays(6);
+
+
 
             //WORKORDERS
             if (p.WorkOrders && (UType == UserType.Service || UType == UserType.ServiceContractor))
             {
-                r.AddRange(await ct.ViewSchedulePersonalWorkOrder.Where(x => x.SchedUserId == UserId)
+                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) })
                     .ToListAsync());
             }
 
 
-            return Ok(r);
+            return Ok(ApiOkResponse.Response(r));
 
         }
 
-        private string ColorFromWOItem(ViewSchedulePersonalWorkOrder v, PersonalScheduleParams p)
+        private static string ColorFromWOItem(ViewSchedulePersonalWorkOrder v, PersonalScheduleParams p)
         {
             switch (p.ColorSource)
             {
@@ -83,7 +88,7 @@ namespace AyaNova.Api.Controllers
             return string.Empty;
         }
 
-        private string NameFromWOItem(ViewSchedulePersonalWorkOrder v, PersonalScheduleParams p)
+        private static string NameFromWOItem(ViewSchedulePersonalWorkOrder v, PersonalScheduleParams p)
         {
             // Name=[wonumber customername]
             return v.Serial.ToString() + " " + v.CustomerName;