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

แก้ defect เรื่องการเรียงลำดับ

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-12-21 09:58:46 +07:00
parent e21d19ea23
commit ce476e0f6d
4 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -556,6 +556,8 @@ namespace BMA.EHR.Leave.Service.Controllers
DateTime.Parse($"{d.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.StartTimeMorning}") ?
"LATE" :
"NORMAL",
CheckInIsLocation = d.IsLocationCheckIn,
CheckInLocationName = d.CheckInLocationName,
CheckOutDate = d.CheckOut == null ? null : d.CheckOut.Value.Date,
CheckOutTime = d.CheckOut == null ? "" : d.CheckOut.Value.ToString("HH:mm:ss"),
CheckOutLocation = d.CheckOutPOI ?? "",
@ -568,6 +570,9 @@ namespace BMA.EHR.Leave.Service.Controllers
"ABSENT" :
"NORMAL",
CheckOutIsLocation = d.IsLocationCheckOut,
CheckOutLocationName = d.CheckOutLocationName,
IsEdit = _processUserTimeStampRepository.IsEditRequest(userId, d.CheckIn.Date)
//IsEdit = (d.EditStatus != null && d.EditStatus != "")

8
BMA.EHR.Leave.Service/DTOs/CheckIn/CheckInHistoryDto.cs
View file

@ -12,6 +12,10 @@
public string? CheckInStatus { get; set; } = string.Empty;
public bool CheckInIsLocation { get; set; } = false;
public string? CheckInLocationName { get; set; } = string.Empty;
public DateTime? CheckOutDate { get; set; } = DateTime.MinValue;
public string? CheckOutTime { get; set; } = "00:00";
@ -20,6 +24,10 @@
public string? CheckOutStatus { get; set; } = string.Empty;
public bool CheckOutIsLocation { get; set; } = false;
public string? CheckOutLocationName { get; set; } = string.Empty;
//public string EditStatus { get; set; } = string.Empty;
//public string EditReason { get; set; } = string.Empty;