diff --git a/Marco.Pms.Model/ViewModels/AttendanceVM/EmployeeAttendanceVM.cs b/Marco.Pms.Model/ViewModels/AttendanceVM/EmployeeAttendanceVM.cs index bd80ab6..5d2124c 100644 --- a/Marco.Pms.Model/ViewModels/AttendanceVM/EmployeeAttendanceVM.cs +++ b/Marco.Pms.Model/ViewModels/AttendanceVM/EmployeeAttendanceVM.cs @@ -7,6 +7,7 @@ namespace Marco.Pms.Model.ViewModels.AttendanceVM { public Guid Id { get; set; } public Guid EmployeeId { get; set; } + public Guid ProjectId { get; set; } public string? FirstName { get; set; } public string? LastName { get; set; } public string? EmployeeAvatar { get; set; } diff --git a/Marco.Pms.Services/Controllers/AttendanceController.cs b/Marco.Pms.Services/Controllers/AttendanceController.cs index 5b9bcbe..8065719 100644 --- a/Marco.Pms.Services/Controllers/AttendanceController.cs +++ b/Marco.Pms.Services/Controllers/AttendanceController.cs @@ -118,6 +118,7 @@ namespace MarcoBMS.Services.Controllers EmployeeId = employee.Id, FirstName = employee.FirstName, LastName = employee.LastName, + ProjectId = attendance.ProjectID, CheckInTime = attendance.InTime, CheckOutTime = attendance.OutTime, JobRoleName = employee.JobRole != null ? employee.JobRole.Name : "", @@ -216,6 +217,7 @@ namespace MarcoBMS.Services.Controllers FirstName = attendance.Employee?.FirstName, LastName = attendance.Employee?.LastName, JobRoleName = attendance.Employee?.JobRole?.Name, + ProjectId = attendance.ProjectID, ProjectName = projects.Where(p => p.Id == attendance.ProjectID).Select(p => p.Name).FirstOrDefault(), OrganizationName = attendance.Employee?.Organization?.Name, RequestedAt = attendance.RequestedAt, @@ -245,6 +247,7 @@ namespace MarcoBMS.Services.Controllers FirstName = attendance.Employee?.FirstName, LastName = attendance.Employee?.LastName, JobRoleName = attendance.Employee?.JobRole?.Name, + ProjectId = attendance.ProjectID, ProjectName = projects.Where(p => p.Id == attendance.ProjectID).Select(p => p.Name).FirstOrDefault(), OrganizationName = attendance.Employee?.Organization?.Name, CheckInTime = attendance.InTime, @@ -364,6 +367,7 @@ namespace MarcoBMS.Services.Controllers Activity = attende.Activity, EmployeeAvatar = null, EmployeeId = attende.EmployeeId, + ProjectId = attende.ProjectID, FirstName = attende.Employee?.FirstName, ProjectName = projects.Where(p => p.Id == attende.ProjectID).Select(p => p.Name).FirstOrDefault(), LastName = attende.Employee?.LastName, @@ -540,6 +544,7 @@ namespace MarcoBMS.Services.Controllers CheckOutTime = attendance.OutTime, EmployeeAvatar = null, EmployeeId = recordAttendanceDot.EmployeeID, + ProjectId = attendance.ProjectID, FirstName = employee.FirstName, LastName = employee.LastName, Id = attendance.Id, @@ -753,6 +758,7 @@ namespace MarcoBMS.Services.Controllers { Id = attendance.Id, EmployeeId = employee.Id, + ProjectId = attendance.ProjectID, FirstName = employee.FirstName, LastName = employee.LastName, CheckInTime = attendance.InTime, @@ -858,6 +864,7 @@ namespace MarcoBMS.Services.Controllers if (attendance != null) { result1.Id = attendance.Id; + result1.ProjectId = attendance.ProjectID; result1.CheckInTime = attendance.InTime; result1.CheckOutTime = attendance.OutTime; result1.Activity = attendance.Activity; @@ -905,6 +912,7 @@ namespace MarcoBMS.Services.Controllers { Id = lstAttendance.Id, EmployeeAvatar = null, + ProjectId = lstAttendance.ProjectID, EmployeeId = employee.Id, FirstName = employee.FirstName, OrganizationName = employee.Organization.Name,