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

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

@@ -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)

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

@@ -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)

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

@@ -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; }

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

@@ -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; }