From 9daf76c6ebb40b2e9d276496a637a49a396a6570 Mon Sep 17 00:00:00 2001 From: "pramod.mahajan" Date: Sun, 5 Oct 2025 00:24:26 +0530 Subject: [PATCH] return all employees when allEmployee=true --- .../Controllers/EmployeeController.cs | 13 +++++++++++-- Marco.Pms.Services/appsettings.Development.json | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Marco.Pms.Services/Controllers/EmployeeController.cs b/Marco.Pms.Services/Controllers/EmployeeController.cs index 6c202ee..1bdb4a8 100644 --- a/Marco.Pms.Services/Controllers/EmployeeController.cs +++ b/Marco.Pms.Services/Controllers/EmployeeController.cs @@ -329,7 +329,7 @@ namespace MarcoBMS.Services.Controllers [HttpGet("basic")] - public async Task GetEmployeesByProjectBasic(Guid? projectId, [FromQuery] string? searchString) + public async Task GetEmployeesByProjectBasic(Guid? projectId, [FromQuery] string? searchString,[FromQuery] bool allEmployee) { var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); var employeeQuery = _context.Employees.Where(e => e.IsActive); @@ -354,7 +354,16 @@ namespace MarcoBMS.Services.Controllers employeeQuery = employeeQuery.Where(e => (e.FirstName + " " + e.LastName).ToLower().Contains(searchStringLower)); } - var response = await employeeQuery.Take(10).Select(e => _mapper.Map(e)).ToListAsync(); + var query = employeeQuery.OrderBy(e => e.FirstName); + + if (!allEmployee) + { + query = (IOrderedQueryable)query.Take(10); + } + + var response = await query + .Select(e => _mapper.Map(e)) + .ToListAsync(); return Ok(ApiResponse.SuccessResponse(response, $"{response.Count} records of employees fetched successfully", 200)); } diff --git a/Marco.Pms.Services/appsettings.Development.json b/Marco.Pms.Services/appsettings.Development.json index e7fdcee..64c9dad 100644 --- a/Marco.Pms.Services/appsettings.Development.json +++ b/Marco.Pms.Services/appsettings.Development.json @@ -9,7 +9,7 @@ "Title": "Dev" }, "ConnectionStrings": { - "DefaultConnectionString": "Server=147.93.98.152;User ID=devuser;Password=AppUser@123$;Database=MarcoBMS1" + "DefaultConnectionString": "Server=147.93.98.152;User ID=devuser;Password=AppUser@123$;Database=MarcoBMSStage" }, "SmtpSettings": { "SmtpServer": "smtp.gmail.com",