Merge pull request 'Included the reported date when sending the list of allocated tasks to provide more detailed tracking information.' (#44) from Ashutosh_Enhancement_#214_Report_Task_At_Zero into Issues_May_2W

Reviewed-on: #44
This commit is contained in:
Vikas Nale 2025-05-10 13:37:45 +00:00
commit 4287bf7b2e
2 changed files with 2 additions and 0 deletions

View File

@ -102,6 +102,7 @@ namespace Marco.Pms.Model.Mapper
Id = taskAllocation.Id, Id = taskAllocation.Id,
AssignmentDate = taskAllocation.AssignmentDate, AssignmentDate = taskAllocation.AssignmentDate,
PlannedTask = taskAllocation.PlannedTask, PlannedTask = taskAllocation.PlannedTask,
ReportedDate = taskAllocation.ReportedDate,
CompletedTask = taskAllocation.CompletedTask, CompletedTask = taskAllocation.CompletedTask,
AssignedBy = taskAllocation.Employee != null ? taskAllocation.Employee.ToBasicEmployeeVMFromEmployee() : new BasicEmployeeVM(), AssignedBy = taskAllocation.Employee != null ? taskAllocation.Employee.ToBasicEmployeeVMFromEmployee() : new BasicEmployeeVM(),
WorkItemId = taskAllocation.WorkItemId, WorkItemId = taskAllocation.WorkItemId,

View File

@ -6,6 +6,7 @@ namespace Marco.Pms.Model.ViewModels.Activities
{ {
public Guid Id { get; set; } public Guid Id { get; set; }
public DateTime AssignmentDate { get; set; } public DateTime AssignmentDate { get; set; }
public DateTime? ReportedDate { get; set; }
public double PlannedTask { get; set; } public double PlannedTask { get; set; }
public double CompletedTask { get; set; } public double CompletedTask { get; set; }
public BasicEmployeeVM? AssignedBy { get; set; } public BasicEmployeeVM? AssignedBy { get; set; }