From 7b97cd09a347e4380aae017c11e0513b50fe137e Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Fri, 9 Jan 2026 20:24:50 +0700 Subject: [PATCH] update LeaveController to handle additional leave range options for check-in and check-out statuses --- BMA.EHR.Leave/Controllers/LeaveController.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs index ebce7bbe..9b1773ee 100644 --- a/BMA.EHR.Leave/Controllers/LeaveController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveController.cs @@ -882,7 +882,7 @@ namespace BMA.EHR.Leave.Service.Controllers if (leaveReq != null) { var leaveRange = leaveReq.LeaveRange == null ? "" : leaveReq.LeaveRange.ToUpper(); - if (leaveRange == "MORNING") + if (leaveRange == "MORNING" || leaveRange == "ALL") checkInStatus = "NORMAL"; else { @@ -987,8 +987,8 @@ namespace BMA.EHR.Leave.Service.Controllers var leaveReq = await _leaveRequestRepository.GetLeavePeriodAsync(userId, currentDate.Date); if (leaveReq != null) { - var leaveRange = leaveReq.LeaveRange == null ? "" : leaveReq.LeaveRange.ToUpper(); - if (leaveRange == "AFTERNOON") + var leaveRange = leaveReq.LeaveRangeEnd == null ? "" : leaveReq.LeaveRangeEnd.ToUpper(); + if (leaveRange == "AFTERNOON" || leaveRange == "ALL") checkOutStatus = "NORMAL"; else {