From 8f278b608df969f8392c3f501fdfe766485746fe Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Tue, 23 Jan 2024 12:39:35 +0700 Subject: [PATCH] Add LeaveRange to Result --- BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs | 3 ++- .../DTOs/LeaveRequest/GetLeaveRequestForAdminResultDto.cs | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs index 30cbdc8a..b5d5e855 100644 --- a/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs @@ -1072,7 +1072,8 @@ namespace BMA.EHR.Leave.Service.Controllers Position = profile.Position == null ? "" : profile.Position.Name, Level = profile.PositionLevel == null ? "" : profile.PositionLevel.Name, Agency = agency == null ? "" : agency.Name, - Org = gov_agency == null ? "" : gov_agency.Name + Org = gov_agency == null ? "" : gov_agency.Name, + LeaveRange = item.LeaveRange ?? "ALL" }; result.Add(res); } diff --git a/BMA.EHR.Leave.Service/DTOs/LeaveRequest/GetLeaveRequestForAdminResultDto.cs b/BMA.EHR.Leave.Service/DTOs/LeaveRequest/GetLeaveRequestForAdminResultDto.cs index b097c0ed..9be737a5 100644 --- a/BMA.EHR.Leave.Service/DTOs/LeaveRequest/GetLeaveRequestForAdminResultDto.cs +++ b/BMA.EHR.Leave.Service/DTOs/LeaveRequest/GetLeaveRequestForAdminResultDto.cs @@ -27,5 +27,7 @@ public string Position { get; set; } = string.Empty; public string Level { get; set; } = string.Empty; + + public string LeaveRange { get; set; } = string.Empty; } }