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-03-01 22:36:42 +00:00
parent ae3d71894f
commit fc2713d5ef
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/AyaNova/biz/CustomerBiz.cs
View File

@@ -379,9 +379,9 @@ namespace AyaNova.Biz
private async Task PopulateVizFields(Customer o) private async Task PopulateVizFields(Customer o)
{ {
if (o.HeadOfficeId != null) if (o.HeadOfficeId != null)
o.HeadOfficeViz = await ct.HeadOffice.AsNoTracking().Select(x => x.Name).FirstOrDefaultAsync(); o.HeadOfficeViz = await ct.HeadOffice.AsNoTracking().Where(x=>x.Id==o.HeadOfficeId).Select(x => x.Name).FirstOrDefaultAsync();
if (o.ContractId != null) if (o.ContractId != null)
o.ContractViz = await ct.Contract.AsNoTracking().Select(x => x.Name).FirstOrDefaultAsync(); o.ContractViz = await ct.Contract.AsNoTracking().Where(x=>x.Id==o.ContractId).Select(x => x.Name).FirstOrDefaultAsync();
} }

13
server/AyaNova/biz/WidgetBiz.cs
View File

@@ -365,8 +365,14 @@ namespace AyaNova.Biz
var batchResults = await ct.Widget.AsNoTracking().Where(z => batch.Contains(z.Id)).ToArrayAsync(); var batchResults = await ct.Widget.AsNoTracking().Where(z => batch.Contains(z.Id)).ToArrayAsync();
//order the results back into original //order the results back into original
var orderedList = from id in batch join z in batchResults on id equals z.Id select z; var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
//cache frequent viz data
//usertypes
var UserTypesEnumList = await AyaNova.Api.Controllers.EnumListController.GetEnumList(typeof(UserType).ToString(), UserTranslationId);
foreach (Widget w in orderedList) foreach (Widget w in orderedList)
{ {
await PopulateVizFields(w, UserTypesEnumList);
var jo = JObject.FromObject(w); var jo = JObject.FromObject(w);
if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"])) if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
jo["CustomFields"] = JObject.Parse((string)jo["CustomFields"]); jo["CustomFields"] = JObject.Parse((string)jo["CustomFields"]);
@@ -376,6 +382,13 @@ namespace AyaNova.Biz
return ReportData; return ReportData;
} }
//populate viz fields from provided object
private async Task PopulateVizFields(Widget o, List<NameIdItem> userTypesEnumList)
{
if (o.UserId != null)
o.UserViz = await ct.User.AsNoTracking().Where(x => x.Id == o.UserId).Select(x => x.Name).FirstOrDefaultAsync();
o.UserTypeViz = userTypesEnumList.Where(x => x.Id == (long)o.UserType).Select(x => x.Name).First();
}

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

@@ -21,6 +21,8 @@ namespace AyaNova.Models
public decimal? DollarAmount { get; set; } public decimal? DollarAmount { get; set; }
public bool? Active { get; set; } public bool? Active { get; set; }
public UserType UserType { get; set; } public UserType UserType { get; set; }
[NotMapped]
public string UserTypeViz { get; set; }
public DateTime? StartDate { get; set; } public DateTime? StartDate { get; set; }
public DateTime? EndDate { get; set; } public DateTime? EndDate { get; set; }
public string Notes { get; set; } public string Notes { get; set; }
@@ -34,6 +36,8 @@ namespace AyaNova.Models
public User User { get; set; } public User User { get; set; }
public long? UserId { get; set; } public long? UserId { get; set; }
[NotMapped]
public string UserViz { get; set; }
public Widget() public Widget()
{ {