From a98e6f763b5eb558cb5979c138e524fa97ed555b Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 14 Sep 2021 20:16:51 +0000 Subject: [PATCH] --- .../AyaNova/Controllers/ScheduleController.cs | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/server/AyaNova/Controllers/ScheduleController.cs b/server/AyaNova/Controllers/ScheduleController.cs index 9dd01e38..bbf83905 100644 --- a/server/AyaNova/Controllers/ScheduleController.cs +++ b/server/AyaNova/Controllers/ScheduleController.cs @@ -56,15 +56,12 @@ namespace AyaNova.Api.Controllers var UserId = UserIdFromContext.Id(HttpContext.Items); var UType = UserTypeFromContext.Type(HttpContext.Items); - if (UType == UserType.Service || UType == UserType.ServiceContractor) + //WORKORDERS + if (p.WorkOrders && (UType == UserType.Service || UType == UserType.ServiceContractor)) { - //trying ad-hoc join https://entityframeworkcore.com/querying-data-joining - - var wo = await ct.ViewSchedulePersonalWorkOrder.Where(x => x.SchedUserId == UserId) - .Select(x => new PersonalScheduleListItem() { Id = x.WoItemSchedUserId, Color = ColorFromWOItem(x, p), Start = x.StartDate, End = x.StopDate, Type = AyaType.WorkOrderItemScheduledUser, }) - .ToListAsync(); - - + r.AddRange(await ct.ViewSchedulePersonalWorkOrder.Where(x => x.SchedUserId == UserId) + .Select(x => new PersonalScheduleListItem() { Id = x.WoItemSchedUserId, Color = ColorFromWOItem(x, p), Start = x.StartDate, End = x.StopDate, Type = AyaType.WorkOrderItemScheduledUser, Name = NameFromWOItem(x, p) }) + .ToListAsync()); } @@ -83,10 +80,15 @@ namespace AyaNova.Api.Controllers case PersonalScheduleWorkOrderColorSource.WorkOrderItemPriority: return v.WorkOrderItemPriorityColor; } - return string.Empty; } + private string NameFromWOItem(ViewSchedulePersonalWorkOrder v, PersonalScheduleParams p) + { + // Name=[wonumber customername] + return v.Serial.ToString() + " " + v.CustomerName; + } + public enum PersonalScheduleWorkOrderColorSource : int { @@ -102,6 +104,9 @@ namespace AyaNova.Api.Controllers public DateTime Start { get; set; } public DateTime End { get; set; } public PersonalScheduleWorkOrderColorSource ColorSource { get; set; } + public bool WorkOrders { get; set; } + public bool Reviews { get; set; } + public bool Reminders { get; set; } } public class PersonalScheduleListItem