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

fix issue : ระบบลาและลงเวลา>>รายการลงเวลาปฏิบัติงาน (สอบถาม) #1074
Some checks failed
release-dev / release-dev (push) Failing after 12s
Details

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2025-01-27 14:18:22 +07:00
parent 7d88493a54
commit 8b7bfb5ea0
4 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

22
BMA.EHR.Leave/Controllers/LeaveController.cs
View file

@ -1234,6 +1234,7 @@ namespace BMA.EHR.Leave.Service.Controllers
Id = d.Id, Id = d.Id,
//FullName = _userProfileRepository.GetUserFullName(d.KeycloakUserId, AccessToken), //FullName = _userProfileRepository.GetUserFullName(d.KeycloakUserId, AccessToken),
FullName = $"{d.Prefix ?? ""}{d.FirstName ?? ""} {d.LastName ?? ""}", FullName = $"{d.Prefix ?? ""}{d.FirstName ?? ""} {d.LastName ?? ""}",
ProfileType = d.ProfileType ?? "",
CheckInDate = d.CheckIn.Date, CheckInDate = d.CheckIn.Date,
CheckInTime = d.CheckIn.ToString("HH:mm:ss"), CheckInTime = d.CheckIn.ToString("HH:mm:ss"),
@ -1331,6 +1332,8 @@ namespace BMA.EHR.Leave.Service.Controllers
Id = d.Id, Id = d.Id,
FullName = $"{d.Prefix}{d.FirstName} {d.LastName}", FullName = $"{d.Prefix}{d.FirstName} {d.LastName}",
ProfileType = (d.ProfileType != "" || d.ProfileType != null) ? d.ProfileType : (profile.ProfileType ?? ""),
//FullName = $"{profile.Prefix}{profile.FirstName} {profile.LastName}", // _userProfileRepository.GetUserFullName(d.KeycloakUserId, AccessToken), //FullName = $"{profile.Prefix}{profile.FirstName} {profile.LastName}", // _userProfileRepository.GetUserFullName(d.KeycloakUserId, AccessToken),
CheckInDate = d.CheckIn.Date, CheckInDate = d.CheckIn.Date,
@ -1458,6 +1461,8 @@ namespace BMA.EHR.Leave.Service.Controllers
{ {
Id = d.Id, Id = d.Id,
FullName = $"{d.Prefix ?? ""}{d.FirstName ?? ""} {d.LastName ?? ""}", FullName = $"{d.Prefix ?? ""}{d.FirstName ?? ""} {d.LastName ?? ""}",
ProfileType = d.ProfileType ?? "",
CheckInDate = d.CheckIn.Date, CheckInDate = d.CheckIn.Date,
CheckInTime = d.CheckIn.ToString("HH:mm"), CheckInTime = d.CheckIn.ToString("HH:mm"),
CheckInLocation = d.CheckInPOI, CheckInLocation = d.CheckInPOI,
@ -1941,6 +1946,23 @@ namespace BMA.EHR.Leave.Service.Controllers
FirstName = profile.FirstName, FirstName = profile.FirstName,
LastName = profile.LastName, LastName = profile.LastName,
// Add ข้อมูลจาก profile
CitizenId = profile.CitizenId,
ProfileType = profile.ProfileType,
Root = profile.Root,
RootId = profile.RootId,
Child1 = profile.Child1,
Child1Id = profile.Child1Id,
Child2 = profile.Child2,
Child2Id = profile.Child2Id,
Child3 = profile.Child3,
Child3Id = profile.Child3Id,
Child4 = profile.Child4,
Child4Id = profile.Child4Id,
Gender = profile.Gender,
ProfileId = profile.Id,
}; };
processTimeStamp.EditStatus = "APPROVE"; processTimeStamp.EditStatus = "APPROVE";

2
BMA.EHR.Leave/DTOs/CheckIn/CheckInDetailForAdminDto.cs
View file

@ -45,5 +45,7 @@
public bool IsLocationCheckOut { get; set; } = true; public bool IsLocationCheckOut { get; set; } = true;
public string? CheckOutLocationName { get; set; } = string.Empty; public string? CheckOutLocationName { get; set; } = string.Empty;
public string ProfileType { get; set; } = string.Empty;
} }
} }

2
BMA.EHR.Leave/DTOs/CheckIn/CheckInHistoryForAdminDto.cs
View file

@ -37,5 +37,7 @@
public bool IsLocationCheckOut { get; set; } = true; public bool IsLocationCheckOut { get; set; } = true;
public string? CheckOutLocationName { get; set; } = string.Empty; public string? CheckOutLocationName { get; set; } = string.Empty;
public string ProfileType { get; set; } = string.Empty;
} }
} }

2
BMA.EHR.Leave/DTOs/CheckIn/CheckInProcessHistoryForAdminDto.cs
View file

@ -37,5 +37,7 @@
public bool CheckOutIsLocation { get; set; } = false; public bool CheckOutIsLocation { get; set; } = false;
public string? CheckOutLocationName { get; set; } = string.Empty; public string? CheckOutLocationName { get; set; } = string.Empty;
public string ProfileType { get; set; } = string.Empty;
} }
} }