From eb83fd050e56aa7c7a4ec96d80423142bf6d086d Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 14 Sep 2021 22:23:59 +0000
Subject: [PATCH]

---
 .vscode/launch.json                              |  2 +-
 server/AyaNova/Controllers/ScheduleController.cs | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 976f60e9..f92c39ec 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -52,7 +52,7 @@
         "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
         "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
         "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",
-        "AYANOVA_SERVER_TEST_MODE": "true",
+        "AYANOVA_SERVER_TEST_MODE": "false",
         "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
         "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
         "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\"
diff --git a/server/AyaNova/Controllers/ScheduleController.cs b/server/AyaNova/Controllers/ScheduleController.cs
index bbf83905..22c016db 100644
--- a/server/AyaNova/Controllers/ScheduleController.cs
+++ b/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;