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

Update LeaveController to set end times based on duty schedule for check-in/check-out #2228

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2026-01-23 20:27:22 +07:00
parent 4e4eec3d84
commit e1c7688913
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1015,13 +1015,18 @@ namespace BMA.EHR.Leave.Service.Controllers
};
var startTime = "";
var endTime = "";
if (!data.IsLocation && data.LocationName == "ไปประชุม / อบรม / สัมมนา")
{
//startTime = "09:30";
startTime = "10:30";
endTime = "12:00";
}
else
{
startTime = duty.StartTimeMorning;
endTime = duty.EndTimeMorning;
}
string checkInStatus = "NORMAL";
var leaveReq = await _leaveRequestRepository.GetLeavePeriodAsync(userId, currentDate.Date);
@ -1126,15 +1131,22 @@ namespace BMA.EHR.Leave.Service.Controllers
}
var endTime = "";
var startTime = "";
var endTimeMorning = "";
if (!data.IsLocation && data.LocationName == "ไปประชุม / อบรม / สัมมนา")
{
//startTime = "09:30";
startTime = "13:00";
endTime = "14:30";
endTimeMorning = "12:00";
}
else
{
endTime = duty.EndTimeAfternoon;
startTime = duty.StartTimeAfternoon;
endTimeMorning = duty.EndTimeMorning;
}
var endTimeMorning = duty.EndTimeMorning;
string checkOutStatus = "NORMAL";
var leaveReq = await _leaveRequestRepository.GetLeavePeriodAsync(userId, currentDate.Date);
@ -1161,7 +1173,7 @@ namespace BMA.EHR.Leave.Service.Controllers
"NORMAL" :
"ABSENT" :
DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm")) <
DateTime.Parse($"{currentDate.ToString("yyyy-MM-dd")} {duty.EndTimeMorning}") ?
DateTime.Parse($"{currentDate.ToString("yyyy-MM-dd")} {endTimeMorning}") ?
"ABSENT" :
"NORMAL";
}
@ -1178,7 +1190,7 @@ namespace BMA.EHR.Leave.Service.Controllers
"NORMAL" :
"ABSENT" :
DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm")) <
DateTime.Parse($"{currentDate.ToString("yyyy-MM-dd")} {duty.EndTimeMorning}") ?
DateTime.Parse($"{currentDate.ToString("yyyy-MM-dd")} {endTimeMorning}") ?
"ABSENT" :
"NORMAL";
}