From e41faf404551da7e821d4f741d1ac2dfca3fa524 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Wed, 9 Apr 2025 10:41:00 +0530
Subject: [PATCH] Passing role name in record attendance api

---
 .../Controllers/AttendanceController.cs       | 29 +++++++++++--------
 Marco.Pms.Services/Helpers/EmployeeHelper.cs  |  3 +-
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/AttendanceController.cs b/Marco.Pms.Services/Controllers/AttendanceController.cs
index 9e7d1ea..7610b62 100644
--- a/Marco.Pms.Services/Controllers/AttendanceController.cs
+++ b/Marco.Pms.Services/Controllers/AttendanceController.cs
@@ -278,7 +278,7 @@ namespace MarcoBMS.Services.Controllers
 
                 DateTime finalDateTime = GetDateFromTimeStamp(recordAttendanceDot, recordAttendanceDot.MarkTime);
 
-
+                //if(recordAttendanceDot.Comment != null)
                 if (attendance != null)
                 {
                     attendance.Comment = recordAttendanceDot.Comment;
@@ -372,19 +372,24 @@ namespace MarcoBMS.Services.Controllers
                 await transaction.CommitAsync(); // Commit transaction
 
                 Employee employee = await _employeeHelper.GetEmployeeByID(recordAttendanceDot.EmployeeID);
-                EmployeeAttendanceVM vm = new EmployeeAttendanceVM()
+                if(employee.JobRole != null)
                 {
-                    CheckInTime = attendance.InTime,
-                    CheckOutTime = attendance.OutTime,
-                    EmployeeAvatar = null,
-                    EmployeeId = recordAttendanceDot.EmployeeID,
-                    FirstName = employee.FirstName,
-                    LastName = employee.LastName,
-                    Id = attendance.Id,
-                    Activity = attendance.Activity
-                };
+                    EmployeeAttendanceVM vm = new EmployeeAttendanceVM()
+                    {
+                        CheckInTime = attendance.InTime,
+                        CheckOutTime = attendance.OutTime,
+                        EmployeeAvatar = null,
+                        EmployeeId = recordAttendanceDot.EmployeeID,
+                        FirstName = employee.FirstName,
+                        LastName = employee.LastName,
+                        Id = attendance.Id,
+                        Activity = attendance.Activity,
+                        JobRoleName = employee.JobRole.Name
+                    };
 
-                return Ok(ApiResponse<object>.SuccessResponse(vm, "Attendance marked successfully.", 200));
+                    return Ok(ApiResponse<object>.SuccessResponse(vm, "Attendance marked successfully.", 200));
+                }
+                return Ok(ApiResponse<object>.SuccessResponse(new EmployeeAttendanceVM(), "Attendance marked successfully.", 200));
 
             }
             catch (Exception ex)
diff --git a/Marco.Pms.Services/Helpers/EmployeeHelper.cs b/Marco.Pms.Services/Helpers/EmployeeHelper.cs
index ca7fae9..6012ad1 100644
--- a/Marco.Pms.Services/Helpers/EmployeeHelper.cs
+++ b/Marco.Pms.Services/Helpers/EmployeeHelper.cs
@@ -18,7 +18,8 @@ namespace MarcoBMS.Services.Helpers
         }
         public async Task<Employee> GetEmployeeByID(int EmployeeID)
         {
-            return await _context.Employees.FindAsync(EmployeeID);
+
+            return await _context.Employees.Include(e => e.JobRole).FirstOrDefaultAsync(e => e.Id == EmployeeID) ?? new Employee { };
         }
 
         public async Task<Employee> GetEmployeeByApplicationUserID(string ApplicationUserID)