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-09-14 20:16:51 +00:00
parent e1dda2601d
commit a98e6f763b
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server/AyaNova/Controllers/ScheduleController.cs
View File

@@ -56,15 +56,12 @@ namespace AyaNova.Api.Controllers
var UserId = UserIdFromContext.Id(HttpContext.Items); var UserId = UserIdFromContext.Id(HttpContext.Items);
var UType = UserTypeFromContext.Type(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 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) })
var wo = await ct.ViewSchedulePersonalWorkOrder.Where(x => x.SchedUserId == UserId) .ToListAsync());
.Select(x => new PersonalScheduleListItem() { Id = x.WoItemSchedUserId, Color = ColorFromWOItem(x, p), Start = x.StartDate, End = x.StopDate, Type = AyaType.WorkOrderItemScheduledUser, })
.ToListAsync();
} }
@@ -83,10 +80,15 @@ namespace AyaNova.Api.Controllers
case PersonalScheduleWorkOrderColorSource.WorkOrderItemPriority: case PersonalScheduleWorkOrderColorSource.WorkOrderItemPriority:
return v.WorkOrderItemPriorityColor; return v.WorkOrderItemPriorityColor;
} }
return string.Empty; return string.Empty;
} }
private string NameFromWOItem(ViewSchedulePersonalWorkOrder v, PersonalScheduleParams p)
{
// Name=[wonumber customername]
return v.Serial.ToString() + " " + v.CustomerName;
}
public enum PersonalScheduleWorkOrderColorSource : int public enum PersonalScheduleWorkOrderColorSource : int
{ {
@@ -102,6 +104,9 @@ namespace AyaNova.Api.Controllers
public DateTime Start { get; set; } public DateTime Start { get; set; }
public DateTime End { get; set; } public DateTime End { get; set; }
public PersonalScheduleWorkOrderColorSource ColorSource { 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 public class PersonalScheduleListItem