diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs index 60bb4c15..2a52e45b 100644 --- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs @@ -921,7 +921,8 @@ namespace BMA.EHR.Leave.Service.Controllers IsDelete = item.LeaveStatus == "DELETE", Status = item.LeaveStatus, LeaveStartDate = item.LeaveStartDate, - LeaveEndDate = item.LeaveEndDate + LeaveEndDate = item.LeaveEndDate, + HajjDayStatus = item.HajjDayStatus, }; result.Add(res); } @@ -1120,7 +1121,8 @@ namespace BMA.EHR.Leave.Service.Controllers Level = item.PositionLevelName ?? "-", Agency = "-", //agency == null ? "" : agency.Name, Org = "-", //gov_agency == null ? "" : gov_agency.Name, - LeaveRange = item.LeaveRange ?? "ALL" + LeaveRange = item.LeaveRange ?? "ALL", + HajjDayStatus = item.HajjDayStatus, }; result.Add(res); } diff --git a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminResultDto.cs b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminResultDto.cs index 9be737a5..97ce6b64 100644 --- a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminResultDto.cs +++ b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminResultDto.cs @@ -29,5 +29,7 @@ public string Level { get; set; } = string.Empty; public string LeaveRange { get; set; } = string.Empty; + + public bool? HajjDayStatus { get; set; } } } diff --git a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestTableResultDto.cs b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestTableResultDto.cs index 3c6ed905..9ba93ec2 100644 --- a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestTableResultDto.cs +++ b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestTableResultDto.cs @@ -15,6 +15,7 @@ public string Status { get; set; } public bool IsDelete { get; set; } + public bool? HajjDayStatus { get; set; } public DateTime LeaveStartDate { get; set; } = DateTime.Now;