hariprasaths
/
commissioner_review_1_may2025
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

chnages added in attendance service and attendance-report page

master
yoganandhan 8 months ago
parent
011830b687
commit
27d82b98ba
2 changed files with 47 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 35
      src/main/java/com/gcc/commissionerreview/service/AttendanceService.java
  2. 52
      src/main/resources/templates/modules/attendance-dashboard.html

35
src/main/java/com/gcc/commissionerreview/service/AttendanceService.java
View File

@ -29,11 +29,11 @@ public class AttendanceService {
public List<Map<String, Object>> getAbstractCounts() { public List<Map<String, Object>> getAbstractCounts() {
String sql = "SELECT emp_type, COUNT(enrollment_id) AS totalCount, " String sql = "SELECT emp_type, COUNT(enrollment_id) AS totalCount, "
+ "SUM(CASE WHEN facial_attendance = 1 THEN 1 ELSE 0 END) AS facialRegistered, "
+ "SUM(CASE WHEN facial_attendance = 0 THEN 1 ELSE 0 END) AS facialNotRegistered "
+ "FROM enrollment_table "
+ "WHERE isactive = 1 AND isdelete = 0 AND zone != 0 "
+ "GROUP BY emp_type";
+ "SUM(CASE WHEN facial_attendance = 1 THEN 1 ELSE 0 END) AS facialRegistered, "
+ "SUM(CASE WHEN facial_attendance = 0 THEN 1 ELSE 0 END) AS facialNotRegistered "
+ "FROM enrollment_table "
+ "WHERE isactive = 1 AND isdelete = 0 AND zone != 0 and emp_type ='Park' "
+ "GROUP BY emp_type";
return jdbcTemplate.queryForList(sql); return jdbcTemplate.queryForList(sql);
} }
@ -81,10 +81,12 @@ public class AttendanceService {
+ "GROUP BY et.zone, fd.facialRegistered, fd.facialNotRegistered " + "GROUP BY et.zone, fd.facialRegistered, fd.facialNotRegistered "
+ "ORDER BY et.zone"; + "ORDER BY et.zone";
return jdbcTemplate.queryForList(sql, new Object[] { empType, fromDateTime, toDateTime, fromDateTime, toDateTime, fromDateTime, toDateTime, empType });
return jdbcTemplate.queryForList(sql, new Object[] { empType, fromDateTime, toDateTime, fromDateTime,
toDateTime, fromDateTime, toDateTime, empType });
} }
public List<Map<String, Object>> getDetailedList(String empType, String category, String fromDateStr, String toDateStr, Integer zone, String parkName) {
public List<Map<String, Object>> getDetailedList(String empType, String category, String fromDateStr,
String toDateStr, Integer zone, String parkName) {
LocalDate fromDate; LocalDate fromDate;
LocalDate toDate; LocalDate toDate;
@ -120,11 +122,11 @@ public class AttendanceService {
} }
String sql = "SELECT et.enrollment_id, et.name, et.designation, et.department, et.incharge_name, et.incharge_phoneno, et.emp_id, et.park_name, " String sql = "SELECT et.enrollment_id, et.name, et.designation, et.department, et.incharge_name, et.incharge_phoneno, et.emp_id, et.park_name, "
+ "ifnull(att.appversion,'') as appversion, ifnull(att.apptype,'')as apptype, ifnull(att.location,'') as location, "
+ "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, "
+ "DATE_FORMAT(att.leavedatetime, '%d-%m-%Y %h:%i %p') as leavedatetime, att.leaveby "
+ "ifnull(att.appversion,'') as appversion, ifnull(att.apptype,'')as apptype, ifnull(att.location,'') as location, "
+ "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, "
+ "DATE_FORMAT(att.leavedatetime, '%d-%m-%Y %h:%i %p') as leavedatetime, att.leaveby "
+ "FROM enrollment_table et " + "FROM enrollment_table et "
+ "inner join attendance att on et.enrollment_id = att.enrollment_id " + "inner join attendance att on et.enrollment_id = att.enrollment_id "
+ " and " + filterDateColumn + " >= ? and " + filterDateColumn + " <= ? " + " and " + filterDateColumn + " >= ? and " + filterDateColumn + " <= ? "
@ -148,7 +150,8 @@ public class AttendanceService {
sql += " order by " + dateColumn + " desc "; sql += " order by " + dateColumn + " desc ";
System.out.println("EmpType: " + empType + ", Category: " + category + ", From: " + fromDateTime + ", To: " + toDateTime + ", Zone: " + zone + ", ParkName: " + parkName);
System.out.println("EmpType: " + empType + ", Category: " + category + ", From: " + fromDateTime + ", To: "
+ toDateTime + ", Zone: " + zone + ", ParkName: " + parkName);
return jdbcTemplate.queryForList(sql, params.toArray()); return jdbcTemplate.queryForList(sql, params.toArray());
} }
@ -167,7 +170,7 @@ public class AttendanceService {
} else { } else {
toDate = LocalDate.parse(toDateStr, INPUT_FORMAT); toDate = LocalDate.parse(toDateStr, INPUT_FORMAT);
} }
String fromDateTime = fromDate + " 00:00:00"; String fromDateTime = fromDate + " 00:00:00";
String toDateTime = toDate + " 23:59:59"; String toDateTime = toDate + " 23:59:59";
@ -193,7 +196,7 @@ public class AttendanceService {
+ "GROUP BY et.park_name, fd.facialRegistered, fd.facialNotRegistered " + "GROUP BY et.park_name, fd.facialRegistered, fd.facialNotRegistered "
+ "ORDER BY et.park_name"; + "ORDER BY et.park_name";
return jdbcTemplate.queryForList(sql, new Object[] { zone, fromDateTime, toDateTime, fromDateTime, toDateTime, fromDateTime, toDateTime, zone });
return jdbcTemplate.queryForList(sql, new Object[] { zone, fromDateTime, toDateTime, fromDateTime, toDateTime,
fromDateTime, toDateTime, zone });
} }
} }

