From b3e75e4aea6cc77b4824d948cede983e2e24426d Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 2 Mar 2021 00:30:51 +0000
Subject: [PATCH]

---
 server/AyaNova/biz/HeadOfficeBiz.cs | 10 ++++++++--
 server/AyaNova/models/HeadOffice.cs | 12 +++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/server/AyaNova/biz/HeadOfficeBiz.cs b/server/AyaNova/biz/HeadOfficeBiz.cs
index d86815d6..2ce5f1f6 100644
--- a/server/AyaNova/biz/HeadOfficeBiz.cs
+++ b/server/AyaNova/biz/HeadOfficeBiz.cs
@@ -325,6 +325,7 @@ namespace AyaNova.Biz
                 var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
                 foreach (HeadOffice w in orderedList)
                 {
+                    await PopulateVizFields(w);
                     var jo = JObject.FromObject(w);
                     if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
                         jo["CustomFields"] = JObject.Parse((string)jo["CustomFields"]);
@@ -334,12 +335,17 @@ namespace AyaNova.Biz
             return ReportData;
         }
 
+        //populate viz fields from provided object
+        private async Task PopulateVizFields(HeadOffice o)
+        {
+            if (o.ContractId != null)
+                o.ContractViz = await ct.Contract.AsNoTracking().Where(x => x.Id == o.ContractId).Select(x => x.Name).FirstOrDefaultAsync();
+        }
+
 
         ////////////////////////////////////////////////////////////////////////////////////////////////       
         // IMPORT EXPORT
         //
-
-
         public async Task<JArray> GetExportData(long[] idList)
         {
             //for now just re-use the report data code
diff --git a/server/AyaNova/models/HeadOffice.cs b/server/AyaNova/models/HeadOffice.cs
index fb0b6310..50d0daaf 100644
--- a/server/AyaNova/models/HeadOffice.cs
+++ b/server/AyaNova/models/HeadOffice.cs
@@ -29,12 +29,14 @@ namespace AyaNova.Models
         public string AccountNumber { get; set; }
         public bool UsesBanking { get; set; }
         public long? ContractId { get; set; }
+        [NotMapped]
+        public string ContractViz { get; set; }
         public DateTime? ContractExpires { get; set; }
-        public string Phone1 { get; set; }        
-        public string Phone2 { get; set; }       
-        public string Phone3 { get; set; }        
-        public string Phone4 { get; set; }        
-        public string Phone5 { get; set; }      
+        public string Phone1 { get; set; }
+        public string Phone2 { get; set; }
+        public string Phone3 { get; set; }
+        public string Phone4 { get; set; }
+        public string Phone5 { get; set; }
         public string EmailAddress { get; set; }
 
         //POSTAL ADDRESS