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-22 18:02:44 +00:00
parent feb43cad8c
commit 124f128e89
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,7 @@ namespace AyaNova.Api.Controllers
} }
//WORKORDERS //WORKORDERS
if (p.WorkOrders && (UType == UserType.Service || UType == UserType.ServiceContractor)) if (p.Wisu && (UType == UserType.Service || UType == UserType.ServiceContractor))
{ {
//Note: query for *overlapping* ranges, not *contained* entirely in view range //Note: query for *overlapping* ranges, not *contained* entirely in view range
r.AddRange(await ct.ViewSchedulePersonalWorkOrder.Where(x => x.SchedUserId == UserId && ViewStart <= x.StopDate && x.StartDate <= ViewEnd) r.AddRange(await ct.ViewSchedulePersonalWorkOrder.Where(x => x.SchedUserId == UserId && ViewStart <= x.StopDate && x.StartDate <= ViewEnd)
@@ -213,7 +213,7 @@ namespace AyaNova.Api.Controllers
private static string ColorFromWOItem(ViewSchedulePersonalWorkOrder v, PersonalScheduleParams p) private static string ColorFromWOItem(ViewSchedulePersonalWorkOrder v, PersonalScheduleParams p)
{ {
switch (p.ColorSource) switch (p.WisuColorSource)
{ {
case PersonalScheduleWorkOrderColorSource.WorkOrderStatus: case PersonalScheduleWorkOrderColorSource.WorkOrderStatus:
return v.WorkOrderStatusColor; return v.WorkOrderStatusColor;
@@ -268,8 +268,8 @@ namespace AyaNova.Api.Controllers
public ScheduleView View { get; set; } public ScheduleView View { get; set; }
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 WisuColorSource { get; set; }
public bool WorkOrders { get; set; } public bool Wisu { get; set; }
public bool Reviews { get; set; } public bool Reviews { get; set; }
public bool Reminders { get; set; } public bool Reminders { get; set; }
public bool Dark { get; set; }//indicate if Client is set to dark mode or not, used for colorless types to display as black or white public bool Dark { get; set; }//indicate if Client is set to dark mode or not, used for colorless types to display as black or white