From 1f9891eb0deac639cd7d60730169c222e122dc60 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Thu, 29 Apr 2021 23:59:52 +0000
Subject: [PATCH]

---
 .vscode/launch.json                |  2 +-
 server/AyaNova/biz/WorkOrderBiz.cs | 19 ++++++++++---------
 server/AyaNova/models/WorkOrder.cs |  2 ++
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 8fd97968..0e2049e9 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -53,7 +53,7 @@
         "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
         "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
         "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",
-        "AYANOVA_SERVER_TEST_MODE": "true",
+        "AYANOVA_SERVER_TEST_MODE": "false",
         "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
         "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
         "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\"
diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs
index 57099d6c..1c739515 100644
--- a/server/AyaNova/biz/WorkOrderBiz.cs
+++ b/server/AyaNova/biz/WorkOrderBiz.cs
@@ -153,7 +153,7 @@ namespace AyaNova.Biz
             var ret =
             await ct.WorkOrder.AsNoTracking()
             .Include(s => s.States)
-            .Include(w => w.Items.OrderBy(item=>item.Sequence))
+            .Include(w => w.Items.OrderBy(item => item.Sequence))
                 .ThenInclude(wi => wi.Expenses)
             .Include(w => w.Items)
                 .ThenInclude(wi => wi.Labors)
@@ -514,8 +514,8 @@ namespace AyaNova.Biz
                 foreach (WorkOrder w in orderedList)
                 {
                     //populate entire workorder graph
-                   //await WorkOrderPopulateVizFields(w);
-                   //this is done by the initial fetch now
+                    //await WorkOrderPopulateVizFields(w);
+                    //this is done by the initial fetch now
 
 
                     var jo = JObject.FromObject(w);
@@ -554,8 +554,9 @@ namespace AyaNova.Biz
                 await StatePopulateVizFields(v);
             foreach (var v in o.Items)
                 await ItemPopulateVizFields(v);
-            // if (o.WorkOrderOverseerId != null)
-            //     o.WorkOrderOverseerViz = await ct.User.AsNoTracking().Where(x => x.Id == o.WorkOrderOverseerId).Select(x => x.Name).FirstOrDefaultAsync();
+
+            //popup Alert notes
+            o.AlertViz = await ct.Customer.AsNoTracking().Where(x => x.Id == o.CustomerId).Select(x => x.PopUpNotes).FirstOrDefaultAsync();
         }
 
 
@@ -1145,10 +1146,10 @@ namespace AyaNova.Biz
             // {
             //     ;
             // }
-            // if (proposedObj.Notes != null && proposedObj.Notes.Contains("generalerror"))
-            // {
-            //     AddError(ApiErrorCode.API_SERVER_ERROR, "generalerror", "Test general error");
-            // }
+            if (proposedObj.Notes != null && proposedObj.Notes.Contains("generalerror"))
+            {
+                AddError(ApiErrorCode.API_SERVER_ERROR, "generalerror", "Test general error");
+            }
             // if (proposedObj.Notes != null && proposedObj.Notes.Contains("aytesterror"))
             // {
             //     AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "Notes", "SAVE TEST ERROR");
diff --git a/server/AyaNova/models/WorkOrder.cs b/server/AyaNova/models/WorkOrder.cs
index 58d11fe5..619deb95 100644
--- a/server/AyaNova/models/WorkOrder.cs
+++ b/server/AyaNova/models/WorkOrder.cs
@@ -73,6 +73,8 @@ namespace AyaNova.Models
         public bool IsDirty { get; set; } = false;//never dirty coming from the server
         [NotMapped]
         public bool IsLockedAtServer { get; set; } = false;//signal to client that it came from the server in a locked state
+        [NotMapped]
+        public string AlertViz { get; set; } = null;
 
 
         [NotMapped, JsonIgnore]