admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-06-14 19:57:29 +00:00
parent b5135c0a1a
commit fce3f62e8d
3 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/launch.json vendored
View File

@@ -53,7 +53,7 @@
"AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
"AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
"AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", "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_SEEDLEVEL": "small",
"AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
"AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\" "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\"

37
server/AyaNova/biz/WorkOrderBiz.cs
View File

@@ -1454,27 +1454,24 @@ namespace AyaNova.Biz
//so this will prevent that //so this will prevent that
//Always clear any old ones for this object as they are all irrelevant the moment changed: //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); 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 //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) if (sub.DecValue < GrandTotal)
{
//notification is a go
NotifyEvent n = new NotifyEvent()
{ {
//notification is a go EventType = NotifyEventType.WorkorderTotalExceedsThreshold,
NotifyEvent n = new NotifyEvent() UserId = sub.UserId,
{ AyaType = AyaType.WorkOrder,
EventType = NotifyEventType.WorkorderTotalExceedsThreshold, ObjectId = oProposed.WorkOrderId,
UserId = sub.UserId, NotifySubscriptionId = sub.Id,
AyaType = AyaType.WorkOrder, Name = $"{WorkorderInfo.Serial.ToString()}",
ObjectId = oProposed.WorkOrderId, DecValue = GrandTotal
NotifySubscriptionId = sub.Id, };
Name = $"{WorkorderInfo.Serial.ToString()}", await ct.NotifyEvent.AddAsync(n);
DecValue = GrandTotal log.LogDebug($"Adding NotifyEvent: [{n.ToString()}]");
}; await ct.SaveChangesAsync();
await ct.NotifyEvent.AddAsync(n);
log.LogDebug($"Adding NotifyEvent: [{n.ToString()}]");
await ct.SaveChangesAsync();
}
} }
} }
} }

2
server/AyaNova/generator/CoreJobNotify.cs
View File

@@ -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) //DecValue (only for TheAndy for now workorder exceedsthreshold so not putting a lot of localization effort in; in app will localize properly)
string DecDisplay= ""; string DecDisplay= "";
if(ne.DecValue!=0) 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 = ""; string subject = "";