From 54b90e1472e01ce29668990f6061e102015fb08c Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Mon, 8 Jul 2024 21:48:32 +0700 Subject: [PATCH] fix Leave Report --- BMA.EHR.Leave.Service/Controllers/LeaveController.cs | 2 +- .../Controllers/LeaveRequestController.cs | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/BMA.EHR.Leave.Service/Controllers/LeaveController.cs b/BMA.EHR.Leave.Service/Controllers/LeaveController.cs index 543b1fbf..62c53709 100644 --- a/BMA.EHR.Leave.Service/Controllers/LeaveController.cs +++ b/BMA.EHR.Leave.Service/Controllers/LeaveController.cs @@ -773,7 +773,7 @@ namespace BMA.EHR.Leave.Service.Controllers var result = new CheckInDetailForAdminDto { Id = d.Id, - FullName = _userProfileRepository.GetUserFullName(d.KeycloakUserId, AccessToken), + FullName = $"{profile.Prefix}{profile.FirstName} {profile.LastName}", // _userProfileRepository.GetUserFullName(d.KeycloakUserId, AccessToken), CheckInDate = d.CheckIn.Date, CheckInTime = d.CheckIn.ToString("HH:mm"), diff --git a/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs index 1589fed4..7602ff70 100644 --- a/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs @@ -1,21 +1,20 @@ using BMA.EHR.Application.Repositories; +using BMA.EHR.Application.Repositories.Commands; using BMA.EHR.Application.Repositories.Leaves.LeaveRequests; +using BMA.EHR.Application.Repositories.Leaves.TimeAttendants; using BMA.EHR.Application.Repositories.MetaData; using BMA.EHR.Domain.Common; using BMA.EHR.Domain.Extensions; +using BMA.EHR.Domain.Models.Leave.Commons; using BMA.EHR.Domain.Models.Leave.Requests; using BMA.EHR.Domain.Shared; using BMA.EHR.Infrastructure.Persistence; using BMA.EHR.Leave.Service.DTOs.LeaveRequest; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; using Swashbuckle.AspNetCore.Annotations; using System.Security.Claims; -using BMA.EHR.Application.Repositories.Commands; -using BMA.EHR.Application.Repositories.Leaves.TimeAttendants; -using BMA.EHR.Domain.Models.Leave.Commons; -using Microsoft.EntityFrameworkCore; -using BMA.EHR.Application.Responses.Profiles; namespace BMA.EHR.Leave.Service.Controllers {