server/AyaNova/biz/WorkOrderBiz.cs

@@ -777,13 +777,11 @@ namespace AyaNova.Biz
         // (returns workorder consisting only of the path from child or grandchild up to header populated
         // with display data for reporting)
         //
-        internal async Task<WorkOrder> WorkOrderGetPartialAsync(AyaType ayaType, long id)
+        internal async Task<WorkOrder> WorkOrderGetPartialAsync(AyaType ayaType, long id, bool includeWoItemDescendants)
         {
             //if it's the entire workorder just get, populate and return as normal
             if (ayaType == AyaType.WorkOrder)
-            {
                 return await WorkOrderGetAsync(id, true, false);
-            }
 
             var wid = await GetWorkOrderIdFromRelativeAsync(ayaType, id, ct);
 
@@ -795,8 +793,38 @@ namespace AyaNova.Biz
 
             //explicit load subitems as required...
 
+
+            WorkOrderItem woitem = null;
+
+            //it's requesting a fully populated woitem so do that here
+            if (includeWoItemDescendants)
+            {
+
+                woitem = await ct.WorkOrderItem.AsSplitQuery()
+                    .AsNoTracking()
+                    .Include(wi => wi.Expenses)
+                    .Include(wi => wi.Labors)
+                    .Include(wi => wi.Loans)
+                    .Include(wi => wi.Parts)
+                    .Include(wi => wi.PartRequests)
+                    .Include(wi => wi.ScheduledUsers)
+                    .Include(wi => wi.Tasks)
+                    .Include(wi => wi.Travels)
+                    .Include(wi => wi.Units)
+                    .Include(wi => wi.OutsideServices)
+                    .SingleOrDefaultAsync(z => z.Id == id);
+            }
+            else
+            {
+
+
+
+
+
+
+
                 //get the single workorder item required
-            var woitem = await ct.WorkOrderItem.AsNoTracking().SingleOrDefaultAsync(x => x.Id == wid.WorkOrderItemId);
+                woitem = await ct.WorkOrderItem.AsNoTracking().SingleOrDefaultAsync(x => x.Id == wid.WorkOrderItemId);
 
                 switch (ayaType)
                 {
@@ -831,17 +859,10 @@ namespace AyaNova.Biz
                         woitem.Units.Add(await ct.WorkOrderItemUnit.AsNoTracking().Where(z => z.Id == id).SingleOrDefaultAsync());
                         break;
                 }
+            }
 
             ret.Items.Add(woitem);
 
-            // var goodPosts = context.Entry(blog)
-            //         .Collection(b => b.Posts)
-            //         .Query()
-            //         .Where(p => p.Rating > 3)
-            //         .ToList();
-
-
-
             await WorkOrderPopulateVizFields(ret, false);
             return ret;
         }
@@ -865,7 +886,7 @@ namespace AyaNova.Biz
                 idList = idList.Skip(IReportAbleObject.REPORT_DATA_BATCH_SIZE).ToArray();
                 List<WorkOrder> batchResults = new List<WorkOrder>();
                 foreach (long batchId in batch)
-                    batchResults.Add(await WorkOrderGetPartialAsync(dataListSelectedRequest.AType, batchId));
+                    batchResults.Add(await WorkOrderGetPartialAsync(dataListSelectedRequest.AType, batchId, dataListSelectedRequest.IncludeWoItemDescendants));
 
                 //order the results back into original                
                 IEnumerable<WorkOrder> orderedList = null;