From 6b453b8bdf02e168542cd37ab8ccd4f89cf89bd4 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Tue, 22 Apr 2025 10:51:58 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9A=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B6?= =?UTF-8?q?=E0=B8=81=E0=B9=81=E0=B8=A5=E0=B8=B0=E0=B9=81=E0=B8=81=E0=B9=89?= =?UTF-8?q?=E0=B9=84=E0=B8=82=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=80=E0=B8=9E?= =?UTF-8?q?=E0=B8=B4=E0=B9=88=E0=B8=A1=20LeaveRangeEnd=20=E0=B9=81?= =?UTF-8?q?=E0=B8=A5=E0=B8=B0=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=80=E0=B8=AD?= =?UTF-8?q?=E0=B8=B2=E0=B8=84=E0=B9=88=E0=B8=B2=E0=B8=A1=E0=B8=B2=E0=B9=81?= =?UTF-8?q?=E0=B8=AA=E0=B8=94=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BMA.EHR.Leave/Controllers/LeaveReportController.cs | 7 +++++++ BMA.EHR.Leave/Controllers/LeaveRequestController.cs | 7 ++++++- BMA.EHR.Leave/DTOs/LeaveRequest/CreateLeaveRequestDto.cs | 2 ++ BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestByIdDto.cs | 2 ++ .../DTOs/LeaveRequest/GetLeaveRequestForAdminByIdDto.cs | 3 +++ .../DTOs/LeaveRequest/GetLeaveRequestForAdminResultDto.cs | 2 ++ 6 files changed, 22 insertions(+), 1 deletion(-) diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs index 8b387472..0adcd9e5 100644 --- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs @@ -1258,6 +1258,13 @@ namespace BMA.EHR.Leave.Service.Controllers remarkStr += "ครึ่งวันเช้า"; else if (leaveRange == "AFTERNOON") remarkStr += "ครึ่งวันบ่าย"; + + + var leaveRangeEnd = leaveReq.LeaveRangeEnd == null ? "" : leaveReq.LeaveRangeEnd.ToUpper(); + if (leaveRangeEnd == "MORNING") + remarkStr += "ครึ่งวันเช้า"; + else if (leaveRangeEnd == "AFTERNOON") + remarkStr += "ครึ่งวันบ่าย"; break; default: remarkStr += leaveReq.Type.Name; diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs index 03cd8833..9472c635 100644 --- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs @@ -174,6 +174,7 @@ namespace BMA.EHR.Leave.Service.Controllers LeaveSubTypeName = req.LeaveSubTypeName, LeaveRange = req.LeaveRange, + LeaveRangeEnd = req.LeaveRangeEnd, LeaveStartDate = req.LeaveStartDate, LeaveEndDate = req.LeaveEndDate, LeaveWrote = req.LeaveWrote ?? "", @@ -493,6 +494,7 @@ namespace BMA.EHR.Leave.Service.Controllers // ลองใช้ oldData oldData.LeaveRange = req.LeaveRange; + oldData.LeaveRangeEnd = req.LeaveRangeEnd; oldData.LeaveStartDate = req.LeaveStartDate; oldData.LeaveEndDate = req.LeaveEndDate; oldData.LeaveWrote = req.LeaveWrote ?? ""; @@ -1328,7 +1330,8 @@ namespace BMA.EHR.Leave.Service.Controllers var result = new GetLeaveRequestByIdDto { Id = rawData.Id, - LeaveRange = rawData.LeaveRange ?? "", + LeaveRange = rawData.LeaveRange ?? "ALL", + LeaveRangeEnd = rawData.LeaveRangeEnd ?? "ALL", LeaveTypeName = rawData.Type.Name, LeaveSubTypeName = rawData.LeaveSubTypeName, LeaveTypeId = rawData.Type.Id, @@ -1493,6 +1496,7 @@ namespace BMA.EHR.Leave.Service.Controllers Agency = agency_name,//agency == null ? "" : agency.Name, Org = item.Root ?? "",//userOc == null ? "-" : userOc.Root, LeaveRange = item.LeaveRange ?? "ALL", + LeaveRangeEnd = item.LeaveRangeEnd ?? "ALL", HajjDayStatus = item.HajjDayStatus, }; @@ -1993,6 +1997,7 @@ namespace BMA.EHR.Leave.Service.Controllers LeaveNumber = rawData.LeaveNumber, LeaveDetail = rawData.LeaveDetail, LeaveRange = rawData.LeaveRange ?? "ALL", + LeaveRangeEnd = rawData.LeaveRangeEnd ?? "ALL", LeaveDocument = new(), //LeaveDocument = rawData.LeaveDocument == null ? "" : await _minIOService.ImagesPath(rawData.LeaveDocument.Id), LeaveDraftDocument = rawData.LeaveDraftDocument == null ? "" : await _minIOService.ImagesPath(rawData.LeaveDraftDocument.Id), diff --git a/BMA.EHR.Leave/DTOs/LeaveRequest/CreateLeaveRequestDto.cs b/BMA.EHR.Leave/DTOs/LeaveRequest/CreateLeaveRequestDto.cs index c431388d..62e9ab4f 100644 --- a/BMA.EHR.Leave/DTOs/LeaveRequest/CreateLeaveRequestDto.cs +++ b/BMA.EHR.Leave/DTOs/LeaveRequest/CreateLeaveRequestDto.cs @@ -21,6 +21,8 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest public string? LeaveRange { get; set; } = "ALL"; + public string? LeaveRangeEnd { get; set; } = "ALL"; + public double LeaveTotal { get; set; } = 0.0; public string? LeaveAddress { get; set; } diff --git a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestByIdDto.cs b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestByIdDto.cs index 508c9173..449cecc3 100644 --- a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestByIdDto.cs +++ b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestByIdDto.cs @@ -27,6 +27,8 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest public string? LeaveRange { get; set; } = string.Empty; + public string? LeaveRangeEnd { get; set; } = string.Empty; + public string LeaveAddress { get; set; } = string.Empty; public string LeaveNumber { get; set; } = string.Empty; diff --git a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminByIdDto.cs b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminByIdDto.cs index 71c5d970..3693a941 100644 --- a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminByIdDto.cs +++ b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminByIdDto.cs @@ -135,6 +135,9 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest public double LeaveRemain { get; set; } = 0; public string LeaveRange { get; set; } = string.Empty; + + public string LeaveRangeEnd { get; set; } = string.Empty; + public string? ProfileType { get; set; } public string? CommanderPosition { get; set; } = string.Empty; diff --git a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminResultDto.cs b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminResultDto.cs index 19aa8b96..42a508ff 100644 --- a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminResultDto.cs +++ b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminResultDto.cs @@ -32,6 +32,8 @@ public string LeaveRange { get; set; } = string.Empty; + public string LeaveRangeEnd { get; set; } = string.Empty; + public bool? HajjDayStatus { get; set; } public string? ProfileType { get; set; }