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

fix bug การแสดงข้อมูลสถานะ

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2024-01-10 10:08:34 +07:00
parent d45a61262a
commit 2f733cd2a6
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
BMA.EHR.Leave.Service/Controllers/LeaveController.cs
View file

@ -591,7 +591,8 @@ namespace BMA.EHR.Leave.Service.Controllers
CheckInDate = d.CheckIn.Date, CheckInDate = d.CheckIn.Date,
CheckInTime = d.CheckIn.ToString("HH:mm:ss"), CheckInTime = d.CheckIn.ToString("HH:mm:ss"),
CheckInLocation = d.CheckInPOI, CheckInLocation = d.CheckInPOI,
CheckInStatus = DateTime.Parse(d.CheckIn.ToString("yyyy-MM-dd HH:mm")) > CheckInStatus = d.CheckInStatus != null || d.CheckInStatus != "" ? d.CheckInStatus :
DateTime.Parse(d.CheckIn.ToString("yyyy-MM-dd HH:mm")) >
DateTime.Parse($"{d.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.StartTimeMorning}") ? DateTime.Parse($"{d.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.StartTimeMorning}") ?
"LATE" : "LATE" :
"NORMAL", "NORMAL",
@ -601,6 +602,7 @@ namespace BMA.EHR.Leave.Service.Controllers
CheckOutTime = d.CheckOut == null ? "" : d.CheckOut.Value.ToString("HH:mm:ss"), CheckOutTime = d.CheckOut == null ? "" : d.CheckOut.Value.ToString("HH:mm:ss"),
CheckOutLocation = d.CheckOutPOI ?? "", CheckOutLocation = d.CheckOutPOI ?? "",
CheckOutStatus = d.CheckOut == null ? null : CheckOutStatus = d.CheckOut == null ? null :
d.CheckOutStatus != null || d.CheckOutStatus != "" ? d.CheckOutStatus :
DateTime.Parse(d.CheckOut.Value.ToString("yyyy-MM-dd HH:mm")) < DateTime.Parse(d.CheckOut.Value.ToString("yyyy-MM-dd HH:mm")) <
DateTime.Parse($"{d.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}") ? DateTime.Parse($"{d.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}") ?
"LATE" : "LATE" :
@ -756,7 +758,8 @@ namespace BMA.EHR.Leave.Service.Controllers
CheckInLat = d.CheckInLat, CheckInLat = d.CheckInLat,
CheckInLon = d.CheckInLon, CheckInLon = d.CheckInLon,
CheckInImg = $"{imgUrl}/{d.CheckInImageUrl}", CheckInImg = $"{imgUrl}/{d.CheckInImageUrl}",
CheckInStatus = DateTime.Parse(d.CheckIn.ToString("yyyy-MM-dd HH:mm")) > CheckInStatus = d.CheckInStatus != null || d.CheckInStatus != "" ? d.CheckInStatus :
DateTime.Parse(d.CheckIn.ToString("yyyy-MM-dd HH:mm")) >
DateTime.Parse($"{d.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.StartTimeMorning}") ? DateTime.Parse($"{d.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.StartTimeMorning}") ?
"LATE" : "LATE" :
"NORMAL", "NORMAL",
@ -772,6 +775,7 @@ namespace BMA.EHR.Leave.Service.Controllers
CheckOutImg = d.CheckOut == null ? "" : $"{imgUrl}/{d.CheckOutImageUrl}", CheckOutImg = d.CheckOut == null ? "" : $"{imgUrl}/{d.CheckOutImageUrl}",
CheckOutStatus = d.CheckOut == null ? null : CheckOutStatus = d.CheckOut == null ? null :
d.CheckOutStatus != null || d.CheckOutStatus != "" ? d.CheckOutStatus :
DateTime.Parse(d.CheckOut.Value.ToString("yyyy-MM-dd HH:mm")) < DateTime.Parse(d.CheckOut.Value.ToString("yyyy-MM-dd HH:mm")) <
DateTime.Parse($"{d.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}") ? DateTime.Parse($"{d.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}") ?
"LATE" : "LATE" :
@ -1576,7 +1580,7 @@ namespace BMA.EHR.Leave.Service.Controllers
return Error(GlobalMessages.DataNotFound); return Error(GlobalMessages.DataNotFound);
data.CheckInStatus = req.CheckInStatus; data.CheckInStatus = req.CheckInStatus;
data.CheckInStatus = req.CheckOutStatus; data.CheckOutStatus = req.CheckOutStatus;
data.EditReason = req.Reason; data.EditReason = req.Reason;
await _processUserTimeStampRepository.UpdateAsync(data); await _processUserTimeStampRepository.UpdateAsync(data);