Send "role name" property in project/log api
This commit is contained in:
parent
6d6a2b6015
commit
b059a733bb
@ -164,6 +164,7 @@ namespace MarcoBMS.Services.Controllers
|
|||||||
|
|
||||||
|
|
||||||
List<ProjectAllocation> projectteam = await _projectsHelper.GetTeamByProject(TenantId, projectId, true);
|
List<ProjectAllocation> projectteam = await _projectsHelper.GetTeamByProject(TenantId, projectId, true);
|
||||||
|
var jobRole = await _context.JobRoles.ToListAsync();
|
||||||
foreach (Attendance? attendance in lstAttendance)
|
foreach (Attendance? attendance in lstAttendance)
|
||||||
{
|
{
|
||||||
var result1 = new EmployeeAttendanceVM()
|
var result1 = new EmployeeAttendanceVM()
|
||||||
@ -178,8 +179,18 @@ namespace MarcoBMS.Services.Controllers
|
|||||||
{
|
{
|
||||||
result1.EmployeeAvatar = null;
|
result1.EmployeeAvatar = null;
|
||||||
result1.EmployeeId = teamMember.EmployeeId;
|
result1.EmployeeId = teamMember.EmployeeId;
|
||||||
result1.FirstName = teamMember.Employee != null ? teamMember.Employee.FirstName : null;
|
if (teamMember.Employee != null)
|
||||||
result1.LastName = teamMember.Employee != null ? teamMember.Employee.LastName : null;
|
{
|
||||||
|
result1.FirstName = teamMember.Employee.FirstName;
|
||||||
|
result1.LastName = teamMember.Employee.LastName;
|
||||||
|
result1.JobRoleName = teamMember.Employee.JobRole != null ? teamMember.Employee.JobRole.Name : null;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
result1.FirstName = null;
|
||||||
|
result1.LastName = null;
|
||||||
|
result1.JobRoleName = null;
|
||||||
|
}
|
||||||
|
|
||||||
result.Add(result1);
|
result.Add(result1);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user