diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs index 464d1def..86217023 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -2945,8 +2945,10 @@ namespace AyaNova.Biz private async Task ScheduledUserPopulateVizFields(WorkOrderItemScheduledUser o) { await Task.CompletedTask; - // if (o.WorkOrderOverseerId != null) - // o.WorkOrderOverseerViz = await ct.User.AsNoTracking().Where(x => x.Id == o.WorkOrderOverseerId).Select(x => x.Name).FirstOrDefaultAsync(); + if (o.UserId != null) + o.UserViz = await ct.User.AsNoTracking().Where(x => x.Id == o.UserId).Select(x => x.Name).FirstOrDefaultAsync(); + if (o.ServiceRateId != null) + o.ServiceRateViz = await ct.ServiceRate.AsNoTracking().Where(x => x.Id == o.ServiceRateId).Select(x => x.Name).FirstOrDefaultAsync(); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/models/WorkOrderItemScheduledUser.cs b/server/AyaNova/models/WorkOrderItemScheduledUser.cs index 9efa58a4..ada07513 100644 --- a/server/AyaNova/models/WorkOrderItemScheduledUser.cs +++ b/server/AyaNova/models/WorkOrderItemScheduledUser.cs @@ -11,10 +11,14 @@ namespace AyaNova.Models public long Id { get; set; } public uint Concurrency { get; set; } public long? UserId { get; set; } + [NotMapped] + public string UserViz { get; set; } public decimal EstimatedQuantity { get; set; } public DateTime? StartDate { get; set; } public DateTime? StopDate { get; set; } public long? ServiceRateId { get; set; } + [NotMapped] + public string ServiceRateViz { get; set; } //UTILITY FIELDS [NotMapped]