From b059a733bb0958247eed36c31fe141a10681d37f Mon Sep 17 00:00:00 2001 From: "ashutosh.nehete" Date: Tue, 6 May 2025 12:42:29 +0530 Subject: [PATCH] Send "role name" property in project/log api --- .../Controllers/AttendanceController.cs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Marco.Pms.Services/Controllers/AttendanceController.cs b/Marco.Pms.Services/Controllers/AttendanceController.cs index 9b4fed1..5ef92d0 100644 --- a/Marco.Pms.Services/Controllers/AttendanceController.cs +++ b/Marco.Pms.Services/Controllers/AttendanceController.cs @@ -164,6 +164,7 @@ namespace MarcoBMS.Services.Controllers List projectteam = await _projectsHelper.GetTeamByProject(TenantId, projectId, true); + var jobRole = await _context.JobRoles.ToListAsync(); foreach (Attendance? attendance in lstAttendance) { var result1 = new EmployeeAttendanceVM() @@ -178,8 +179,18 @@ namespace MarcoBMS.Services.Controllers { result1.EmployeeAvatar = null; result1.EmployeeId = teamMember.EmployeeId; - result1.FirstName = teamMember.Employee != null ? teamMember.Employee.FirstName : null; - result1.LastName = teamMember.Employee != null ? teamMember.Employee.LastName : null; + if (teamMember.Employee != 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); }