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

Browse Source
This commit is contained in:
John Cardinal
2021-05-08 14:23:05 +00:00
parent fbb4b845a3
commit f844716c67
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/AyaNova/biz/WorkOrderBiz.cs
View File

@@ -1414,14 +1414,16 @@ namespace AyaNova.Biz
return SearchParams; return SearchParams;
} }
//////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////
//VIZ POPULATE //VIZ POPULATE
// //
private async Task ExpensePopulateVizFields(WorkOrderItemExpense o) private async Task ExpensePopulateVizFields(WorkOrderItemExpense o)
{ {
await Task.CompletedTask; if (o.UserId != null)
// if (o.WorkOrderOverseerId != null) o.UserViz = await ct.User.AsNoTracking().Where(x => x.Id == o.UserId).Select(x => x.Name).FirstOrDefaultAsync();
// o.WorkOrderOverseerViz = await ct.User.AsNoTracking().Where(x => x.Id == o.WorkOrderOverseerId).Select(x => x.Name).FirstOrDefaultAsync(); if (o.ChargeTaxCodeId != null)
o.ChargeTaxCodeViz = await ct.TaxCode.AsNoTracking().Where(x => x.Id == o.ChargeTaxCodeId).Select(x => x.Name).FirstOrDefaultAsync();
} }
//////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////
@@ -2947,7 +2949,7 @@ namespace AyaNova.Biz
await Task.CompletedTask; await Task.CompletedTask;
if (o.UserId != null) if (o.UserId != null)
o.UserViz = await ct.User.AsNoTracking().Where(x => x.Id == o.UserId).Select(x => x.Name).FirstOrDefaultAsync(); o.UserViz = await ct.User.AsNoTracking().Where(x => x.Id == o.UserId).Select(x => x.Name).FirstOrDefaultAsync();
if (o.ServiceRateId != null) if (o.ServiceRateId != null)
o.ServiceRateViz = await ct.ServiceRate.AsNoTracking().Where(x => x.Id == o.ServiceRateId).Select(x => x.Name).FirstOrDefaultAsync(); o.ServiceRateViz = await ct.ServiceRate.AsNoTracking().Where(x => x.Id == o.ServiceRateId).Select(x => x.Name).FirstOrDefaultAsync();
} }

4
server/AyaNova/models/WorkOrderItemExpense.cs
View File

@@ -20,8 +20,12 @@ namespace AyaNova.Models
[Required] [Required]
public decimal TaxPaid { get; set; } public decimal TaxPaid { get; set; }
public long? ChargeTaxCodeId { get; set; } public long? ChargeTaxCodeId { get; set; }
[NotMapped]
public string ChargeTaxCodeViz { get; set; }
public bool ReimburseUser { get; set; } = false; public bool ReimburseUser { get; set; } = false;
public long? UserId { get; set; } public long? UserId { get; set; }
[NotMapped]
public string UserViz { get; set; }
public bool ChargeToCustomer { get; set; } = false; public bool ChargeToCustomer { get; set; } = false;