hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

Fix Leave Report

Browse source
This commit is contained in:
Bright 2024-09-03 15:27:05 +07:00
parent b3c752d2e6
commit 8097555951
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BMA.EHR.Application/Responses/Profiles/GetProfileByKeycloakIdDto.cs
View file

@ -35,6 +35,8 @@ namespace BMA.EHR.Application.Responses.Profiles
public string? PosNo { get; set; } public string? PosNo { get; set; }
public string? PositionLevel { get; set; }
public string? PosNoEmployee { get; set; } public string? PosNoEmployee { get; set; }
public string? Gender { get; set; } public string? Gender { get; set; }

13
BMA.EHR.Leave/Controllers/LeaveReportController.cs
View file

@ -745,7 +745,10 @@ namespace BMA.EHR.Leave.Service.Controllers
{ {
//var profile = await _userProfileRepository.SearchProfile(null, null, null); //var profile = await _userProfileRepository.SearchProfile(null, null, null);
var profile = await _userProfileRepository.GetProfileWithKeycloak(AccessToken); var profile = await _userProfileRepository.GetProfileWithKeycloak(AccessToken);
if (profile.Count > 0)
{
profile = profile.Where(p => p.IsLeave == false).ToList();
}
// get leave day // get leave day
var leaveDays = await _leaveRequestRepository.GetSumApproveLeaveByTypeAndRange(req.StartDate, req.EndDate); var leaveDays = await _leaveRequestRepository.GetSumApproveLeaveByTypeAndRange(req.StartDate, req.EndDate);
var leaveTypes = await _leaveTypeRepository.GetAllAsync(); var leaveTypes = await _leaveTypeRepository.GetAllAsync();
@ -836,8 +839,10 @@ namespace BMA.EHR.Leave.Service.Controllers
no = count, no = count,
fullName = $"{p.Prefix}{p.FirstName} {p.LastName}",// _userProfileRepository.GetUserFullName(p.Keycloak ?? Guid.Empty, AccessToken), fullName = $"{p.Prefix}{p.FirstName} {p.LastName}",// _userProfileRepository.GetUserFullName(p.Keycloak ?? Guid.Empty, AccessToken),
position = p.Position == null ? "" : p.Position, position = p.Position == null ? "" : p.Position,
positionLevel = p.PosLevel == null ? "" : p.PosLevel.PosLevelName, //positionLevel = p.PosLevel == null ? "" : p.PosLevel.PosLevelName,
posNo = p.ProfileSalary == null ? "" : p.ProfileSalary.PosNo, //posNo = p.ProfileSalary == null ? "" : p.ProfileSalary.PosNo,
positionLevel = p.PositionLevel == null ? "" : p.PositionLevel,
posNo = p.PosNo == null ? "" : p.PosNo,
reason = "", reason = "",
sickDayCount = sickDayCount, sickDayCount = sickDayCount,
@ -999,7 +1004,7 @@ namespace BMA.EHR.Leave.Service.Controllers
{ {
no = count, no = count,
fullName = $"{p.Prefix}{p.FirstName} {p.LastName}",// _userProfileRepository.GetUserFullName(p.Keycloak ?? Guid.Empty, AccessToken), fullName = $"{p.Prefix}{p.FirstName} {p.LastName}",// _userProfileRepository.GetUserFullName(p.Keycloak ?? Guid.Empty, AccessToken),
posNo = p.PosNoEmployee ?? "", posNo = p.PosNo ?? "",
reason = "", reason = "",
sickDay = sickDayCount, sickDay = sickDayCount,