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

fix defect 12/12/66 14:16

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-12-12 14:17:00 +07:00
parent d4ae5f8c53
commit 7fa4ba9750
10 changed files with 192 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -175,7 +175,7 @@ namespace BMA.EHR.Leave.Service.Controllers
EndTimeMorning = data.EndTimeMorning,
StartTimeAfternoon = data.StartTimeAfternoon,
EndTimeAfternoon = data.EndTimeAfternoon,
IsActive = true,
IsActive = data.IsActive,
IsDefault = true,
};
@ -244,7 +244,7 @@ namespace BMA.EHR.Leave.Service.Controllers
}
}
oldData.Description = data.Description;
oldData.Description = data.Description ?? "";
oldData.IsDefault = data.IsDefault;
oldData.IsActive = data.IsActive;
@ -1309,8 +1309,8 @@ namespace BMA.EHR.Leave.Service.Controllers
{
Id = data.Id,
CheckInTime = checkInData == null ? "00:00" : checkInData.CheckIn.ToString("HH:mm"),
CheckOutTime = checkInData == null ? "00:00" : checkInData.CheckOut == null ? "00:00" : checkInData.CheckOut.Value.ToString("HH:mm"),
CheckInTime = checkInData == null ? duty.StartTimeMorning : checkInData.CheckIn.ToString("HH:mm"),
CheckOutTime = checkInData == null ? duty.EndTimeAfternoon : checkInData.CheckOut == null ? "00:00" : checkInData.CheckOut.Value.ToString("HH:mm"),
CheckInStatus = checkInData == null ? null :
DateTime.Parse(checkInData.CheckIn.ToString("yyyy-MM-dd HH:mm")) >