server/AyaNova/biz/WorkOrderBiz.cs

@@ -729,6 +729,8 @@ namespace AyaNova.Biz
         //
         public async Task<JArray> GetReportData(long[] idList)
         {
+
+
             JArray ReportData = new JArray();
             while (idList.Any())
             {
@@ -741,6 +743,13 @@ namespace AyaNova.Biz
                 //order the results back into original
                 var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
 
+
+
+                //TODO: ##HERE## SEE ContractBiz for example implementation; will need to pre-cache some translation keys for enum lists etc, for example:
+                // private async Task TaskPopulateVizFields(WorkOrderItemTask o, List<NameIdItem> taskCompletionTypeEnumList = null)
+
+
+
                 foreach (WorkOrder w in orderedList)
                 {
                     //populate entire workorder graph
@@ -3983,11 +3992,19 @@ namespace AyaNova.Biz
         ////////////////////////////////////////////////////////////////////////////////////////////////
         //VIZ POPULATE
         // 
-        private async Task TaskPopulateVizFields(WorkOrderItemTask o)
+        private async Task TaskPopulateVizFields(WorkOrderItemTask o, List<NameIdItem> taskCompletionTypeEnumList = null)
         {
-            await Task.CompletedTask;
-            // if (o.WorkOrderOverseerId != null)
-            //     o.WorkOrderOverseerViz = await ct.User.AsNoTracking().Where(x => x.Id == o.WorkOrderOverseerId).Select(x => x.Name).FirstOrDefaultAsync();
+            if (o.CompletedByUserId != null)
+                o.CompletedByUserViz = await ct.User.AsNoTracking().Where(x => x.Id == o.CompletedByUserId).Select(x => x.Name).FirstOrDefaultAsync();
+
+            if (taskCompletionTypeEnumList == null)
+                taskCompletionTypeEnumList = await AyaNova.Api.Controllers.EnumListController.GetEnumList(
+                    StringUtil.TrimTypeName(typeof(WorkorderItemTaskCompletionType).ToString()),
+                    UserTranslationId,
+                    CurrentUserRoles);
+
+            o.StatusViz = taskCompletionTypeEnumList.Where(x => x.Id == (long)o.Status).Select(x => x.Name).First();
+
         }
 
         ////////////////////////////////////////////////////////////////////////////////////////////////
@@ -4256,7 +4273,7 @@ namespace AyaNova.Biz
             TravelRate Rate = null;
             if (o.TravelRateId != null)
                 Rate = await ct.TravelRate.AsNoTracking().FirstOrDefaultAsync(x => x.Id == o.TravelRateId);
-            o.TravelRateViz=Rate.Name;
+            o.TravelRateViz = Rate.Name;
             TaxCode Tax = null;
             if (o.TaxCodeSaleId != null)
                 Tax = await ct.TaxCode.AsNoTracking().FirstOrDefaultAsync(z => z.Id == o.TaxCodeSaleId);