From c802ab718f2f2536a4e66d1cf71c15b76ba10da6 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Thu, 1 Aug 2024 13:41:35 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=84=E0=B9=88=E0=B8=B2=E0=B8=9B=E0=B8=B0=E0=B9=80=E0=B8=A0?=
 =?UTF-8?q?=E0=B8=97=E0=B8=A5=E0=B8=B2=E0=B8=AD=E0=B8=B8=E0=B8=9B=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=9A=E0=B8=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BMA.EHR.Leave/Controllers/LeaveRequestController.cs         | 6 ++++--
 .../DTOs/LeaveRequest/GetLeaveRequestForAdminResultDto.cs   | 2 ++
 .../DTOs/LeaveRequest/GetLeaveRequestTableResultDto.cs      | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

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;