From bba2fcf2a9d8c06bc9d21034a4a6da4014d88bb9 Mon Sep 17 00:00:00 2001
From: Suphonchai Phoonsawat <suphonchai.ph@gmail.com>
Date: Fri, 30 Aug 2024 11:12:45 +0700
Subject: [PATCH] =?UTF-8?q?fix=20:=20Leave=20=3D=3D>=20WFH=20and=20Seminar?=
 =?UTF-8?q?=20Count=20=20=20=20=20=20=20=20Insignia=20=3D=3D>=20=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=99=E0=B9=88=E0=B8=A7=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99?=
 =?UTF-8?q?=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=A2=E0=B8=B1=E0=B8=87=E0=B9=84?=
 =?UTF-8?q?=E0=B8=A1=E0=B9=88=E0=B8=AA=E0=B9=88=E0=B8=87=E0=B8=A3=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/InsigniaRequestController.cs           |  2 +-
 BMA.EHR.Leave/Controllers/LeaveController.cs           |  4 ++++
 BMA.EHR.Leave/Controllers/LeaveReportController.cs     | 10 +++++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs b/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs
index 567c38c5..435462d3 100644
--- a/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs
+++ b/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs
@@ -971,7 +971,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
                 return Error(GlobalMessages.InsigniaRequestNotFound);
             var orgIdSend = await _context.InsigniaRequests
                         .Where(x => x.Period == insigniaPeriod)
-                        .Where(x => x.RequestStatus == "st1")
+                        .Where(x => x.RequestStatus == "st6")
                         .Select(x => x.OrganizationId)
                         .ToListAsync();
             
diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs
index 5461908d..55493a74 100644
--- a/BMA.EHR.Leave/Controllers/LeaveController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveController.cs
@@ -2038,6 +2038,8 @@ namespace BMA.EHR.Leave.Service.Controllers
 
         #endregion
 
+        #region " รายการลารายบุคคล "
+
         /// <summary>
         /// LV1_026 - รายการลารายบุคคล (ADMIN)
         /// </summary>
@@ -2103,5 +2105,7 @@ namespace BMA.EHR.Leave.Service.Controllers
 
         #endregion
 
+        #endregion
+
     }
 }
diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
index 064d1f4c..6b7e79f4 100644
--- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
@@ -1085,6 +1085,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 var wfhTotal = 0;
                 var studyTotal = 0;
                 var workTotal = 0;
+                var seminarTotal = 0;
 
 
                 foreach (var dd in dateList)
@@ -1204,7 +1205,13 @@ namespace BMA.EHR.Leave.Service.Controllers
                         {
                             workTotal += 1;
                             if (!timeStamps.IsLocationCheckIn)
-                                wfhTotal += 1;
+                            {
+                                if(timeStamps.CheckInLocationName!.Contains("ปฏิบัติงานที่บ้าน"))
+                                    wfhTotal += 1;
+                                else if (timeStamps.CheckInLocationName!.Contains("ประชุม"))
+                                    seminarTotal += 1;
+                            }
+                                
 
                         }
 
@@ -1260,6 +1267,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     sickTotal = sickTotal,
                     lateTotal = lateTotal,
                     wfhTotal = wfhTotal,
+                    seminarTotal = seminarTotal,
                     studyTotal = studyTotal,
                     employees = employees
                 };