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:06:31 +00:00
parent 124f128e89
commit eb45e14e1c
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,7 @@ using Microsoft.EntityFrameworkCore;
using System.Linq; using System.Linq;
using System.Collections.Generic; using System.Collections.Generic;
using AyaNova.Util; using AyaNova.Util;
using System.ComponentModel.DataAnnotations;
namespace AyaNova.Api.Controllers namespace AyaNova.Api.Controllers
{ {
@@ -87,14 +88,14 @@ namespace AyaNova.Api.Controllers
//REMINDERS //REMINDERS
if (p.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 //REVIEWS
if (p.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)); return Ok(ApiOkResponse.Response(r));
} }
@@ -265,13 +266,21 @@ namespace AyaNova.Api.Controllers
public class PersonalScheduleParams public class PersonalScheduleParams
{ {
[Required]
public ScheduleView View { get; set; } public ScheduleView View { get; set; }
[Required]
public DateTime Start { get; set; } public DateTime Start { get; set; }
[Required]
public DateTime End { get; set; } public DateTime End { get; set; }
[Required]
public PersonalScheduleWorkOrderColorSource WisuColorSource { get; set; } public PersonalScheduleWorkOrderColorSource WisuColorSource { get; set; }
[Required]
public bool Wisu { get; set; } public bool Wisu { get; set; }
[Required]
public bool Reviews { get; set; } public bool Reviews { get; set; }
[Required]
public bool Reminders { get; set; } 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 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
} }