From 3dfe9fbbe2097e2754e55d67d1a2fc12514bee0f Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 8 Sep 2021 18:49:06 +0000 Subject: [PATCH] --- .vscode/launch.json | 2 +- server/AyaNova/biz/CustomerServiceRequestBiz.cs | 8 ++------ server/AyaNova/models/CustomerServiceRequest.cs | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 976f60e9..f92c39ec 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -52,7 +52,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/CustomerServiceRequestBiz.cs b/server/AyaNova/biz/CustomerServiceRequestBiz.cs index 09b0fc79..75705051 100644 --- a/server/AyaNova/biz/CustomerServiceRequestBiz.cs +++ b/server/AyaNova/biz/CustomerServiceRequestBiz.cs @@ -322,12 +322,8 @@ namespace AyaNova.Biz if (o.UnitId != null) o.UnitViz = await ct.Unit.AsNoTracking().Where(x => x.Id == o.UnitId).Select(x => x.Serial).FirstOrDefaultAsync(); o.CustomerViz = await ct.Customer.AsNoTracking().Where(x => x.Id == o.CustomerId).Select(x => x.Name).FirstOrDefaultAsync(); - - //MIGRATE_OUTSTANDING routine to get wo id from the WorkOrderItemId - o.WorkOrderItemViz = "MIGRATE_OUTSTANDING woitem display value"; - // if (o.WorkOrderItemId != null) - // o.WorkOrderItemViz = await ct.WorkOrderItem.AsNoTracking().Where(x=>x.Id==o.WorkOrderItemId).Select(x => x.Name).FirstOrDefaultAsync(); - + if (o.WorkOrderItemId != null) + o.WorkOrderSerialViz = (await WorkOrderBiz.GetWorkOrderSerialFromRelativeAsync(AyaType.WorkOrderItem, (long)o.WorkOrderItemId, ct)).ToString(); o.RequestedByUserViz = await ct.User.AsNoTracking().Where(x => x.Id == o.RequestedByUserId).Select(x => x.Name).FirstOrDefaultAsync(); o.StatusViz = customerServiceRequestStatusEnumList.Where(x => x.Id == (long)o.Status).Select(x => x.Name).First(); o.PriorityViz = customerServiceRequestPriorityEnumList.Where(x => x.Id == (long)o.Priority).Select(x => x.Name).First(); diff --git a/server/AyaNova/models/CustomerServiceRequest.cs b/server/AyaNova/models/CustomerServiceRequest.cs index 19a0e9f9..257b3f01 100644 --- a/server/AyaNova/models/CustomerServiceRequest.cs +++ b/server/AyaNova/models/CustomerServiceRequest.cs @@ -33,7 +33,7 @@ namespace AyaNova.Models public string UnitViz { get; set; } public long? WorkOrderItemId { get; set; } [NotMapped] - public string WorkOrderItemViz { get; set; } + public string WorkOrderSerialViz { get; set; } [Required] public long RequestedByUserId { get; set; } [NotMapped]