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

Added the project ID in attendance VM

Browse Source
This commit is contained in:
ashutosh.nehete 2025-10-09 11:28:06 +05:30
parent 4acc61f03a
commit ef597b2bb7
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Marco.Pms.Model/ViewModels/AttendanceVM/EmployeeAttendanceVM.cs
View File

@ -7,6 +7,7 @@ namespace Marco.Pms.Model.ViewModels.AttendanceVM
{ {
public Guid Id { get; set; } public Guid Id { get; set; }
public Guid EmployeeId { get; set; } public Guid EmployeeId { get; set; }
public Guid ProjectId { get; set; }
public string? FirstName { get; set; } public string? FirstName { get; set; }
public string? LastName { get; set; } public string? LastName { get; set; }
public string? EmployeeAvatar { get; set; } public string? EmployeeAvatar { get; set; }

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

@ -118,6 +118,7 @@ namespace MarcoBMS.Services.Controllers
EmployeeId = employee.Id, EmployeeId = employee.Id,
FirstName = employee.FirstName, FirstName = employee.FirstName,
LastName = employee.LastName, LastName = employee.LastName,
ProjectId = attendance.ProjectID,
CheckInTime = attendance.InTime, CheckInTime = attendance.InTime,
CheckOutTime = attendance.OutTime, CheckOutTime = attendance.OutTime,
JobRoleName = employee.JobRole != null ? employee.JobRole.Name : "", JobRoleName = employee.JobRole != null ? employee.JobRole.Name : "",
@ -216,6 +217,7 @@ namespace MarcoBMS.Services.Controllers
FirstName = attendance.Employee?.FirstName, FirstName = attendance.Employee?.FirstName,
LastName = attendance.Employee?.LastName, LastName = attendance.Employee?.LastName,
JobRoleName = attendance.Employee?.JobRole?.Name, JobRoleName = attendance.Employee?.JobRole?.Name,
ProjectId = attendance.ProjectID,
ProjectName = projects.Where(p => p.Id == attendance.ProjectID).Select(p => p.Name).FirstOrDefault(), ProjectName = projects.Where(p => p.Id == attendance.ProjectID).Select(p => p.Name).FirstOrDefault(),
OrganizationName = attendance.Employee?.Organization?.Name, OrganizationName = attendance.Employee?.Organization?.Name,
RequestedAt = attendance.RequestedAt, RequestedAt = attendance.RequestedAt,
@ -245,6 +247,7 @@ namespace MarcoBMS.Services.Controllers
FirstName = attendance.Employee?.FirstName, FirstName = attendance.Employee?.FirstName,
LastName = attendance.Employee?.LastName, LastName = attendance.Employee?.LastName,
JobRoleName = attendance.Employee?.JobRole?.Name, JobRoleName = attendance.Employee?.JobRole?.Name,
ProjectId = attendance.ProjectID,
ProjectName = projects.Where(p => p.Id == attendance.ProjectID).Select(p => p.Name).FirstOrDefault(), ProjectName = projects.Where(p => p.Id == attendance.ProjectID).Select(p => p.Name).FirstOrDefault(),
OrganizationName = attendance.Employee?.Organization?.Name, OrganizationName = attendance.Employee?.Organization?.Name,
CheckInTime = attendance.InTime, CheckInTime = attendance.InTime,
@ -364,6 +367,7 @@ namespace MarcoBMS.Services.Controllers
Activity = attende.Activity, Activity = attende.Activity,
EmployeeAvatar = null, EmployeeAvatar = null,
EmployeeId = attende.EmployeeId, EmployeeId = attende.EmployeeId,
ProjectId = attende.ProjectID,
FirstName = attende.Employee?.FirstName, FirstName = attende.Employee?.FirstName,
ProjectName = projects.Where(p => p.Id == attende.ProjectID).Select(p => p.Name).FirstOrDefault(), ProjectName = projects.Where(p => p.Id == attende.ProjectID).Select(p => p.Name).FirstOrDefault(),
LastName = attende.Employee?.LastName, LastName = attende.Employee?.LastName,
@ -540,6 +544,7 @@ namespace MarcoBMS.Services.Controllers
CheckOutTime = attendance.OutTime, CheckOutTime = attendance.OutTime,
EmployeeAvatar = null, EmployeeAvatar = null,
EmployeeId = recordAttendanceDot.EmployeeID, EmployeeId = recordAttendanceDot.EmployeeID,
ProjectId = attendance.ProjectID,
FirstName = employee.FirstName, FirstName = employee.FirstName,
LastName = employee.LastName, LastName = employee.LastName,
Id = attendance.Id, Id = attendance.Id,
@ -753,6 +758,7 @@ namespace MarcoBMS.Services.Controllers
{ {
Id = attendance.Id, Id = attendance.Id,
EmployeeId = employee.Id, EmployeeId = employee.Id,
ProjectId = attendance.ProjectID,
FirstName = employee.FirstName, FirstName = employee.FirstName,
LastName = employee.LastName, LastName = employee.LastName,
CheckInTime = attendance.InTime, CheckInTime = attendance.InTime,
@ -858,6 +864,7 @@ namespace MarcoBMS.Services.Controllers
if (attendance != null) if (attendance != null)
{ {
result1.Id = attendance.Id; result1.Id = attendance.Id;
result1.ProjectId = attendance.ProjectID;
result1.CheckInTime = attendance.InTime; result1.CheckInTime = attendance.InTime;
result1.CheckOutTime = attendance.OutTime; result1.CheckOutTime = attendance.OutTime;
result1.Activity = attendance.Activity; result1.Activity = attendance.Activity;
@ -905,6 +912,7 @@ namespace MarcoBMS.Services.Controllers
{ {
Id = lstAttendance.Id, Id = lstAttendance.Id,
EmployeeAvatar = null, EmployeeAvatar = null,
ProjectId = lstAttendance.ProjectID,
EmployeeId = employee.Id, EmployeeId = employee.Id,
FirstName = employee.FirstName, FirstName = employee.FirstName,
OrganizationName = employee.Organization.Name, OrganizationName = employee.Organization.Name,