diff --git a/src/main/java/com/gcc/commissionerreview/service/AttendanceService.java b/src/main/java/com/gcc/commissionerreview/service/AttendanceService.java index 7500c3c..bee275c 100644 --- a/src/main/java/com/gcc/commissionerreview/service/AttendanceService.java +++ b/src/main/java/com/gcc/commissionerreview/service/AttendanceService.java @@ -106,7 +106,7 @@ public class AttendanceService { } // Base query - simplified and optimized - String sql = "SELECT et.enrollment_id, et.name, et.designation, et.department, et.incharge_name, et.incharge_phoneno, et.emp_id, " + String sql = "SELECT et.enrollment_id, et.name, et.designation, et.department, et.incharge_name, et.incharge_phoneno, et.emp_id, et.park_name, " + "DATE_FORMAT(att.indatetime, '%d-%m-%Y %h:%i %p') as intime, att.inphoto as inphoto, att.inby, " + "DATE_FORMAT(att.outdatetime, '%d-%m-%Y %h:%i %p') as outtime, att.outphoto as outphoto, att.outby, " + "DATE_FORMAT(att.oddatetime, '%d-%m-%Y %h:%i %p') as odtime, att.odby, et.zone, " diff --git a/src/main/resources/templates/modules/attendance-dashboard.html b/src/main/resources/templates/modules/attendance-dashboard.html index 26a4213..5c3463b 100644 --- a/src/main/resources/templates/modules/attendance-dashboard.html +++ b/src/main/resources/templates/modules/attendance-dashboard.html @@ -284,11 +284,17 @@ const catLower = (category || 'present').toLowerCase(); if (catLower === 'present') { - displayColumns = ['enrollment_id', 'name', 'designation', 'department', 'intime', 'inphoto', 'outtime', 'outphoto']; + displayColumns = ['enrollment_id', 'name', 'designation', 'department']; + if (empType === 'Park') displayColumns.push('park_name'); + displayColumns.push('intime', 'inphoto', 'outtime', 'outphoto'); } else if (catLower === 'leave') { - displayColumns = ['enrollment_id', 'name', 'designation', 'department', 'leavedatetime', 'leaveby']; + displayColumns = ['enrollment_id', 'name', 'designation', 'department']; + if (empType === 'Park') displayColumns.push('park_name'); + displayColumns.push('leavedatetime', 'leaveby'); } else if (catLower === 'od') { - displayColumns = ['enrollment_id', 'name', 'designation', 'department', 'odtime', 'odby']; + displayColumns = ['enrollment_id', 'name', 'designation', 'department']; + if (empType === 'Park') displayColumns.push('park_name'); + displayColumns.push('odtime', 'odby'); } else { displayColumns = Object.keys(data[0]); } @@ -312,6 +318,7 @@ name: 'Name', designation: 'Designation', department: 'Department', + park_name: 'Park Name', intime: 'In Time', inphoto: 'In Photo', outtime: 'Out Time',