If team meamber not found send empty
This commit is contained in:
parent
bc3e927777
commit
a405cfec13
@ -372,27 +372,26 @@ namespace MarcoBMS.Services.Controllers
|
|||||||
|
|
||||||
foreach (Attendance attende in lstAttendance)
|
foreach (Attendance attende in lstAttendance)
|
||||||
{
|
{
|
||||||
var result1 = new EmployeeAttendanceVM()
|
|
||||||
{
|
|
||||||
Id = attende.Id,
|
|
||||||
CheckInTime = attende.InTime,
|
|
||||||
CheckOutTime = attende.OutTime,
|
|
||||||
Activity = attende.Activity,
|
|
||||||
EmployeeAvatar = null,
|
|
||||||
EmployeeId = attende.EmployeeID,
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
var teamMember = projectteam.Find(m => m.EmployeeId == attende.EmployeeID);
|
var teamMember = projectteam.Find(m => m.EmployeeId == attende.EmployeeID);
|
||||||
if (teamMember != null && teamMember.Employee != null && teamMember.Employee.JobRole != null)
|
if (teamMember != null && teamMember.Employee != null && teamMember.Employee.JobRole != null)
|
||||||
{
|
{
|
||||||
result1.FirstName = teamMember.Employee.FirstName;
|
var result1 = new EmployeeAttendanceVM()
|
||||||
result1.LastName = teamMember.Employee.LastName;
|
{
|
||||||
result1.JobRoleName = teamMember.Employee.JobRole.Name;
|
Id = attende.Id,
|
||||||
result1.OrganizationName = teamMember.Employee.Organization?.Name;
|
CheckInTime = attende.InTime,
|
||||||
|
CheckOutTime = attende.OutTime,
|
||||||
|
Activity = attende.Activity,
|
||||||
|
EmployeeAvatar = null,
|
||||||
|
EmployeeId = attende.EmployeeID,
|
||||||
|
FirstName = teamMember.Employee.FirstName,
|
||||||
|
LastName = teamMember.Employee.LastName,
|
||||||
|
JobRoleName = teamMember.Employee.JobRole.Name,
|
||||||
|
OrganizationName = teamMember.Employee.Organization?.Name
|
||||||
|
};
|
||||||
|
result.Add(result1);
|
||||||
}
|
}
|
||||||
|
|
||||||
result.Add(result1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
result.Sort(delegate (EmployeeAttendanceVM x, EmployeeAttendanceVM y)
|
result.Sort(delegate (EmployeeAttendanceVM x, EmployeeAttendanceVM y)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user