From ac6f52ce1627db37b461318c4fb218f52ae08e87 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Wed, 2 Apr 2025 13:22:32 +0530
Subject: [PATCH 1/2] Fixed bug regrading passing incorrect tenantId and
 sending list of active and inactive employees rather than list of active or
 inc=active employees

---
 .../Controllers/AttendanceController.cs          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/AttendanceController.cs b/Marco.Pms.Services/Controllers/AttendanceController.cs
index 3103b9b..2fb7ab0 100644
--- a/Marco.Pms.Services/Controllers/AttendanceController.cs
+++ b/Marco.Pms.Services/Controllers/AttendanceController.cs
@@ -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)
             {
 
-- 
2.43.0


From 414bf7ece1b9aecb19ec3e0adcd7da38d0ba5ee7 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Wed, 2 Apr 2025 13:37:03 +0530
Subject: [PATCH 2/2] Fixed bug about UpdatedBy

---
 Marco.Pms.Services/Controllers/AttendanceController.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/AttendanceController.cs b/Marco.Pms.Services/Controllers/AttendanceController.cs
index 2fb7ab0..df91456 100644
--- a/Marco.Pms.Services/Controllers/AttendanceController.cs
+++ b/Marco.Pms.Services/Controllers/AttendanceController.cs
@@ -38,11 +38,6 @@ namespace MarcoBMS.Services.Controllers
             //var tenant = User.FindFirst("TenantId")?.Value;
             //return (tenant != null ? Convert.ToInt32(tenant) : 1);
         }
-        private int GetUserId()
-        {
-            var user = _userHelper.GetCurrentUserAsync();
-            return user.Id;
-        }
 
         [HttpGet("log/attendance/{attendanceid}")]
 
@@ -304,7 +299,7 @@ namespace MarcoBMS.Services.Controllers
                     Longitude = recordAttendanceDot.Longitude,
 
                     TenantId = TenantId,
-                    UpdatedBy = GetUserId(),
+                    UpdatedBy = recordAttendanceDot.EmployeeID,
                     UpdatedOn = recordAttendanceDot.Date
                 };
                 //if (recordAttendanceDot.Image != null && recordAttendanceDot.Image.Count > 0)
-- 
2.43.0