diff --git a/server/AyaNova/Controllers/ScheduleController.cs b/server/AyaNova/Controllers/ScheduleController.cs index 90623856..43c07fba 100644 --- a/server/AyaNova/Controllers/ScheduleController.cs +++ b/server/AyaNova/Controllers/ScheduleController.cs @@ -11,6 +11,7 @@ using Microsoft.EntityFrameworkCore; using System.Linq; using System.Collections.Generic; using AyaNova.Util; +using System.ComponentModel.DataAnnotations; namespace AyaNova.Api.Controllers { @@ -87,14 +88,14 @@ namespace AyaNova.Api.Controllers //REMINDERS if (p.Reminders) { - r.AddRange(await ct.Reminder.Where(x => x.UserId==UserId && ViewStart <= x.StopDate && x.StartDate <= ViewEnd).Select(x => MakeReminderSchedItem(x, p)).ToListAsync()); + r.AddRange(await ct.Reminder.Where(x => x.UserId == UserId && ViewStart <= x.StopDate && x.StartDate <= ViewEnd).Select(x => MakeReminderSchedItem(x, p)).ToListAsync()); } //REVIEWS if (p.Reviews) { - r.AddRange(await ct.Review.Where(x => x.UserId== UserId && ViewStart <= x.ReviewDate && x.ReviewDate <= ViewEnd).Select(x => MakeReviewSchedItem(x, p)).ToListAsync()); + r.AddRange(await ct.Review.Where(x => x.UserId == UserId && ViewStart <= x.ReviewDate && x.ReviewDate <= ViewEnd).Select(x => MakeReviewSchedItem(x, p)).ToListAsync()); } return Ok(ApiOkResponse.Response(r)); } @@ -265,13 +266,21 @@ namespace AyaNova.Api.Controllers public class PersonalScheduleParams { + [Required] public ScheduleView View { get; set; } + [Required] public DateTime Start { get; set; } + [Required] public DateTime End { get; set; } + [Required] public PersonalScheduleWorkOrderColorSource WisuColorSource { get; set; } + [Required] public bool Wisu { get; set; } + [Required] public bool Reviews { get; set; } + [Required] public bool Reminders { get; set; } + [Required] 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 }