Ashutosh_Task#513 #96
@ -54,7 +54,7 @@ namespace Marco.Pms.Model.Mapper
|
||||
ApprovedDate = taskAllocation.ApprovedDate,
|
||||
PlannedTask = taskAllocation.PlannedTask,
|
||||
CompletedTask = taskAllocation.CompletedTask,
|
||||
NotApprovedTask = taskAllocation.ApprovedById == null ? taskAllocation.CompletedTask : (taskAllocation.ReportedTask - taskAllocation.CompletedTask),
|
||||
NotApprovedTask = taskAllocation.ApprovedById == null ? taskAllocation.CompletedTask : (taskAllocation.CompletedTask - taskAllocation.ReportedTask),
|
||||
Description = taskAllocation.Description,
|
||||
AssignedBy = taskAllocation.Employee?.ToBasicEmployeeVMFromEmployee(),
|
||||
ReportedBy = taskAllocation.ReportedBy?.ToBasicEmployeeVMFromEmployee(),
|
||||
@ -114,7 +114,7 @@ namespace Marco.Pms.Model.Mapper
|
||||
ReportedDate = taskAllocation.ReportedDate,
|
||||
WorkStatus = taskAllocation.WorkStatus,
|
||||
CompletedTask = taskAllocation.CompletedTask,
|
||||
NotApprovedTask = taskAllocation.ApprovedById == null ? taskAllocation.CompletedTask : (taskAllocation.ReportedTask - taskAllocation.CompletedTask),
|
||||
NotApprovedTask = taskAllocation.ApprovedById == null ? taskAllocation.CompletedTask : (taskAllocation.CompletedTask - taskAllocation.ReportedTask),
|
||||
AssignedBy = taskAllocation.Employee?.ToBasicEmployeeVMFromEmployee(),
|
||||
ReportedBy = taskAllocation.ReportedBy?.ToBasicEmployeeVMFromEmployee(),
|
||||
ApprovedBy = taskAllocation.ApprovedBy?.ToBasicEmployeeVMFromEmployee(),
|
||||
|
@ -165,7 +165,7 @@ namespace MarcoBMS.Services.Controllers
|
||||
taskAllocation.ReportedDate = reportTask.ReportedDate;
|
||||
taskAllocation.ReportedById = loggedInEmployee.Id;
|
||||
taskAllocation.CompletedTask = reportTask.CompletedTask;
|
||||
taskAllocation.ReportedTask = reportTask.CompletedTask;
|
||||
//taskAllocation.ReportedTask = reportTask.CompletedTask;
|
||||
|
||||
var checkListMappings = new List<CheckListMappings>();
|
||||
var checkListVMs = new List<CheckListVM>();
|
||||
@ -692,21 +692,21 @@ namespace MarcoBMS.Services.Controllers
|
||||
"Approved tasks cannot be greater than completed tasks", 400));
|
||||
}
|
||||
|
||||
// Update completed work in the associated work item, if it exists
|
||||
if (taskAllocation.WorkItem != null && taskAllocation.CompletedTask != approveTask.ApprovedTask)
|
||||
{
|
||||
if (taskAllocation.CompletedTask > 0)
|
||||
{
|
||||
taskAllocation.WorkItem.CompletedWork -= taskAllocation.CompletedTask;
|
||||
}
|
||||
taskAllocation.WorkItem.CompletedWork += approveTask.ApprovedTask;
|
||||
}
|
||||
//// Update completed work in the associated work item, if it exists
|
||||
//if (taskAllocation.WorkItem != null && taskAllocation.CompletedTask != approveTask.ApprovedTask)
|
||||
//{
|
||||
// if (taskAllocation.CompletedTask > 0)
|
||||
// {
|
||||
// taskAllocation.WorkItem.CompletedWork -= taskAllocation.CompletedTask;
|
||||
// }
|
||||
// taskAllocation.WorkItem.CompletedWork += approveTask.ApprovedTask;
|
||||
//}
|
||||
|
||||
// Update task allocation details
|
||||
taskAllocation.ApprovedById = loggedInEmployee.Id;
|
||||
taskAllocation.ApprovedDate = DateTime.UtcNow;
|
||||
taskAllocation.WorkStatusId = approveTask.WorkStatus;
|
||||
taskAllocation.CompletedTask = approveTask.ApprovedTask;
|
||||
taskAllocation.ReportedTask = approveTask.ApprovedTask;
|
||||
|
||||
// Add a comment (optional)
|
||||
var comment = new TaskComment
|
||||
|
Loading…
x
Reference in New Issue
Block a user