admin/marco.pms.api
1
0
Fork 0
Code Issues Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Organization_Management #142

Merged
ashutosh.nehete merged 92 commits from Organization_Management into main 2025-09-30 09:05:14 +00:00
Conversation 0 Commits 92 Files Changed 126 +15 -16
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a405cfec13 - Show all commits

19
Marco.Pms.Services/Controllers/AttendanceController.cs
View File

@ -371,6 +371,9 @@ namespace MarcoBMS.Services.Controllers
var jobRole = await _context.JobRoles.ToListAsync(); var jobRole = await _context.JobRoles.ToListAsync();
foreach (Attendance attende in lstAttendance) foreach (Attendance attende in lstAttendance)
{
var teamMember = projectteam.Find(m => m.EmployeeId == attende.EmployeeID);
if (teamMember != null && teamMember.Employee != null && teamMember.Employee.JobRole != null)
{ {
var result1 = new EmployeeAttendanceVM() var result1 = new EmployeeAttendanceVM()
{ {
@ -380,19 +383,15 @@ namespace MarcoBMS.Services.Controllers
Activity = attende.Activity, Activity = attende.Activity,
EmployeeAvatar = null, EmployeeAvatar = null,
EmployeeId = attende.EmployeeID, EmployeeId = attende.EmployeeID,
FirstName = teamMember.Employee.FirstName,
LastName = teamMember.Employee.LastName,
JobRoleName = teamMember.Employee.JobRole.Name,
OrganizationName = teamMember.Employee.Organization?.Name
}; };
result.Add(result1);
var teamMember = projectteam.Find(m => m.EmployeeId == attende.EmployeeID);
if (teamMember != null && teamMember.Employee != null && teamMember.Employee.JobRole != null)
{
result1.FirstName = teamMember.Employee.FirstName;
result1.LastName = teamMember.Employee.LastName;
result1.JobRoleName = teamMember.Employee.JobRole.Name;
result1.OrganizationName = teamMember.Employee.Organization?.Name;
} }
result.Add(result1);
} }
result.Sort(delegate (EmployeeAttendanceVM x, EmployeeAttendanceVM y) result.Sort(delegate (EmployeeAttendanceVM x, EmployeeAttendanceVM y)