บันทึกและแก้ไขการเพิ่ม LeaveRangeEnd และการเอาค่ามาแสดง

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;

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),

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; }

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;

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;

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; }