diff --git a/BMA.EHR.Application/Repositories/MetaData/HolidayRepository.cs b/BMA.EHR.Application/Repositories/MetaData/HolidayRepository.cs index a5ee06ca..751b0473 100644 --- a/BMA.EHR.Application/Repositories/MetaData/HolidayRepository.cs +++ b/BMA.EHR.Application/Repositories/MetaData/HolidayRepository.cs @@ -26,6 +26,17 @@ namespace BMA.EHR.Application.Repositories.MetaData #region " Methods " + public async Task> GetHolidayAsync(DateTime startDate, DateTime endDate, string category = "NORMAL") + { + var data = await _dbContext.Set().AsQueryable() + .Where(x => x.Category == category) + .Where(x => x.HolidayDate.Date >= startDate && x.HolidayDate.Date <= endDate) + .Select(x => x.HolidayDate.Date) + .ToListAsync(); + + return data; + } + public async Task GetHolidayCountAsync(DateTime startDate, DateTime endDate, string category = "NORMAL") { var data = await _dbContext.Set().AsQueryable() @@ -36,6 +47,21 @@ namespace BMA.EHR.Application.Repositories.MetaData return data; } + public List GetWeekEnd(DateTime startDate, DateTime endDate, string category = "NORMAL") + { + var dates = new List(); + + for (DateTime i = startDate; i <= endDate; i = i.AddDays(1)) + { + dates.Add(i); + } + + if (category == "NORMAL") + return dates.Where(d => d.DayOfWeek == DayOfWeek.Saturday || d.DayOfWeek == DayOfWeek.Sunday).ToList(); + else + return dates.Where(d => d.DayOfWeek == DayOfWeek.Sunday).ToList(); + } + public int GetWeekEndCount(DateTime startDate, DateTime endDate, string category = "NORMAL") { var dates = new List(); diff --git a/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs index 7f2dab00..1b1ec9b6 100644 --- a/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs @@ -13,8 +13,6 @@ using Swashbuckle.AspNetCore.Annotations; using System.Security.Claims; using BMA.EHR.Application.Repositories.Commands; using BMA.EHR.Application.Repositories.Leaves.TimeAttendants; -using Org.BouncyCastle.Ocsp; -using System.Runtime.CompilerServices; namespace BMA.EHR.Leave.Service.Controllers {