52
src/main/resources/templates/modules/attendance-dashboard.html
View File

@ -25,7 +25,7 @@
.zone-summary-row { .zone-summary-row {
display: grid; display: grid;
grid-template-columns: 1fr 1fr;
grid-template-columns: 1fr;
gap: 20px; gap: 20px;
} }
@ -87,6 +87,7 @@
</div> </div>
<div id="zoneSummaryPark"></div> <div id="zoneSummaryPark"></div>
</div> </div>
<!-- NULM zone summary card commented out
<div class="zone-summary-card"> <div class="zone-summary-card">
<div class="d-flex justify-content-between align-items-center mb-2"> <div class="d-flex justify-content-between align-items-center mb-2">
<h5>NULM</h5> <h5>NULM</h5>
@ -97,6 +98,7 @@
</div> </div>
<div id="zoneSummaryNulm"></div> <div id="zoneSummaryNulm"></div>
</div> </div>
-->
</div> </div>
</div> </div>
@ -257,11 +259,11 @@
const fromDate = toApiDdMmYyyy(rawFrom); const fromDate = toApiDdMmYyyy(rawFrom);
const toDate = toApiDdMmYyyy(rawTo); const toDate = toApiDdMmYyyy(rawTo);
const parkTarget = document.getElementById('zoneSummaryPark'); const parkTarget = document.getElementById('zoneSummaryPark');
const nulmTarget = document.getElementById('zoneSummaryNulm');
// const nulmTarget = document.getElementById('zoneSummaryNulm'); // NULM commented out
// Show loaders // Show loaders
parkTarget.innerHTML = createLoader(); parkTarget.innerHTML = createLoader();
nulmTarget.innerHTML = createLoader();
// nulmTarget.innerHTML = createLoader(); // NULM commented out
try { try {
// Load Park independently // Load Park independently
@ -283,27 +285,27 @@
parkTarget.innerHTML = `<div class="alert alert-danger">Error: ${e.message}</div>`; parkTarget.innerHTML = `<div class="alert alert-danger">Error: ${e.message}</div>`;
}); });
// Load NULM independently
fetch(`${apiBase}/zoneSummaryNULM?fromDate=${encodeURIComponent(fromDate)}&toDate=${encodeURIComponent(toDate)}`)
.then(res => {
if (!res.ok) {
console.error('NULM zoneSummary error', res.status);
nulmTarget.innerHTML = `<div class="alert alert-danger">Error loading NULM summary (${res.status})</div>`;
return Promise.reject(new Error('NULM fetch failed'));
}
return res.json();
})
.then(nulmData => {
console.log('NULM data loaded:', nulmData);
renderTable(nulmTarget, nulmData, 'NULM');
})
.catch(e => {
console.error('NULM error:', e);
nulmTarget.innerHTML = `<div class="alert alert-danger">Error: ${e.message}</div>`;
});
// NULM loading commented out
// fetch(`${apiBase}/zoneSummaryNULM?fromDate=${encodeURIComponent(fromDate)}&toDate=${encodeURIComponent(toDate)}`)
// .then(res => {
// if (!res.ok) {
// console.error('NULM zoneSummary error', res.status);
// nulmTarget.innerHTML = `<div class="alert alert-danger">Error loading NULM summary (${res.status})</div>`;
// return Promise.reject(new Error('NULM fetch failed'));
// }
// return res.json();
// })
// .then(nulmData => {
// console.log('NULM data loaded:', nulmData);
// renderTable(nulmTarget, nulmData, 'NULM');
// })
// .catch(e => {
// console.error('NULM error:', e);
// nulmTarget.innerHTML = `<div class="alert alert-danger">Error: ${e.message}</div>`;
// });
} catch (e) { } catch (e) {
parkTarget.innerHTML = `<div class="alert alert-danger">Error: ${e}</div>`; parkTarget.innerHTML = `<div class="alert alert-danger">Error: ${e}</div>`;
nulmTarget.innerHTML = `<div class="alert alert-danger">Error: ${e}</div>`;
// nulmTarget.innerHTML = `<div class="alert alert-danger">Error: ${e}</div>`; // NULM commented out
} }
} }
@ -565,9 +567,11 @@
// For Park: show park-wise summary; For NULM: show employee details directly // For Park: show park-wise summary; For NULM: show employee details directly
if (empType === 'Park') { if (empType === 'Park') {
loadParkWiseSummary(zone, category); loadParkWiseSummary(zone, category);
} else {
loadDetailed(empType, category, zone);
} }
// NULM branch commented out
// else {
// loadDetailed(empType, category, zone);
// }
return; return;
} }

Write Preview
Loading…
Cancel
Save