From 30071e02ae78a23b1cad21e731c6a3288fd6ac0c Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 5 Nov 2021 17:03:03 +0000 Subject: [PATCH] case 4016 --- .vscode/launch.json | 2 +- server/AyaNova/biz/PMBiz.cs | 14 ++++++++++++-- server/AyaNova/biz/QuoteBiz.cs | 14 ++++++++++++-- server/AyaNova/models/PMItem.cs | 11 ++++++++++- server/AyaNova/models/QuoteItem.cs | 11 ++++++++++- 5 files changed, 45 insertions(+), 7 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 924c5283..dde42e99 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -55,7 +55,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_14\\bin\\" diff --git a/server/AyaNova/biz/PMBiz.cs b/server/AyaNova/biz/PMBiz.cs index e6179279..44bf1334 100644 --- a/server/AyaNova/biz/PMBiz.cs +++ b/server/AyaNova/biz/PMBiz.cs @@ -1345,9 +1345,19 @@ namespace AyaNova.Biz // private async Task ItemPopulateVizFields(PMItem o, bool populateForReporting) { - // if (o.PMOverseerId != null) - // o.PMOverseerViz = await ct.User.AsNoTracking().Where(x => x.Id == o.PMOverseerId).Select(x => x.Name).FirstOrDefaultAsync(); + if (o.WorkOrderItemStatusId != null) + { + var StatusInfo = await ct.WorkOrderItemStatus.AsNoTracking().FirstOrDefaultAsync(x => x.Id == o.WorkOrderItemStatusId); + o.WorkOrderItemStatusNameViz = StatusInfo.Name; + o.WorkOrderItemStatusColorViz = StatusInfo.Color; + } + if (o.WorkOrderItemPriorityId != null) + { + var PriorityInfo = await ct.WorkOrderItemPriority.AsNoTracking().FirstOrDefaultAsync(x => x.Id == o.WorkOrderItemPriorityId); + o.WorkOrderItemPriorityNameViz = PriorityInfo.Name; + o.WorkOrderItemPriorityColorViz = PriorityInfo.Color; + } foreach (var v in o.Expenses) await ExpensePopulateVizFields(v); foreach (var v in o.Labors) diff --git a/server/AyaNova/biz/QuoteBiz.cs b/server/AyaNova/biz/QuoteBiz.cs index 504a0812..0fc81307 100644 --- a/server/AyaNova/biz/QuoteBiz.cs +++ b/server/AyaNova/biz/QuoteBiz.cs @@ -1548,9 +1548,19 @@ namespace AyaNova.Biz // private async Task ItemPopulateVizFields(QuoteItem o, bool populateForReporting) { - // if (o.QuoteOverseerId != null) - // o.QuoteOverseerViz = await ct.User.AsNoTracking().Where(x => x.Id == o.QuoteOverseerId).Select(x => x.Name).FirstOrDefaultAsync(); + if (o.WorkOrderItemStatusId != null) + { + var StatusInfo = await ct.WorkOrderItemStatus.AsNoTracking().FirstOrDefaultAsync(x => x.Id == o.WorkOrderItemStatusId); + o.WorkOrderItemStatusNameViz = StatusInfo.Name; + o.WorkOrderItemStatusColorViz = StatusInfo.Color; + } + if (o.WorkOrderItemPriorityId != null) + { + var PriorityInfo = await ct.WorkOrderItemPriority.AsNoTracking().FirstOrDefaultAsync(x => x.Id == o.WorkOrderItemPriorityId); + o.WorkOrderItemPriorityNameViz = PriorityInfo.Name; + o.WorkOrderItemPriorityColorViz = PriorityInfo.Color; + } foreach (var v in o.Expenses) await ExpensePopulateVizFields(v); foreach (var v in o.Labors) diff --git a/server/AyaNova/models/PMItem.cs b/server/AyaNova/models/PMItem.cs index 97a8464f..308aa117 100644 --- a/server/AyaNova/models/PMItem.cs +++ b/server/AyaNova/models/PMItem.cs @@ -26,7 +26,16 @@ namespace AyaNova.Models public long PMId { get; set; } public string TechNotes { get; set; } public long? WorkOrderItemStatusId { get; set; } + [NotMapped] + public string WorkOrderItemStatusNameViz { get; set; } + [NotMapped] + public string WorkOrderItemStatusColorViz { get; set; } public long? WorkOrderItemPriorityId { get; set; } + [NotMapped] + public string WorkOrderItemPriorityNameViz { get; set; } + [NotMapped] + public string WorkOrderItemPriorityColorViz { get; set; } + public DateTime? RequestDate { get; set; } public bool WarrantyService { get; set; } = false; public int Sequence { get; set; } @@ -34,7 +43,7 @@ namespace AyaNova.Models //workaround for notification [NotMapped, JsonIgnore] public string Name { get; set; } - + //Principle [JsonIgnore] public PM PM { get; set; } diff --git a/server/AyaNova/models/QuoteItem.cs b/server/AyaNova/models/QuoteItem.cs index 578843a8..3107618f 100644 --- a/server/AyaNova/models/QuoteItem.cs +++ b/server/AyaNova/models/QuoteItem.cs @@ -26,7 +26,16 @@ namespace AyaNova.Models public long QuoteId { get; set; } public string TechNotes { get; set; } public long? WorkOrderItemStatusId { get; set; } + [NotMapped] + public string WorkOrderItemStatusNameViz { get; set; } + [NotMapped] + public string WorkOrderItemStatusColorViz { get; set; } public long? WorkOrderItemPriorityId { get; set; } + [NotMapped] + public string WorkOrderItemPriorityNameViz { get; set; } + [NotMapped] + public string WorkOrderItemPriorityColorViz { get; set; } + public DateTime? RequestDate { get; set; } public bool WarrantyService { get; set; } = false; public int Sequence { get; set; } @@ -34,7 +43,7 @@ namespace AyaNova.Models //workaround for notification [NotMapped, JsonIgnore] public string Name { get; set; } - + //Principle [JsonIgnore] public Quote Quote { get; set; }