This commit is contained in:
@@ -76,7 +76,7 @@ namespace AyaNova.Api.Controllers
|
||||
}
|
||||
|
||||
//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
|
||||
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)
|
||||
{
|
||||
switch (p.ColorSource)
|
||||
switch (p.WisuColorSource)
|
||||
{
|
||||
case PersonalScheduleWorkOrderColorSource.WorkOrderStatus:
|
||||
return v.WorkOrderStatusColor;
|
||||
@@ -268,8 +268,8 @@ namespace AyaNova.Api.Controllers
|
||||
public ScheduleView View { get; set; }
|
||||
public DateTime Start { get; set; }
|
||||
public DateTime End { get; set; }
|
||||
public PersonalScheduleWorkOrderColorSource ColorSource { get; set; }
|
||||
public bool WorkOrders { get; set; }
|
||||
public PersonalScheduleWorkOrderColorSource WisuColorSource { get; set; }
|
||||
public bool Wisu { get; set; }
|
||||
public bool Reviews { 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
|
||||
|
||||
Reference in New Issue
Block a user