From ffd8974cb61feffbb50c0c4c762b86ff5017b7e1 Mon Sep 17 00:00:00 2001
From: Suphonchai Phoonsawat <suphonchai.ph@gmail.com>
Date: Mon, 22 Jan 2024 15:07:46 +0700
Subject: [PATCH 1/2] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=99=E0=B8=B1=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=88=E0=B8=B3=E0=B8=99=E0=B8=A7=E0=B8=99=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=A1=E0=B8=B2=E0=B8=9B=E0=B8=8E=E0=B8=B4=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BMA.EHR.Leave.Service/Controllers/LeaveReportController.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/BMA.EHR.Leave.Service/Controllers/LeaveReportController.cs b/BMA.EHR.Leave.Service/Controllers/LeaveReportController.cs
index 52deacd1..cead8b7c 100644
--- a/BMA.EHR.Leave.Service/Controllers/LeaveReportController.cs
+++ b/BMA.EHR.Leave.Service/Controllers/LeaveReportController.cs
@@ -1128,6 +1128,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 var lateTotal = 0;
                 var wfhTotal = 0;
                 var studyTotal = 0;
+                var workTotal = 0;
 
 
                 foreach (var dd in dateList)
@@ -1245,6 +1246,7 @@ namespace BMA.EHR.Leave.Service.Controllers
 
                         if (timeStamps != null)
                         {
+                            workTotal += 1;
                             if (timeStamps.IsLocationCheckIn)
                                 wfhTotal += 1;
                             else
@@ -1295,7 +1297,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 {
                     DateTimeStamp = dateStamp,
                     officerTotal = profile.Count,
-                    workTotal = (count - 1),
+                    workTotal = workTotal,
                     restTotal = restTotal,
                     sickTotal = sickTotal,
                     lateTotal = lateTotal,

From e86c9c5dc1fcff8ab4bca62bbef225df742f0f1e Mon Sep 17 00:00:00 2001
From: Suphonchai Phoonsawat <suphonchai.ph@gmail.com>
Date: Mon, 22 Jan 2024 16:15:35 +0700
Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E0=B8=99=E0=B8=B1=E0=B8=9A=E0=B8=88?=
 =?UTF-8?q?=E0=B8=B3=E0=B8=99=E0=B8=A7=E0=B8=99=E0=B8=84=E0=B8=99=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B2=E0=B9=83=E0=B8=99=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=87?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LeaveRequests/LeaveRequestRepository.cs   |  2 +-
 .../Controllers/LeaveReportController.cs      | 37 +++++++++----------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
index 938e0c1e..72d866ac 100644
--- a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
+++ b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
@@ -625,7 +625,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
                                 .Include(x => x.Type)
                                 .Where(x => x.KeycloakUserId == keycloakUserId)
                                 .Where(x => x.LeaveStatus == "APPROVE")
-                                .Where(x => x.LeaveStartDate.Date >= date.Date && x.LeaveEndDate <= date.Date)
+                                .Where(x => x.LeaveStartDate.Date <= date.Date && x.LeaveEndDate >= date.Date)
                                 .FirstOrDefaultAsync();
             return data;
         }
diff --git a/BMA.EHR.Leave.Service/Controllers/LeaveReportController.cs b/BMA.EHR.Leave.Service/Controllers/LeaveReportController.cs
index cead8b7c..38cbe071 100644
--- a/BMA.EHR.Leave.Service/Controllers/LeaveReportController.cs
+++ b/BMA.EHR.Leave.Service/Controllers/LeaveReportController.cs
@@ -1249,29 +1249,28 @@ namespace BMA.EHR.Leave.Service.Controllers
                             workTotal += 1;
                             if (timeStamps.IsLocationCheckIn)
                                 wfhTotal += 1;
-                            else
-                            {
-                                if (leaveReq != null)
-                                {
-                                    switch (leaveReq.Type.Code.ToUpper())
-                                    {
-                                        case "LV-001":
-                                        case "LV-002":
-                                            sickTotal += 1;
-                                            break;
-                                        case "LV-005":
-                                            restTotal += 1;
-                                            break;
-                                        case "LV-008":
-                                            studyTotal += 1;
-                                            break;
-                                    }
 
-                                }
-                            }
                         }
 
 
+                        if (leaveReq != null)
+                        {
+                            switch (leaveReq.Type.Code.ToUpper())
+                            {
+                                case "LV-001":
+                                case "LV-002":
+                                    sickTotal += 1;
+                                    break;
+                                case "LV-005":
+                                    restTotal += 1;
+                                    break;
+                                case "LV-008":
+                                    studyTotal += 1;
+                                    break;
+                            }
+
+                        }
+
                         employees.Add(emp);
                         count++;