From 4f28b4e9e07c7ecdaac89035bff49c7f9b9351ab Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Mon, 26 Jan 2026 22:58:37 +0700 Subject: [PATCH] Add LeaveTotal property to LeaveRequest DTOs for better leave tracking #2245 --- BMA.EHR.Leave/Controllers/LeaveRequestController.cs | 4 +++- .../DTOs/LeaveRequest/GetLeaveRequestCalendarResultDto.cs | 2 ++ .../DTOs/LeaveRequest/GetLeaveRequestForAdminResultDto.cs | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs index d8da2c15..fa8cbed3 100644 --- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs @@ -1326,7 +1326,8 @@ namespace BMA.EHR.Leave.Service.Controllers FullName = $"{d.Prefix}{d.FirstName} {d.LastName}", LeaveEndDate = d.LeaveEndDate, LeaveStartDate = d.LeaveStartDate, - KeycloakId = d.KeycloakUserId + KeycloakId = d.KeycloakUserId, + LeaveTotal = d.LeaveTotal }) .ToList(); @@ -1750,6 +1751,7 @@ namespace BMA.EHR.Leave.Service.Controllers LeaveRange = item.LeaveRange ?? "ALL", LeaveRangeEnd = item.LeaveRangeEnd ?? "ALL", HajjDayStatus = item.HajjDayStatus, + LeaveTotal = item.LeaveTotal }; result.Add(res); diff --git a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestCalendarResultDto.cs b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestCalendarResultDto.cs index ef895786..be03ec4c 100644 --- a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestCalendarResultDto.cs +++ b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestCalendarResultDto.cs @@ -19,5 +19,7 @@ public DateTime LeaveEndDate { get; set; } public Guid KeycloakId { get; set; } + + public double LeaveTotal { get; set; } } } diff --git a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminResultDto.cs b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminResultDto.cs index 42a508ff..d723bd66 100644 --- a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminResultDto.cs +++ b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminResultDto.cs @@ -37,5 +37,7 @@ public bool? HajjDayStatus { get; set; } public string? ProfileType { get; set; } + + public double LeaveTotal { get; set; } } }