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

Fixed bug regrading passing incorrect tenantId and sending list of active and inactive employees rather than list of active or inactive employees #10

Merged
vikas.nale merged 2 commits from Ashutosh_Bug#37_Attendance_Issues into Issuses 2025-04-02 10:25:06 +00:00
Conversation 0 Commits 2 Files Changed 1 +8 -8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ac6f52ce16 - Show all commits

16
Marco.Pms.Services/Controllers/AttendanceController.cs
View File

@ -40,15 +40,15 @@ namespace MarcoBMS.Services.Controllers
}
private int GetUserId()
{
var tenant = User.FindFirst("Id")?.Value;
return (tenant != null ? Convert.ToInt32(tenant) : 1);
var user = _userHelper.GetCurrentUserAsync();
return user.Id;
}
[HttpGet("log/attendance/{attendanceid}")]
public async Task<IActionResult> GetAttendanceLogById(int attendanceid)
{
int TenantId = GetUserId();
int TenantId = GetTenantId();
List<AttendanceLog> lstAttendance = await _context.AttendanceLogs.Where(c => c.AttendanceId == attendanceid && c.TenantId == TenantId).ToListAsync();
@ -59,7 +59,7 @@ namespace MarcoBMS.Services.Controllers
public async Task<IActionResult> GetAttendanceLogByEmployeeId(int employeeid, [FromQuery] string? date = null)
{
int TenantId = GetUserId();
int TenantId = GetTenantId();
DateOnly forDate = new DateOnly();
if (date != null && DateOnly.TryParse(date, out forDate) == false)
@ -84,7 +84,7 @@ namespace MarcoBMS.Services.Controllers
public async Task<IActionResult> EmployeeAttendanceByDateRange([FromQuery] int projectId, [FromQuery] string? dateFrom = null, [FromQuery] string? dateTo = null)
{
int TenantId = GetUserId();
int TenantId = GetTenantId();
DateTime fromDate = new DateTime();
DateTime toDate = new DateTime();
@ -149,9 +149,9 @@ namespace MarcoBMS.Services.Controllers
/// <returns></returns>
[HttpGet("project/team")]
public async Task<IActionResult> EmployeeAttendanceByProject([FromQuery] int projectId, [FromQuery] string? date = null)
public async Task<IActionResult> EmployeeAttendanceByProject([FromQuery] int projectId, [FromQuery] bool IncludeInActive, [FromQuery] string? date = null)
{
int TenantId = GetUserId();
int TenantId = GetTenantId();
DateTime forDate = new DateTime();
if (date != null && DateTime.TryParse(date, out forDate) == false)
@ -172,7 +172,7 @@ namespace MarcoBMS.Services.Controllers
List<Attendance> lstAttendance = await _context.Attendes.Where(c => c.ProjectID == projectId && c.AttendanceDate.Date == forDate && c.TenantId == TenantId).ToListAsync();
List<ProjectAllocation> projectteam = await _projectsHelper.GetTeamByProject(TenantId, projectId, true);
List<ProjectAllocation> projectteam = await _projectsHelper.GetTeamByProject(TenantId, projectId, IncludeInActive);
foreach (ProjectAllocation teamMember in projectteam)
{