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

fix again
Some checks failed
release-dev / release-dev (push) Failing after 11s
Details

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2025-06-17 14:19:52 +07:00
parent 9070378060
commit 360580535a
1 changed files with 27 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2329,18 +2329,20 @@ namespace BMA.EHR.Leave.Service.Controllers
var roundId = effectiveDate != null ? effectiveDate.DutyTimeId : Guid.Empty; var roundId = effectiveDate != null ? effectiveDate.DutyTimeId : Guid.Empty;
var userRound = await _dutyTimeRepository.GetByIdAsync(roundId); var userRound = await _dutyTimeRepository.GetByIdAsync(roundId);
//var checkInData = await _userTimeStampRepository.GetTimestampByDateAsync(data.KeycloakUserId, data.CheckDate); var checkInData = await _userTimeStampRepository.GetTimestampByDateAsync(data.KeycloakUserId, data.CheckDate);
var checkInData = await _processUserTimeStampRepository.GetTimestampByDateAsync(data.KeycloakUserId, data.CheckDate); //var checkInData = await _processUserTimeStampRepository.GetTimestampByDateAsync(data.KeycloakUserId, data.CheckDate);
var duty = userRound ?? getDefaultRound; var duty = userRound ?? getDefaultRound;
DateTime? resultCheckInDate, resultCheckOutDate; DateTime? resultCheckInDate, resultCheckOutDate, resultCheckInDateAndTime, resultCheckOutDateAndTime;
string resultCheckInTime, resultCheckOutTime; string resultCheckInTime, resultCheckOutTime;
string resultCheckInLocation = "", resultCheckOutLocation = "";
if (data.CheckInEdit) if (data.CheckInEdit)
{ {
resultCheckInDate = data.CheckDate.Date; resultCheckInDate = data.CheckDate.Date;
resultCheckInTime = duty.StartTimeMorning; resultCheckInTime = duty.StartTimeMorning;
resultCheckInLocation = data.POI ?? "";
} }
else else
{ {
@ -2352,6 +2354,7 @@ namespace BMA.EHR.Leave.Service.Controllers
{ {
resultCheckOutDate = data.CheckDate.Date; resultCheckOutDate = data.CheckDate.Date;
resultCheckOutTime = duty.EndTimeAfternoon; resultCheckOutTime = duty.EndTimeAfternoon;
resultCheckOutLocation = data.POI ?? "";
} }
else else
{ {
@ -2365,6 +2368,11 @@ namespace BMA.EHR.Leave.Service.Controllers
} }
resultCheckInDateAndTime = DateTime.Parse($"{resultCheckInDate.Value.Date.ToString("yyyy-MM-dd")} {resultCheckInTime}");
resultCheckOutDateAndTime = DateTime.Parse($"{resultCheckOutDate.Value.Date.ToString("yyyy-MM-dd")} {resultCheckOutTime}");
// create result object to return // create result object to return
var resObj = new GetAdditionalCheckRequestHistoryDto var resObj = new GetAdditionalCheckRequestHistoryDto
{ {
@ -2376,27 +2384,30 @@ namespace BMA.EHR.Leave.Service.Controllers
CheckInTime = resultCheckInTime, CheckInTime = resultCheckInTime,
CheckOutTime = resultCheckOutTime, CheckOutTime = resultCheckOutTime,
CheckInStatus = checkInData == null ? null : CheckInStatus = resultCheckInDateAndTime == null ? null :
DateTime.Parse(checkInData.CheckIn.ToString("yyyy-MM-dd HH:mm")) > DateTime.Parse(resultCheckInDateAndTime.Value.ToString("yyyy-MM-dd HH:mm")) >
DateTime.Parse($"{checkInData.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.StartTimeMorning}") ? DateTime.Parse($"{resultCheckInDate.Value.Date.ToString("yyyy-MM-dd")} {duty.StartTimeMorning}") ?
DateTime.Parse(checkInData.CheckIn.ToString("yyyy-MM-dd HH:mm")) > DateTime.Parse(resultCheckInDateAndTime.Value.ToString("yyyy-MM-dd HH:mm")) >
DateTime.Parse($"{checkInData.CheckIn.ToString("yyyy-MM-dd")} {duty.EndTimeMorning}") ? DateTime.Parse($"{resultCheckInDate.Value.ToString("yyyy-MM-dd")} {duty.EndTimeMorning}") ?
"ABSENT" : "ABSENT" :
"LATE" : "LATE" :
"NORMAL", "NORMAL",
CheckOutStatus = checkInData == null ? null : CheckOutStatus = resultCheckInDate == null ? null :
checkInData.CheckOut == null ? null : resultCheckOutDate == null ? null :
DateTime.Parse(checkInData.CheckOut.Value.ToString("yyyy-MM-dd HH:mm")) < DateTime.Parse(resultCheckOutDateAndTime.Value.ToString("yyyy-MM-dd HH:mm")) <
DateTime.Parse($"{checkInData.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}") ? DateTime.Parse($"{resultCheckInDate.Value.Date.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}") ?
"ABSENT" : "ABSENT" :
DateTime.Parse(checkInData.CheckOut.Value.ToString("yyyy-MM-dd HH:mm")) < DateTime.Parse(resultCheckOutDateAndTime.Value.ToString("yyyy-MM-dd HH:mm")) <
DateTime.Parse($"{checkInData.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.EndTimeMorning}") ? DateTime.Parse($"{resultCheckInDate.Value.Date.ToString("yyyy-MM-dd")} {duty.EndTimeMorning}") ?
"ABSENT" : "ABSENT" :
"NORMAL", "NORMAL",
CheckInLocation = checkInData == null ? "" : checkInData.CheckInPOI, //CheckInLocation = checkInData == null ? "" : checkInData.CheckInPOI,
CheckOutLocation = checkInData == null ? "" : checkInData.CheckOutPOI ?? "", //CheckOutLocation = checkInData == null ? "" : checkInData.CheckOutPOI ?? "",
CheckInLocation = resultCheckInLocation,
CheckOutLocation = resultCheckOutLocation,
EditReason = data.Comment ?? "", EditReason = data.Comment ?? "",
EditStatus = data.Status, EditStatus = data.Status,