diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs index 2d309b9c..892eb9d0 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -103,10 +103,10 @@ namespace AyaNova.Biz //docs say this will not query twice but will recognize the duplicate woitem bit which is required for multiple grandchild collections var ret = await ct.WorkOrder - .Include(w => w.WorkOrderItems) - .ThenInclude(wi => wi.WorkOrderItemLabors) - .Include(w => w.WorkOrderItems) - .ThenInclude(wi => wi.WorkOrderItemParts) + .Include(w => w.Items) + .ThenInclude(wi => wi.Labors) + .Include(w => w.Items) + .ThenInclude(wi => wi.Parts) .SingleOrDefaultAsync(m => m.Id == id); if (logTheGetEvent && ret != null) await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, BizType, AyaEvent.Retrieved), ct); @@ -312,8 +312,8 @@ namespace AyaNova.Biz //docs say this will not query twice but will recognize the duplicate woitem bit which is required for multiple grandchild collections var ret = await ct.WorkOrderItem - .Include(wi => wi.WorkOrderItemLabors) - .Include(wi => wi.WorkOrderItemParts) + .Include(wi => wi.Labors) + .Include(wi => wi.Parts) .SingleOrDefaultAsync(m => m.Id == id); if (logTheGetEvent && ret != null) await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, AyaType.WorkOrderItem, AyaEvent.Retrieved), ct); diff --git a/server/AyaNova/models/WorkOrder.cs b/server/AyaNova/models/WorkOrder.cs index a821351e..54267668 100644 --- a/server/AyaNova/models/WorkOrder.cs +++ b/server/AyaNova/models/WorkOrder.cs @@ -34,7 +34,7 @@ namespace AyaNova.Models Tags = new List(); //dependents - WorkOrderItems = new List(); + Items = new List(); } public long Id { get; set; } @@ -49,7 +49,7 @@ namespace AyaNova.Models public List Tags { get; set; } //dependents - public List WorkOrderItems { get; set; } + public List Items { get; set; } // [NotMapped] diff --git a/server/AyaNova/models/WorkOrderItem.cs b/server/AyaNova/models/WorkOrderItem.cs index b4f4d830..fe482b44 100644 --- a/server/AyaNova/models/WorkOrderItem.cs +++ b/server/AyaNova/models/WorkOrderItem.cs @@ -29,8 +29,8 @@ namespace AyaNova.Models { Tags = new List(); //dependents - WorkOrderItemLabors = new List(); - WorkOrderItemParts = new List(); + Labors = new List(); + Parts = new List(); } public long Id { get; set; } public uint ConcurrencyToken { get; set; } @@ -46,8 +46,8 @@ namespace AyaNova.Models public WorkOrder WorkOrder { get; set; } //dependents - public List WorkOrderItemLabors { get; set; } - public List WorkOrderItemParts { get; set; } + public List Labors { get; set; } + public List Parts { get; set; } }//eoc }//eons