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 d69e4bcf..0bcd305f 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -1006,10 +1006,14 @@ namespace AyaNova.Biz var custInfo = await ct.Customer.AsNoTracking().Where(x => x.Id == o.CustomerId).Select(x => new { AlertViz = x.PopUpNotes, x.TechNotes, CustomerViz = x.Name }).FirstOrDefaultAsync(); if (!string.IsNullOrWhiteSpace(custInfo.AlertViz)) { - o.AlertViz = $"{await Translate("Customer")}\n{custInfo.AlertViz}\n\n"; + o.AlertViz = $"{await Translate("Customer")} - {await Translate("AlertNotes")}\n{custInfo.AlertViz}\n\n"; } - - o.CustomerTechNotesViz = custInfo.TechNotes; + + if (!string.IsNullOrWhiteSpace(custInfo.TechNotes)) + { + o.CustomerTechNotesViz = $"{await Translate("CustomerTechNotes")}\n{custInfo.TechNotes}\n\n"; + } + o.CustomerViz = custInfo.CustomerViz; if (o.ProjectId != null) @@ -4117,7 +4121,7 @@ namespace AyaNova.Biz return;//this should never happen but this is insurance in case it does o.PartViz = part.PartNumber; - o.PartNameViz=part.Name; + o.PartNameViz = part.Name; o.UpcViz = part.UPC; TaxCode Tax = null; diff --git a/server/AyaNova/models/WorkOrder.cs b/server/AyaNova/models/WorkOrder.cs index ffd9ebfe..57f2a717 100644 --- a/server/AyaNova/models/WorkOrder.cs +++ b/server/AyaNova/models/WorkOrder.cs @@ -32,7 +32,7 @@ namespace AyaNova.Models public long CustomerId { get; set; } [NotMapped] public string CustomerViz { get; set; } - + [NotMapped] public string CustomerTechNotesViz { get; set; }