From c5e4d79f9e7c2813b2adcc3d6ebec7209535e22f Mon Sep 17 00:00:00 2001 From: kanimozhi Date: Mon, 23 Feb 2026 15:47:16 +0530 Subject: [PATCH] Attendance Dashboard - Not Marked issue resolved. --- .../com/gcc/commissionerreview/service/AttendanceService.java | 2 +- src/main/resources/templates/modules/attendance-dashboard.html | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gcc/commissionerreview/service/AttendanceService.java b/src/main/java/com/gcc/commissionerreview/service/AttendanceService.java index 8662625..70183fc 100644 --- a/src/main/java/com/gcc/commissionerreview/service/AttendanceService.java +++ b/src/main/java/com/gcc/commissionerreview/service/AttendanceService.java @@ -119,7 +119,7 @@ public class AttendanceService { + " FROM enrollment_table et " + " LEFT JOIN park_details pd ON et.park_id = pd.park_id AND pd.is_active = 1 AND pd.is_delete = 0 " + " LEFT JOIN gccfacialdb.employees emp ON et.enrollment_id = emp.employeeid " - + " WHERE et.isactive = 1 AND et.isdelete = 0 AND et.emp_type = ? AND et.zone != 0 AND et.facial_attendance != 1 " + + " WHERE et.isactive = 1 AND et.isdelete = 0 AND et.emp_type = ? AND et.zone != 0 AND et.facial_attendance = 1 " + " AND et.enrollment_id NOT IN (SELECT enrollment_id FROM attendance WHERE date(indatetime) BETWEEN ? AND ? " + " OR date(oddatetime) BETWEEN ? AND ? OR date(leavedatetime) BETWEEN ? AND ?)"; java.util.List params = new java.util.ArrayList<>(); diff --git a/src/main/resources/templates/modules/attendance-dashboard.html b/src/main/resources/templates/modules/attendance-dashboard.html index 6f210f0..47dc0cf 100644 --- a/src/main/resources/templates/modules/attendance-dashboard.html +++ b/src/main/resources/templates/modules/attendance-dashboard.html @@ -388,7 +388,7 @@ if (data.length === 0) { modalBody.innerHTML = '
No park-wise records
'; return; } let html = '
'; - html += ''; + html += ''; html += ''; data.forEach(r => { const parkId = r.park_id || ''; @@ -404,6 +404,7 @@ const leave = Number(r.LeaveCount) || 0; const notMarked = Math.max(0, total - present - od - leave - facialNotRegistered); html += ''; + html += ``; html += ``; html += ``; html += ``;
Park NameSupervisor NameSupervisor MobileTotalFacial RegisteredFacial Not RegisteredPresentODLeaveNot MarkedPark IDPark NameSupervisor NameSupervisor MobileTotalFacial RegisteredFacial Not RegisteredPresentODLeaveNot Marked
${parkId}${parkDisplay}${supervisorName}${supervisorMobile}