From f844716c670062fff67bb50bb950d3f82d572774 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Sat, 8 May 2021 14:23:05 +0000
Subject: [PATCH]

---
 server/AyaNova/biz/WorkOrderBiz.cs            | 10 ++++++----
 server/AyaNova/models/WorkOrderItemExpense.cs |  4 ++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs
index 86217023..e61d0359 100644
--- a/server/AyaNova/biz/WorkOrderBiz.cs
+++ b/server/AyaNova/biz/WorkOrderBiz.cs
@@ -1414,14 +1414,16 @@ namespace AyaNova.Biz
             return SearchParams;
         }
 
+
         ////////////////////////////////////////////////////////////////////////////////////////////////
         //VIZ POPULATE
         // 
         private async Task ExpensePopulateVizFields(WorkOrderItemExpense o)
         {
-            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.UserId != null)
+                o.UserViz = await ct.User.AsNoTracking().Where(x => x.Id == o.UserId).Select(x => x.Name).FirstOrDefaultAsync();
+            if (o.ChargeTaxCodeId != null)
+                o.ChargeTaxCodeViz = await ct.TaxCode.AsNoTracking().Where(x => x.Id == o.ChargeTaxCodeId).Select(x => x.Name).FirstOrDefaultAsync();
         }
 
         ////////////////////////////////////////////////////////////////////////////////////////////////
@@ -2947,7 +2949,7 @@ namespace AyaNova.Biz
             await Task.CompletedTask;
             if (o.UserId != null)
                 o.UserViz = await ct.User.AsNoTracking().Where(x => x.Id == o.UserId).Select(x => x.Name).FirstOrDefaultAsync();
-             if (o.ServiceRateId != null)
+            if (o.ServiceRateId != null)
                 o.ServiceRateViz = await ct.ServiceRate.AsNoTracking().Where(x => x.Id == o.ServiceRateId).Select(x => x.Name).FirstOrDefaultAsync();
         }
 
diff --git a/server/AyaNova/models/WorkOrderItemExpense.cs b/server/AyaNova/models/WorkOrderItemExpense.cs
index bfeda9af..762066eb 100644
--- a/server/AyaNova/models/WorkOrderItemExpense.cs
+++ b/server/AyaNova/models/WorkOrderItemExpense.cs
@@ -20,8 +20,12 @@ namespace AyaNova.Models
         [Required]
         public decimal TaxPaid { get; set; }
         public long? ChargeTaxCodeId { get; set; }
+        [NotMapped]
+        public string ChargeTaxCodeViz { get; set; }
         public bool ReimburseUser { get; set; } = false;
         public long? UserId { get; set; }
+        [NotMapped]
+        public string UserViz { get; set; }
         public bool ChargeToCustomer { get; set; } = false;