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

Merge pull request 'When task is approved stored approved tasks in reported task field not in completed task' (#93) from Ashutosh_Bug#529 into Approve_Task_Feature

Browse Source 
Reviewed-on: #93
This commit is contained in:
ashutosh.nehete 2025-06-24 06:06:37 +00:00
commit 0d49163d7b
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marco.Pms.Model/Mapper/ActivitiesMapper.cs
View File

@ -54,7 +54,7 @@ namespace Marco.Pms.Model.Mapper
ApprovedDate = taskAllocation.ApprovedDate, ApprovedDate = taskAllocation.ApprovedDate,
PlannedTask = taskAllocation.PlannedTask, PlannedTask = taskAllocation.PlannedTask,
CompletedTask = taskAllocation.CompletedTask, 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, Description = taskAllocation.Description,
AssignedBy = taskAllocation.Employee?.ToBasicEmployeeVMFromEmployee(), AssignedBy = taskAllocation.Employee?.ToBasicEmployeeVMFromEmployee(),
ReportedBy = taskAllocation.ReportedBy?.ToBasicEmployeeVMFromEmployee(), ReportedBy = taskAllocation.ReportedBy?.ToBasicEmployeeVMFromEmployee(),
@ -114,7 +114,7 @@ namespace Marco.Pms.Model.Mapper
ReportedDate = taskAllocation.ReportedDate, ReportedDate = taskAllocation.ReportedDate,
WorkStatus = taskAllocation.WorkStatus, WorkStatus = taskAllocation.WorkStatus,
CompletedTask = taskAllocation.CompletedTask, 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(), AssignedBy = taskAllocation.Employee?.ToBasicEmployeeVMFromEmployee(),
ReportedBy = taskAllocation.ReportedBy?.ToBasicEmployeeVMFromEmployee(), ReportedBy = taskAllocation.ReportedBy?.ToBasicEmployeeVMFromEmployee(),
ApprovedBy = taskAllocation.ApprovedBy?.ToBasicEmployeeVMFromEmployee(), ApprovedBy = taskAllocation.ApprovedBy?.ToBasicEmployeeVMFromEmployee(),

22
Marco.Pms.Services/Controllers/TaskController.cs
View File

@ -165,7 +165,7 @@ namespace MarcoBMS.Services.Controllers
taskAllocation.ReportedDate = reportTask.ReportedDate; taskAllocation.ReportedDate = reportTask.ReportedDate;
taskAllocation.ReportedById = loggedInEmployee.Id; taskAllocation.ReportedById = loggedInEmployee.Id;
taskAllocation.CompletedTask = reportTask.CompletedTask; taskAllocation.CompletedTask = reportTask.CompletedTask;
taskAllocation.ReportedTask = reportTask.CompletedTask; //taskAllocation.ReportedTask = reportTask.CompletedTask;
var checkListMappings = new List<CheckListMappings>(); var checkListMappings = new List<CheckListMappings>();
var checkListVMs = new List<CheckListVM>(); var checkListVMs = new List<CheckListVM>();
@ -692,21 +692,21 @@ namespace MarcoBMS.Services.Controllers
"Approved tasks cannot be greater than completed tasks", 400)); "Approved tasks cannot be greater than completed tasks", 400));
} }
// Update completed work in the associated work item, if it exists //// Update completed work in the associated work item, if it exists
if (taskAllocation.WorkItem != null && taskAllocation.CompletedTask != approveTask.ApprovedTask) //if (taskAllocation.WorkItem != null && taskAllocation.CompletedTask != approveTask.ApprovedTask)
{ //{
if (taskAllocation.CompletedTask > 0) // if (taskAllocation.CompletedTask > 0)
{ // {
taskAllocation.WorkItem.CompletedWork -= taskAllocation.CompletedTask; // taskAllocation.WorkItem.CompletedWork -= taskAllocation.CompletedTask;
} // }
taskAllocation.WorkItem.CompletedWork += approveTask.ApprovedTask; // taskAllocation.WorkItem.CompletedWork += approveTask.ApprovedTask;
} //}
// Update task allocation details // Update task allocation details
taskAllocation.ApprovedById = loggedInEmployee.Id; taskAllocation.ApprovedById = loggedInEmployee.Id;
taskAllocation.ApprovedDate = DateTime.UtcNow; taskAllocation.ApprovedDate = DateTime.UtcNow;
taskAllocation.WorkStatusId = approveTask.WorkStatus; taskAllocation.WorkStatusId = approveTask.WorkStatus;
taskAllocation.CompletedTask = approveTask.ApprovedTask; taskAllocation.ReportedTask = approveTask.ApprovedTask;
// Add a comment (optional) // Add a comment (optional)
var comment = new TaskComment var comment = new TaskComment