admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-05-09 14:37:21 +00:00
parent 17bde3f8e1
commit 0405b8c8ca
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/AyaNova/biz/WorkOrderBiz.cs
View File

@@ -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 //docs say this will not query twice but will recognize the duplicate woitem bit which is required for multiple grandchild collections
var ret = var ret =
await ct.WorkOrder await ct.WorkOrder
.Include(w => w.WorkOrderItems) .Include(w => w.Items)
.ThenInclude(wi => wi.WorkOrderItemLabors) .ThenInclude(wi => wi.Labors)
.Include(w => w.WorkOrderItems) .Include(w => w.Items)
.ThenInclude(wi => wi.WorkOrderItemParts) .ThenInclude(wi => wi.Parts)
.SingleOrDefaultAsync(m => m.Id == id); .SingleOrDefaultAsync(m => m.Id == id);
if (logTheGetEvent && ret != null) if (logTheGetEvent && ret != null)
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, BizType, AyaEvent.Retrieved), ct); 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 //docs say this will not query twice but will recognize the duplicate woitem bit which is required for multiple grandchild collections
var ret = var ret =
await ct.WorkOrderItem await ct.WorkOrderItem
.Include(wi => wi.WorkOrderItemLabors) .Include(wi => wi.Labors)
.Include(wi => wi.WorkOrderItemParts) .Include(wi => wi.Parts)
.SingleOrDefaultAsync(m => m.Id == id); .SingleOrDefaultAsync(m => m.Id == id);
if (logTheGetEvent && ret != null) if (logTheGetEvent && ret != null)
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, AyaType.WorkOrderItem, AyaEvent.Retrieved), ct); await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, AyaType.WorkOrderItem, AyaEvent.Retrieved), ct);

4
server/AyaNova/models/WorkOrder.cs
View File

@@ -34,7 +34,7 @@ namespace AyaNova.Models
Tags = new List<string>(); Tags = new List<string>();
//dependents //dependents
WorkOrderItems = new List<WorkOrderItem>(); Items = new List<WorkOrderItem>();
} }
public long Id { get; set; } public long Id { get; set; }
@@ -49,7 +49,7 @@ namespace AyaNova.Models
public List<string> Tags { get; set; } public List<string> Tags { get; set; }
//dependents //dependents
public List<WorkOrderItem> WorkOrderItems { get; set; } public List<WorkOrderItem> Items { get; set; }
// [NotMapped] // [NotMapped]

8
server/AyaNova/models/WorkOrderItem.cs
View File

@@ -29,8 +29,8 @@ namespace AyaNova.Models
{ {
Tags = new List<string>(); Tags = new List<string>();
//dependents //dependents
WorkOrderItemLabors = new List<WorkOrderItemLabor>(); Labors = new List<WorkOrderItemLabor>();
WorkOrderItemParts = new List<WorkOrderItemPart>(); Parts = new List<WorkOrderItemPart>();
} }
public long Id { get; set; } public long Id { get; set; }
public uint ConcurrencyToken { get; set; } public uint ConcurrencyToken { get; set; }
@@ -46,8 +46,8 @@ namespace AyaNova.Models
public WorkOrder WorkOrder { get; set; } public WorkOrder WorkOrder { get; set; }
//dependents //dependents
public List<WorkOrderItemLabor> WorkOrderItemLabors { get; set; } public List<WorkOrderItemLabor> Labors { get; set; }
public List<WorkOrderItemPart> WorkOrderItemParts { get; set; } public List<WorkOrderItemPart> Parts { get; set; }
}//eoc }//eoc
}//eons }//eons