hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

Update LeaveController to adjust check-in/check-out times based on location for meetings
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m14s
Details

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2026-01-23 21:25:34 +07:00
parent ecf5ada7ed
commit c1d689ebfa
1 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

24
BMA.EHR.Leave/Controllers/LeaveController.cs
View file

@ -3637,7 +3637,8 @@ namespace BMA.EHR.Leave.Service.Controllers
if (data.CheckInStatus == "NORMAL" || data.CheckOutStatus == "NORMAL")
{
var profile = await _userProfileRepository.GetProfileByKeycloakIdNewAsync(id, AccessToken);
var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
var profile = await _userProfileRepository.GetProfileByKeycloakIdNewAsync(userId, AccessToken);
var defaultRound = await _dutyTimeRepository.GetDefaultAsync();
if (defaultRound == null)
{
@ -3650,13 +3651,30 @@ namespace BMA.EHR.Leave.Service.Controllers
var duty = userRound ?? defaultRound;
if (req.CheckInStatus == "NORMAL")
{
data.CheckIn = DateTime.Parse($"{data.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.StartTimeMorning}");
if(data.CheckInLocationName == "ไปประชุม / อบรม / สัมมนา")
{
data.CheckIn = DateTime.Parse($"{data.CheckIn.Date.ToString("yyyy-MM-dd")} 10:30");
}
else
{
data.CheckIn = DateTime.Parse($"{data.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.StartTimeMorning}");
}
}
if (req.CheckOutStatus == "NORMAL" )
{
var checkOutTime = data.CheckOut != null ? data.CheckOut.Value : data.CheckIn;
var oldCheckOutTime = data.CheckOut != null ? data.CheckOut.Value : DateTime.Now;
var roundCheckOutTime = DateTime.Parse($"{checkOutTime.Date.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}");
var roundCheckOutTime = DateTime.Now;
if(data.CheckOutLocationName == "ไปประชุม / อบรม / สัมมนา")
{
roundCheckOutTime = DateTime.Parse($"{checkOutTime.Date.ToString("yyyy-MM-dd")} 14:30");
}
else
{
roundCheckOutTime = DateTime.Parse($"{checkOutTime.Date.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}");
}
if (oldCheckOutTime < roundCheckOutTime)
{
data.CheckOut = roundCheckOutTime;