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

case 4016

Browse Source
This commit is contained in:
John Cardinal
2021-11-05 17:03:03 +00:00
parent 3416f91031
commit 30071e02ae
5 changed files with 45 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/launch.json vendored
View File

@@ -55,7 +55,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_14\\bin\\" "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_14\\bin\\"

14
server/AyaNova/biz/PMBiz.cs
View File

@@ -1345,9 +1345,19 @@ namespace AyaNova.Biz
// //
private async Task ItemPopulateVizFields(PMItem o, bool populateForReporting) private async Task ItemPopulateVizFields(PMItem o, bool populateForReporting)
{ {
// if (o.PMOverseerId != null) if (o.WorkOrderItemStatusId != null)
// o.PMOverseerViz = await ct.User.AsNoTracking().Where(x => x.Id == o.PMOverseerId).Select(x => x.Name).FirstOrDefaultAsync(); {
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) foreach (var v in o.Expenses)
await ExpensePopulateVizFields(v); await ExpensePopulateVizFields(v);
foreach (var v in o.Labors) foreach (var v in o.Labors)

14
server/AyaNova/biz/QuoteBiz.cs
View File

@@ -1548,9 +1548,19 @@ namespace AyaNova.Biz
// //
private async Task ItemPopulateVizFields(QuoteItem o, bool populateForReporting) private async Task ItemPopulateVizFields(QuoteItem o, bool populateForReporting)
{ {
// if (o.QuoteOverseerId != null) if (o.WorkOrderItemStatusId != null)
// o.QuoteOverseerViz = await ct.User.AsNoTracking().Where(x => x.Id == o.QuoteOverseerId).Select(x => x.Name).FirstOrDefaultAsync(); {
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) foreach (var v in o.Expenses)
await ExpensePopulateVizFields(v); await ExpensePopulateVizFields(v);
foreach (var v in o.Labors) foreach (var v in o.Labors)

9
server/AyaNova/models/PMItem.cs
View File

@@ -26,7 +26,16 @@ namespace AyaNova.Models
public long PMId { get; set; } public long PMId { get; set; }
public string TechNotes { get; set; } public string TechNotes { get; set; }
public long? WorkOrderItemStatusId { get; set; } public long? WorkOrderItemStatusId { get; set; }
[NotMapped]
public string WorkOrderItemStatusNameViz { get; set; }
[NotMapped]
public string WorkOrderItemStatusColorViz { get; set; }
public long? WorkOrderItemPriorityId { 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 DateTime? RequestDate { get; set; }
public bool WarrantyService { get; set; } = false; public bool WarrantyService { get; set; } = false;
public int Sequence { get; set; } public int Sequence { get; set; }

9
server/AyaNova/models/QuoteItem.cs
View File

@@ -26,7 +26,16 @@ namespace AyaNova.Models
public long QuoteId { get; set; } public long QuoteId { get; set; }
public string TechNotes { get; set; } public string TechNotes { get; set; }
public long? WorkOrderItemStatusId { get; set; } public long? WorkOrderItemStatusId { get; set; }
[NotMapped]
public string WorkOrderItemStatusNameViz { get; set; }
[NotMapped]
public string WorkOrderItemStatusColorViz { get; set; }
public long? WorkOrderItemPriorityId { 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 DateTime? RequestDate { get; set; }
public bool WarrantyService { get; set; } = false; public bool WarrantyService { get; set; } = false;
public int Sequence { get; set; } public int Sequence { get; set; }