From db7a03e7196ffb595cc801118bc80b984ef42f67 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 21 Jul 2021 23:39:19 +0000 Subject: [PATCH] --- .vscode/launch.json | 2 +- server/AyaNova/biz/WorkOrderBiz.cs | 12 +++++++++++- server/AyaNova/models/WorkOrder.cs | 13 +++++++------ 3 files changed, 19 insertions(+), 8 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 942d9deb..56d632d7 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -1115,6 +1115,16 @@ namespace AyaNova.Biz } else o.ContractViz = "-"; + + if (o.FromQuoteId != null) + o.FromQuoteViz = await ct.Quote.AsNoTracking().Where(x => x.Id == o.FromQuoteId).Select(x => x.Serial.ToString()).FirstOrDefaultAsync(); + + if (o.FromPMId != null) + o.FromPMViz = await ct.PM.AsNoTracking().Where(x => x.Id == o.FromPMId).Select(x => x.Serial.ToString()).FirstOrDefaultAsync(); + + if (o.FromCSRId != null) + o.FromCSRViz = await ct.CustomerServiceRequest.AsNoTracking().Where(x => x.Id == o.FromCSRId).Select(x => x.Name).FirstOrDefaultAsync(); + } @@ -1583,7 +1593,7 @@ namespace AyaNova.Biz wo.LastStatusId = newObject.WorkOrderStatusId; await ct.SaveChangesAsync(); - + await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, newObject.Id, AyaType.WorkOrderStatus, AyaEvent.Created), ct); await StateHandlePotentialNotificationEvent(AyaEvent.Created, newObject); return newObject; diff --git a/server/AyaNova/models/WorkOrder.cs b/server/AyaNova/models/WorkOrder.cs index 57d0bd7e..a59ff7be 100644 --- a/server/AyaNova/models/WorkOrder.cs +++ b/server/AyaNova/models/WorkOrder.cs @@ -90,12 +90,13 @@ namespace AyaNova.Models 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] - // public bool HasPartCosts { get; set; } = false;//signal to client that part costs were not populated (due to user rights / role / type) - // [NotMapped] - // public bool HasTravelAndLaborRateCosts { get; set; } = false; - // [NotMapped] - // public bool HasLoanItemCosts { get; set; } = false; + [NotMapped] + public string FromQuoteViz { get; set; } + [NotMapped] + public string FromPMViz { get; set; } + [NotMapped] + public string FromCSRViz { get; set; } + [NotMapped] public bool IsCompleteRecord { get; set; } = true;//indicates if some items were removed due to user role / type restrictions (i.e. woitems they are not scheduled on)