From fce3f62e8de7783742e2dbe62fb3d507acfe4b52 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Mon, 14 Jun 2021 19:57:29 +0000
Subject: [PATCH]

---
 .vscode/launch.json                       |  2 +-
 server/AyaNova/biz/WorkOrderBiz.cs        | 37 +++++++++++------------
 server/AyaNova/generator/CoreJobNotify.cs |  2 +-
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index fcc80a75..b77f3b95 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 d18894c5..a41d73b7 100644
--- a/server/AyaNova/biz/WorkOrderBiz.cs
+++ b/server/AyaNova/biz/WorkOrderBiz.cs
@@ -1454,27 +1454,24 @@ namespace AyaNova.Biz
                                 //so this will prevent that                               
                                 //Always clear any old ones for this object as they are all irrelevant the moment changed:
                                 await NotifyEventHelper.ClearPriorEventsForObject(ct, AyaType.WorkOrder, oProposed.WorkOrderId, NotifyEventType.WorkorderTotalExceedsThreshold);
-
-                                //Ok, we're here because there is a subscriber who is active and tags match so only check left is total against decvalue
-                                if (sub.DecValue < GrandTotal)
+                            }
+                            //Ok, we're here because there is a subscriber who is active and tags match so only check left is total against decvalue
+                            if (sub.DecValue < GrandTotal)
+                            {
+                                //notification is a go
+                                NotifyEvent n = new NotifyEvent()
                                 {
-                                    //notification is a go
-                                    NotifyEvent n = new NotifyEvent()
-                                    {
-                                        EventType = NotifyEventType.WorkorderTotalExceedsThreshold,
-                                        UserId = sub.UserId,
-                                        AyaType = AyaType.WorkOrder,
-                                        ObjectId = oProposed.WorkOrderId,
-                                        NotifySubscriptionId = sub.Id,
-                                        Name = $"{WorkorderInfo.Serial.ToString()}",
-                                        DecValue = GrandTotal
-                                    };
-                                    await ct.NotifyEvent.AddAsync(n);
-                                    log.LogDebug($"Adding NotifyEvent:  [{n.ToString()}]");
-                                    await ct.SaveChangesAsync();
-
-
-                                }
+                                    EventType = NotifyEventType.WorkorderTotalExceedsThreshold,
+                                    UserId = sub.UserId,
+                                    AyaType = AyaType.WorkOrder,
+                                    ObjectId = oProposed.WorkOrderId,
+                                    NotifySubscriptionId = sub.Id,
+                                    Name = $"{WorkorderInfo.Serial.ToString()}",
+                                    DecValue = GrandTotal
+                                };
+                                await ct.NotifyEvent.AddAsync(n);
+                                log.LogDebug($"Adding NotifyEvent:  [{n.ToString()}]");
+                                await ct.SaveChangesAsync();
                             }
                         }
                     }
diff --git a/server/AyaNova/generator/CoreJobNotify.cs b/server/AyaNova/generator/CoreJobNotify.cs
index c879aaaf..7203a10e 100644
--- a/server/AyaNova/generator/CoreJobNotify.cs
+++ b/server/AyaNova/generator/CoreJobNotify.cs
@@ -198,7 +198,7 @@ namespace AyaNova.Biz
                     //DecValue (only for TheAndy for now workorder exceedsthreshold so not putting a lot of localization effort in; in app will localize properly)
                     string DecDisplay= "";
                     if(ne.DecValue!=0)
-                        DecDisplay=ne.DecValue.ToString("N2", System.Globalization.CultureInfo.InvariantCulture);
+                        DecDisplay=$"({ne.DecValue.ToString("N2", System.Globalization.CultureInfo.InvariantCulture)})\n";
 
                     string subject = "";