From b94f4bdb631ffe695bcef189a624041beb42670a Mon Sep 17 00:00:00 2001 From: "ashutosh.nehete" Date: Tue, 24 Jun 2025 11:30:50 +0530 Subject: [PATCH] When task is approved stored approved tasks in reported task field not in completed task --- Marco.Pms.Model/Mapper/ActivitiesMapper.cs | 4 ++-- .../Controllers/TaskController.cs | 22 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Marco.Pms.Model/Mapper/ActivitiesMapper.cs b/Marco.Pms.Model/Mapper/ActivitiesMapper.cs index 4083ccf..e2dc503 100644 --- a/Marco.Pms.Model/Mapper/ActivitiesMapper.cs +++ b/Marco.Pms.Model/Mapper/ActivitiesMapper.cs @@ -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(), diff --git a/Marco.Pms.Services/Controllers/TaskController.cs b/Marco.Pms.Services/Controllers/TaskController.cs index ab34561..6b55c3f 100644 --- a/Marco.Pms.Services/Controllers/TaskController.cs +++ b/Marco.Pms.Services/Controllers/TaskController.cs @@ -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(); var checkListVMs = new List(); @@ -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 -- 2.43.0