From a1bd2ec4b8668c41efed040f078359d6b60431a9 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Thu, 18 Jan 2024 06:11:18 +0700 Subject: [PATCH] fix holiday count --- .../Repositories/MetaData/HolidayRepository.cs | 2 +- .../Controllers/LeaveRequestController.cs | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/BMA.EHR.Application/Repositories/MetaData/HolidayRepository.cs b/BMA.EHR.Application/Repositories/MetaData/HolidayRepository.cs index 5b6e0de9..a5ee06ca 100644 --- a/BMA.EHR.Application/Repositories/MetaData/HolidayRepository.cs +++ b/BMA.EHR.Application/Repositories/MetaData/HolidayRepository.cs @@ -40,7 +40,7 @@ namespace BMA.EHR.Application.Repositories.MetaData { var dates = new List(); - for (DateTime i = startDate; i < endDate; i = i.AddDays(1)) + for (DateTime i = startDate; i <= endDate; i = i.AddDays(1)) { dates.Add(i); } diff --git a/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs index 534880e1..d348973f 100644 --- a/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs @@ -679,9 +679,9 @@ namespace BMA.EHR.Leave.Service.Controllers var sumLeave = await _leaveRequestRepository.GetSumLeaveByTypeForUserAsync(userId, req.Type, req.StartLeaveDate.Year); - var sumWorkDay = await _holidayRepository.GetHolidayCountAsync(req.StartLeaveDate, req.EndLeaveDate, category); - var totalDay = req.StartLeaveDate.DiffDay(req.EndLeaveDate); - var sumWeekend = _holidayRepository.GetWeekEndCount(req.StartLeaveDate, req.EndLeaveDate, category); + var sumWorkDay = await _holidayRepository.GetHolidayCountAsync(req.StartLeaveDate.Date, req.EndLeaveDate.Date, category); + var totalDay = req.StartLeaveDate.DiffDay(req.EndLeaveDate.Date); + var sumWeekend = _holidayRepository.GetWeekEndCount(req.StartLeaveDate.Date, req.EndLeaveDate.Date, category); var isLeave = false; @@ -1564,6 +1564,16 @@ namespace BMA.EHR.Leave.Service.Controllers } + [HttpGet("holiday/test")] + public async Task> GetHolidayTestAsync() + { + var start = new DateTime(2024, 1, 1); + var end = new DateTime(2024, 1, 3); + var count = await _holidayRepository.GetHolidayCountAsync(start, end); + + return Success(new { holiday = count }); + } + #endregion } } \ No newline at end of file