From ea4462085aa7f10fb47d229d92ff785d17e0c6f7 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 30 Mar 2021 15:15:35 +0000
Subject: [PATCH]

---
 server/AyaNova/biz/WorkOrderBiz.cs     | 14 +++++++-------
 server/AyaNova/models/WorkOrderItem.cs |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs
index 1399dbd3..a9fc2955 100644
--- a/server/AyaNova/biz/WorkOrderBiz.cs
+++ b/server/AyaNova/biz/WorkOrderBiz.cs
@@ -40,10 +40,9 @@ namespace AyaNova.Biz
 
         internal static WorkOrderBiz GetBiz(AyContext ct, Microsoft.AspNetCore.Http.HttpContext httpContext = null)
         {
-
             if (httpContext != null)
                 return new WorkOrderBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items));
-            else//when called internally for internal ops there will be no context so need to set default values for that
+            else
                 return new WorkOrderBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull);
         }
 
@@ -143,9 +142,10 @@ namespace AyaNova.Biz
                 .ThenInclude(wi => wi.Travels)
             .Include(w => w.Items)
                 .ThenInclude(wi => wi.Units)
+            .Include(w => w.Items)
+                .ThenInclude(wi => wi.OutsideServices)
             .SingleOrDefaultAsync(z => z.Id == id);
 
-
             if (logTheGetEvent && ret != null)
                 await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, BizType, AyaEvent.Retrieved), ct);
             return ret;
@@ -2312,7 +2312,7 @@ namespace AyaNova.Biz
             }
             await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, dbObject.Id, AyaType.WorkOrderItemTask, AyaEvent.Modified), ct);
             await TaskSearchIndexAsync(dbObject, false);
-           // await TagBiz.ProcessUpdateTagsInRepositoryAsync(ct, dbObject.Tags, SnapshotOfOriginalDBObj.Tags);
+            // await TagBiz.ProcessUpdateTagsInRepositoryAsync(ct, dbObject.Tags, SnapshotOfOriginalDBObj.Tags);
             await HandlePotentialNotificationEvent(AyaEvent.Modified, dbObject, SnapshotOfOriginalDBObj);
             return dbObject;
         }
@@ -2486,7 +2486,7 @@ namespace AyaNova.Biz
             CopyObject.Copy(dtPutObject, dbObject, "Id");//FIX outdated method
 
             //dbObject.Tags = TagBiz.NormalizeTags(dbObject.Tags);
-           // dbObject.CustomFields = JsonUtil.CompactJson(dbObject.CustomFields);
+            // dbObject.CustomFields = JsonUtil.CompactJson(dbObject.CustomFields);
 
             ct.Entry(dbObject).OriginalValues["Concurrency"] = dtPutObject.Concurrency;
             await TravelValidateAsync(dbObject, SnapshotOfOriginalDBObj);
@@ -2525,7 +2525,7 @@ namespace AyaNova.Biz
             //Log event 
             await EventLogProcessor.DeleteObjectLogAsync(UserId, AyaType.WorkOrderItemTravel, dbObject.Id, "woitem:" + dbObject.WorkOrderItemId.ToString(), ct);
             await Search.ProcessDeletedObjectKeywordsAsync(dbObject.Id, AyaType.WorkOrderItemTravel, ct);
-           // await TagBiz.ProcessDeleteTagsInRepositoryAsync(ct, dbObject.Tags);
+            // await TagBiz.ProcessDeleteTagsInRepositoryAsync(ct, dbObject.Tags);
             await FileUtil.DeleteAttachmentsForObjectAsync(BizType, dbObject.Id, ct);
             await HandlePotentialNotificationEvent(AyaEvent.Deleted, dbObject);
             return true;
@@ -2598,7 +2598,7 @@ namespace AyaNova.Biz
             var obj = await ct.WorkOrderItemTravel.SingleOrDefaultAsync(z => z.Id == id);
             var SearchParams = new Search.SearchIndexProcessObjectParameters();
             if (obj != null)
-                 SearchParams.AddText(obj.Notes).AddText(obj.TravelDetails);
+                SearchParams.AddText(obj.Notes).AddText(obj.TravelDetails);
             return SearchParams;
         }
         #endregion work order item LABOR level
diff --git a/server/AyaNova/models/WorkOrderItem.cs b/server/AyaNova/models/WorkOrderItem.cs
index 33c892ac..7211f4a3 100644
--- a/server/AyaNova/models/WorkOrderItem.cs
+++ b/server/AyaNova/models/WorkOrderItem.cs
@@ -42,6 +42,7 @@ namespace AyaNova.Models
         public List<WorkOrderItemTask> Tasks { get; set; } = new List<WorkOrderItemTask>();
         public List<WorkOrderItemTravel> Travels { get; set; } = new List<WorkOrderItemTravel>();
         public List<WorkOrderItemUnit> Units { get; set; } = new List<WorkOrderItemUnit>();
+         public List<WorkOrderItemOutsideService> OutsideServices { get; set; } = new List<WorkOrderItemOutsideService>();
 
         [NotMapped, JsonIgnore]
         public AyaType AyaType { get => AyaType.WorkOrderItem; }