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

Fixed some miner bugs

Browse Source
This commit is contained in:
ashutosh.nehete 2025-04-07 18:07:37 +05:30
parent 41edbef9d1
commit 727e4794da
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marco.Pms.Model/ViewModels/Activities/TaskVM.cs
View File

@ -16,7 +16,7 @@ namespace Marco.Pms.Model.ViewModels.Activities
public WorkItem WorkItem { get; set; } public WorkItem WorkItem { get; set; }
public string Tenant { get; set; } public string Tenant { get; set; }
public List<TaskComment> Comments { get; set; } public List<CommentVM> Comments { get; set; }
public List<EmployeeVM> TeamMembers { get; set; } public List<EmployeeVM> TeamMembers { get; set; }
} }
} }

2
Marco.Pms.Services/Controllers/ProjectController.cs
View File

@ -453,7 +453,7 @@ namespace MarcoBMS.Services.Controllers
}; };
workItems.Add(result); workItems.Add(result);
} }
var activity = await _context.ActivityMasters.ToListAsync();
return Ok(ApiResponse<object>.SuccessResponse(workItems, "Data saved successfully.", 200)); return Ok(ApiResponse<object>.SuccessResponse(workItems, "Data saved successfully.", 200));
} }

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

@ -14,9 +14,10 @@ using Microsoft.EntityFrameworkCore;
namespace MarcoBMS.Services.Controllers namespace MarcoBMS.Services.Controllers
{ {
[Authorize]
[Route("api/[controller]")] [Route("api/[controller]")]
[ApiController] [ApiController]
[Authorize]
public class TaskController : ControllerBase public class TaskController : ControllerBase
{ {
private readonly ApplicationDbContext _context; private readonly ApplicationDbContext _context;
@ -177,15 +178,15 @@ namespace MarcoBMS.Services.Controllers
idList = workAreas.Select(a => a.Id).ToList(); idList = workAreas.Select(a => a.Id).ToList();
List<WorkItem> workItems = await _context.WorkItems.Where(i => idList.Contains(i.WorkAreaId) && i.TenantId == tenantId).Include(i => i.ActivityMaster).ToListAsync(); List<WorkItem> workItems = await _context.WorkItems.Where(i => idList.Contains(i.WorkAreaId) && i.TenantId == tenantId).Include(i => i.ActivityMaster).ToListAsync();
idList = workAreas.Select(i => i.Id).ToList(); idList = workItems.Select(i => i.Id).ToList();
List<TaskAllocation> taskAllocations = await _context.TaskAllocations.Where(t => idList.Contains(t.WorkItemId) && t.AssignmentDate >= fromDate && t.AssignmentDate <= toDate && t.TenantId == tenantId).Include(t => t.WorkItem).Include(t=>t.Employee).ToListAsync(); List<TaskAllocation> taskAllocations = await _context.TaskAllocations.Where(t => idList.Contains(t.WorkItemId) && t.AssignmentDate >= fromDate && t.AssignmentDate <= toDate && t.TenantId == tenantId).Include(t => t.WorkItem).Include(t=>t.Employee).ToListAsync();
var taskIdList = taskAllocations.Select(t => t.Id).ToList(); var taskIdList = taskAllocations.Select(t => t.Id).ToList();
List<TaskMembers> teamMembers = await _context.TaskMembers.Where(t => taskIdList.Contains(t.TaskAllocationId)).Include(t => t.Employee).ToListAsync(); List<TaskMembers> teamMembers = await _context.TaskMembers.Where(t => taskIdList.Contains(t.TaskAllocationId)).Include(t => t.Employee).ToListAsync();
List<ListTaskVM> tasks = new List<ListTaskVM>(); List<ListTaskVM> tasks = new List<ListTaskVM>();
foreach (var workItem in workItems) //foreach (var workItem in workItems)
{ //{
foreach (var taskAllocation in taskAllocations) foreach (var taskAllocation in taskAllocations)
{ {
@ -207,7 +208,7 @@ namespace MarcoBMS.Services.Controllers
tasks.Add(response); tasks.Add(response);
} }
} //}
return Ok(ApiResponse<object>.SuccessResponse(tasks, "Success", 200)); return Ok(ApiResponse<object>.SuccessResponse(tasks, "Success", 200));
} }
@ -233,7 +234,12 @@ namespace MarcoBMS.Services.Controllers
var result = member.Employee.ToEmployeeVMFromEmployee(); var result = member.Employee.ToEmployeeVMFromEmployee();
teamMembers.Add(result); teamMembers.Add(result);
} }
taskVM.Comments = comments; List<CommentVM> Comments = new List<CommentVM> { };
foreach (var comment in comments)
{
Comments.Add(comment.ToCommentVMFromTaskComment());
}
taskVM.Comments = Comments;
taskVM.TeamMembers = teamMembers; taskVM.TeamMembers = teamMembers;
return Ok(ApiResponse<object>.SuccessResponse(taskVM, "Success", 200)); return Ok(ApiResponse<object>.SuccessResponse(taskVM, "Success", 200));
} }