diff --git a/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java b/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java index 7bcaac9..62b8ddc 100644 --- a/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java +++ b/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java @@ -17,11 +17,12 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @EnableTransactionManagement public class DataSourceConfig { - // private static String host = "localhost:3306"; - // private static String dbpassword = "root"; + private static String host = "localhost:3306"; + private static String dbpassword = "root"; - private static String host = "gcc-facial-db-instance-1.cf48eqcciziq.ap-south-1.rds.amazonaws.com:3306"; - private static String dbpassword = "gcc-facial-password"; + // private static String host = + // "gcc-facial-db-instance-1.cf48eqcciziq.ap-south-1.rds.amazonaws.com:3306"; + // private static String dbpassword = "gcc-facial-password"; public static class MyDataSourceConfig { @Primary @@ -123,7 +124,7 @@ public class DataSourceConfig { public DataSource mysqlFlagPoleManagerSystemDataSource() { DriverManagerDataSource dataSource = new DriverManagerDataSource(); dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver"); - dataSource.setUrl("jdbc:mysql://" + host + "/gcc_flag_pole"); + dataSource.setUrl("jdbc:mysql://" + host + "/gcc_flag_pole07022026"); dataSource.setUsername("root"); dataSource.setPassword(dbpassword); return dataSource; diff --git a/src/main/java/com/gcc/commissionerreview/controller/FlagpolesApiController.java b/src/main/java/com/gcc/commissionerreview/controller/FlagpolesApiController.java index d567f99..a3c9804 100644 --- a/src/main/java/com/gcc/commissionerreview/controller/FlagpolesApiController.java +++ b/src/main/java/com/gcc/commissionerreview/controller/FlagpolesApiController.java @@ -48,9 +48,11 @@ public class FlagpolesApiController { @RequestParam String zone, @RequestParam(required = false) String status, @RequestParam(required = false) String fromDate, - @RequestParam(required = false) String toDate) { + @RequestParam(required = false) String toDate, + @RequestParam(required = false) String applicationType) { try { - List> data = flagpolesService.getRequestDetails(zone, status, fromDate, toDate); + List> data = flagpolesService.getRequestDetails(zone, status, fromDate, toDate, + applicationType); return Map.of("status", "success", "data", data); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/gcc/commissionerreview/service/FlagpolesService.java b/src/main/java/com/gcc/commissionerreview/service/FlagpolesService.java index 9948917..62d9e92 100644 --- a/src/main/java/com/gcc/commissionerreview/service/FlagpolesService.java +++ b/src/main/java/com/gcc/commissionerreview/service/FlagpolesService.java @@ -23,9 +23,9 @@ public class FlagpolesService { public List> getZoneWiseRequestCounts(String fromDate, String toDate, String applicationType) { StringBuilder sql = new StringBuilder("SELECT " + " s.zone, " + - " COUNT(u.id) as total_requests, " + - " SUM(CASE WHEN u.final_status = 'Approved' THEN 1 ELSE 0 END) as approved_count, " + - " SUM(CASE WHEN u.final_status = 'Rejected' THEN 1 ELSE 0 END) as rejected_count " + + " COUNT(DISTINCT u.id) as total_requests, " + + " COUNT(DISTINCT CASE WHEN u.final_status = 'Approved' THEN u.id END) as approved_count, " + + " COUNT(DISTINCT CASE WHEN u.final_status = 'Rejected' THEN u.id END) as rejected_count " + "FROM user_request_details u " + "JOIN street_details s ON u.id = s.user_req_id " + "LEFT JOIN application_type at ON u.application_type = at.id "); @@ -94,7 +94,8 @@ public class FlagpolesService { return finalResults; } - public List> getRequestDetails(String zone, String status, String fromDate, String toDate) { + public List> getRequestDetails(String zone, String status, String fromDate, String toDate, + String applicationType) { StringBuilder sql = new StringBuilder("SELECT " + " u.id, " + " u.refid, " + @@ -147,6 +148,11 @@ public class FlagpolesService { params.add(toDate); } + if (applicationType != null && !applicationType.isEmpty() && !applicationType.equalsIgnoreCase("OVERALL")) { + sql.append("AND at.type = ? "); + params.add(applicationType); + } + sql.append("GROUP BY u.id ORDER BY u.cdate DESC"); return jdbcTemplate.queryForList(sql.toString(), params.toArray()); diff --git a/src/main/resources/templates/modules/flagpoles/abstractreport.html b/src/main/resources/templates/modules/flagpoles/abstractreport.html index 65c5393..2749943 100644 --- a/src/main/resources/templates/modules/flagpoles/abstractreport.html +++ b/src/main/resources/templates/modules/flagpoles/abstractreport.html @@ -20,7 +20,8 @@ border: 1px solid #000; } - table.dataTable th { + table.dataTable th, + .table-dark th { background-color: #003366 !important; color: white; text-align: center !important; @@ -53,7 +54,7 @@
- +
@@ -120,26 +121,28 @@

Loading details...

- - - - - - - - - - - - - - - - - - - -
S.NoRef IDApplicant NameMobileApp TypeApp OptionInstall TypeEvent DescEvent DateStatusAction
+
+ + + + + + + + + + + + + + + + + + +
S.NoRef IDApplicant NameMobileApplication TypeEvent DescEvent DateStatusAction
+
@@ -265,7 +268,7 @@ const fromDate = document.getElementById("fromDate").value; const toDate = document.getElementById("toDate").value; - $('#detailsModalLabel').text(`${status} Requests for ${zone}`); + $('#detailsModalLabel').text(`${status} Requests for zone: ${zone}`); $('#detailsPageLoader').show(); // Clear previous table data if ($.fn.DataTable.isDataTable('#detailsTable')) { @@ -275,7 +278,12 @@ new bootstrap.Modal(document.getElementById('detailsModal')).show(); - fetch(`/commissionerreview/api/flagpoles/details?zone=${zone}&status=${status}&fromDate=${fromDate}&toDate=${toDate}`) + let url = `/commissionerreview/api/flagpoles/details?zone=${zone}&status=${status}&fromDate=${fromDate}&toDate=${toDate}`; + if (currentType && currentType !== 'OVERALL') { + url += `&applicationType=${currentType}`; + } + + fetch(url) .then(res => res.json()) .then(json => { $('#detailsPageLoader').hide(); @@ -302,7 +310,8 @@ function populateDetailsTable(data) { const tbody = $('#detailsTableBody'); tbody.empty(); - + // ${formatValue(row.application_option)} + // ${formatValue(row.installation_type)} data.forEach((row, index) => { tbody.append(` @@ -311,13 +320,12 @@ ${formatValue(row.applicant_name)} ${formatValue(row.mobile_number)} ${formatValue(row.application_type)} - ${formatValue(row.application_option)} - ${formatValue(row.installation_type)} + ${formatValue(row.event_desc)} ${formatValue(row.event_date)} ${formatValue(row.final_status)} - @@ -325,29 +333,46 @@ `); }); - $('#detailsTable').DataTable({ + var table = $('#detailsTable').DataTable({ dom: 'Bfrtip', + scrollX: true, buttons: [ 'excelHtml5', 'pdfHtml5' ] }); + + // Adjust columns after small delay to ensure modal transition ends + setTimeout(function () { + table.columns.adjust().draw(); + }, 200); } - function viewStreetDetails(requestId) { - $('#streetModalLabel').text(`Street Details for Request ID`); - $('#streetTableBody').html('Loading...'); - new bootstrap.Modal(document.getElementById('streetModal')).show(); + function viewStreetDetails(requestId, refId) { + $('#streetModalLabel').text(`Street Details for Request: ${refId}`); + + // Show modal + const modal = new bootstrap.Modal(document.getElementById('streetModal')); + modal.show(); + + // Destroy existing DataTable if it exists + if ($.fn.DataTable.isDataTable('#streetTable')) { + $('#streetTable').DataTable().destroy(); + } + + const tbody = $('#streetTableBody'); + tbody.empty(); + tbody.html('Loading...'); fetch(`/commissionerreview/api/flagpoles/street-details?requestId=${requestId}`) .then(res => res.json()) .then(json => { - const tbody = $('#streetTableBody'); tbody.empty(); if (json.status === "success" && json.data.length > 0) { - json.data.forEach(row => { + json.data.forEach((row, index) => { tbody.append(` + ${index + 1} ${formatValue(row.zone)} ${formatValue(row.ward)} ${formatValue(row.street_name)} @@ -356,13 +381,28 @@ `); }); + + // Initialize DataTable + var table = $('#streetTable').DataTable({ + dom: 'Bfrtip', + scrollX: true, + buttons: [ + 'excelHtml5', + 'pdfHtml5' + ] + }); + + // Adjust columns + setTimeout(function () { + table.columns.adjust().draw(); + }, 200); } else { - tbody.html('No street details found'); + tbody.html('No street details found'); } }) .catch(err => { console.error("Fetch Error:", err); - $('#streetTableBody').html('Failed to load data'); + tbody.html('Failed to load data'); }); } @@ -371,12 +411,18 @@ initDataTable(); // Bind search button click - $('#searchBtn').click(function () { + $('#searchBtn').click(function (e) { + e.preventDefault(); loadReport(); }); // Initial load loadReport(); + + // Fix DataTable alignment in modals + $('#detailsModal, #streetModal').on('shown.bs.modal', function () { + $.fn.dataTable.tables({ visible: true, api: true }).columns.adjust(); + }); }); @@ -389,20 +435,23 @@
- - - - - - - - - - - - - -
ZoneWardStreet NamePolesStatues
+
+ + + + + + + + + + + + + + +
S.NoZoneWardStreet NamePolesStatues
+