From 62aa25793b36828c84f02d8586a6838f27022e04 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 2 Dec 2025 12:19:39 +0700 Subject: [PATCH 1/3] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?= =?UTF-8?q?=E0=B8=82=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=84=E0=B8=A7=E0=B8=B2?= =?UTF-8?q?=E0=B8=A1=E0=B9=83=E0=B8=AB=E0=B9=89=E0=B8=95=E0=B8=A3=E0=B8=87?= =?UTF-8?q?=E0=B8=81=E0=B8=B1=E0=B8=9A=E0=B8=9D=E0=B8=B1=E0=B9=88=E0=B8=87?= =?UTF-8?q?=20ui=20(=E0=B8=97=E0=B8=B2=E0=B8=87=20=E0=B8=81=E0=B8=97?= =?UTF-8?q?=E0=B8=A1.=20=E0=B9=81=E0=B8=88=E0=B9=89=E0=B8=87=E0=B9=83?= =?UTF-8?q?=E0=B8=AB=E0=B9=89=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?= =?UTF-8?q?=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=84=E0=B8=A7=E0=B8=B2=E0=B8=A1?= =?UTF-8?q?=E0=B8=84=E0=B9=88=E0=B8=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BMA.EHR.Leave/Controllers/LeaveController.cs | 2 +- BMA.EHR.Leave/Controllers/LeaveReportController.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs index 89d3b401..c7250708 100644 --- a/BMA.EHR.Leave/Controllers/LeaveController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveController.cs @@ -870,7 +870,7 @@ namespace BMA.EHR.Leave.Service.Controllers }; var startTime = ""; - if (!data.IsLocation && data.LocationName == "ไปประชุม/อบรม/สัมมนา/ปฏิบัติงานที่บ้านนอกสถานที่") + if (!data.IsLocation && data.LocationName == "ไปประชุม / อบรม / สัมมนา") { startTime = "09:30"; } diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs index 9a32e247..9a2ba64c 100644 --- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs @@ -2066,7 +2066,7 @@ namespace BMA.EHR.Leave.Service.Controllers { if (timeStamps.CheckInLocationName == "ปฏิบัติงานที่บ้าน") wfhTotal += 1; - else if (timeStamps.CheckInLocationName == "ไปประชุม/อบรม/สัมมนา/ปฏิบัติงานที่บ้านนอกสถานที่") + else if (timeStamps.CheckInLocationName == "ไปประชุม / อบรม / สัมมนา") seminarTotal += 1; } } From e9d48d1930c83d34fa6db9b604122754cce23bd1 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 2 Dec 2025 12:25:39 +0700 Subject: [PATCH 2/3] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?= =?UTF-8?q?=E0=B8=82=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=84=E0=B8=A7=E0=B8=B2?= =?UTF-8?q?=E0=B8=A1=E0=B9=83=E0=B8=AB=E0=B9=89=E0=B8=95=E0=B8=A3=E0=B8=87?= =?UTF-8?q?=E0=B8=81=E0=B8=B1=E0=B8=9A=E0=B8=9D=E0=B8=B1=E0=B9=88=E0=B8=87?= =?UTF-8?q?=20ui=20(=E0=B8=97=E0=B8=B2=E0=B8=87=20=E0=B8=81=E0=B8=97?= =?UTF-8?q?=E0=B8=A1.=20=E0=B9=81=E0=B8=88=E0=B9=89=E0=B8=87=E0=B9=83?= =?UTF-8?q?=E0=B8=AB=E0=B9=89=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?= =?UTF-8?q?=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=84=E0=B8=A7=E0=B8=B2=E0=B8=A1?= =?UTF-8?q?=E0=B8=84=E0=B9=88=E0=B8=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BMA.EHR.Leave/Controllers/LeaveReportController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs index 9a2ba64c..42fd6c59 100644 --- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs @@ -1753,7 +1753,7 @@ namespace BMA.EHR.Leave.Service.Controllers { if (timeStamps.CheckInLocationName == "ปฏิบัติงานที่บ้าน") wfhTotal += 1; - else if (timeStamps.CheckInLocationName == "ไปประชุม/อบรม/สัมมนา/ปฏิบัติงานที่บ้านนอกสถานที่") + else if (timeStamps.CheckInLocationName == "ไปประชุม / อบรม / สัมมนา") seminarTotal += 1; } } From db7626ce69862f7e00c49d098afcc7bce938984a Mon Sep 17 00:00:00 2001 From: harid Date: Wed, 3 Dec 2025 17:21:34 +0700 Subject: [PATCH 3/3] fix role --- BMA.EHR.Leave/Controllers/LeaveController.cs | 4 ++-- BMA.EHR.Leave/Controllers/LeaveReportController.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs index c7250708..207f0556 100644 --- a/BMA.EHR.Leave/Controllers/LeaveController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveController.cs @@ -1834,7 +1834,7 @@ namespace BMA.EHR.Leave.Service.Controllers ? profileAdmin?.RootDnaId : ""; } - else if (role == "ROOT") + else if (role == "ROOT" || role == "PARENT") { nodeId = profileAdmin?.RootDnaId; } @@ -2077,7 +2077,7 @@ namespace BMA.EHR.Leave.Service.Controllers ? profileAdmin?.RootDnaId : ""; } - else if (role == "ROOT") + else if (role == "ROOT" || role == "PARENT") { nodeId = profileAdmin?.RootDnaId; } diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs index 42fd6c59..3b71a529 100644 --- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs @@ -1836,7 +1836,7 @@ namespace BMA.EHR.Leave.Service.Controllers { try { - var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_LEAVE_REPORT"); + var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_WORK_REPORT"); var jsonData = JsonConvert.DeserializeObject(getPermission); if (jsonData["status"]?.ToString() != "200") { @@ -2252,7 +2252,7 @@ namespace BMA.EHR.Leave.Service.Controllers { try { - var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_LEAVE_REPORT"); + var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_WORK_REPORT"); var jsonData = JsonConvert.DeserializeObject(getPermission); if (jsonData["status"]?.ToString() != "200") {