Added a flag in the Employee List API to retrieve active and inactive employees separately.
This commit is contained in:
parent
bbddc236b1
commit
5dbf43bfa8
@ -132,7 +132,7 @@ namespace MarcoBMS.Services.Controllers
|
||||
|
||||
[HttpGet]
|
||||
[Route("list/{projectid?}")]
|
||||
public async Task<IActionResult> GetEmployeesByProject(Guid? projectid)
|
||||
public async Task<IActionResult> GetEmployeesByProject(Guid? projectid, [FromQuery] bool ShowInactive)
|
||||
{
|
||||
if (!ModelState.IsValid)
|
||||
{
|
||||
@ -142,7 +142,7 @@ namespace MarcoBMS.Services.Controllers
|
||||
.ToList();
|
||||
return BadRequest(ApiResponse<object>.ErrorResponse("Invalid data", errors, 400));
|
||||
}
|
||||
var result = await _employeeHelper.GetEmployeeByProjectId(GetTenantId(), projectid);
|
||||
var result = await _employeeHelper.GetEmployeeByProjectId(GetTenantId(), projectid, ShowInactive);
|
||||
|
||||
return Ok(ApiResponse<object>.SuccessResponse(result, "Filter applied.", 200));
|
||||
|
||||
|
@ -71,7 +71,7 @@ namespace MarcoBMS.Services.Helpers
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<List<EmployeeVM>> GetEmployeeByProjectId(Guid TenentId, Guid? ProjectId)
|
||||
public async Task<List<EmployeeVM>> GetEmployeeByProjectId(Guid TenentId, Guid? ProjectId, bool ShowInActive)
|
||||
{
|
||||
try
|
||||
{
|
||||
@ -87,6 +87,11 @@ namespace MarcoBMS.Services.Helpers
|
||||
.ToListAsync();
|
||||
|
||||
}
|
||||
else if (ShowInActive)
|
||||
{
|
||||
result = await _context.Employees.Where(c => c.TenantId == TenentId && c.IsActive == false).Include(fp => fp.JobRole)
|
||||
.Select(c => c.ToEmployeeVMFromEmployee()).ToListAsync();
|
||||
}
|
||||
else
|
||||
{
|
||||
result = await _context.Employees.Where(c => c.TenantId == TenentId && c.IsActive == true).Include(fp => fp.JobRole)
|
||||
|
Loading…
x
Reference in New Issue
Block a user