diff --git a/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java b/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java index 58f8cde..aec60c1 100644 --- a/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java +++ b/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java @@ -162,8 +162,8 @@ public class DataSourceConfig { public DataSource mysqlIEComplaintsDataSource() { DriverManagerDataSource dataSource = new DriverManagerDataSource(); dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver"); - // dataSource.setUrl("jdbc:mysql://" + host + "/gcc_ie_complaints"); - dataSource.setUrl("jdbc:mysql://" + host + "/gcc_ie_complaints_live"); + dataSource.setUrl("jdbc:mysql://" + host + "/gcc_ie_complaints"); + dataSource.setUsername("root"); dataSource.setPassword(dbpassword); return dataSource; diff --git a/src/main/java/com/gcc/commissionerreview/service/IeComplaintsService.java b/src/main/java/com/gcc/commissionerreview/service/IeComplaintsService.java index 19993b4..2dd78b4 100644 --- a/src/main/java/com/gcc/commissionerreview/service/IeComplaintsService.java +++ b/src/main/java/com/gcc/commissionerreview/service/IeComplaintsService.java @@ -461,6 +461,9 @@ public class IeComplaintsService { sql.append("cm.complaint_name, "); sql.append("cd.street_name, "); sql.append("cd.status, "); + sql.append("cd.street_name AS complaint_street_name, "); + sql.append("comp.street_name AS completion_street_name, "); + sql.append("DATE_FORMAT(cd.cdate,'%d-%m-%Y') AS complaint_created_date, "); sql.append("IFNULL(DATE_FORMAT(comp.cdate,'%d-%m-%Y'),'Pending') AS completion_date, "); /* diff --git a/src/main/java/com/gcc/commissionerreview/service/VphService.java b/src/main/java/com/gcc/commissionerreview/service/VphService.java index 0f6735f..55af856 100644 --- a/src/main/java/com/gcc/commissionerreview/service/VphService.java +++ b/src/main/java/com/gcc/commissionerreview/service/VphService.java @@ -30,22 +30,22 @@ public class VphService { public List> getVisitorCategory(String fromDate, String toDate) { String sql = """ - SELECT DATE_FORMAT(rd.visit_date,'%d-%m-%Y') AS visitDate, - COALESCE(SUM(CASE WHEN vac.user_type='Adult ' THEN vcd.no_of_people END),0) Adult, - COALESCE(SUM(CASE WHEN vac.user_type='Children [ below 10 year]' THEN vcd.no_of_people END),0) Children, - COALESCE(SUM(CASE WHEN vac.user_type='Senior Citizen [above 60+]' THEN vcd.no_of_people END),0) SeniorCitizen, - COALESCE(SUM(CASE WHEN vac.user_type='Students' THEN vcd.no_of_people END),0) Students, - COALESCE(SUM(CASE WHEN vac.user_type='Foreigner' THEN vcd.no_of_people END),0) Foreigner, - COALESCE(SUM(CASE WHEN vac.user_type='Physically challeged' THEN vcd.no_of_people END),0) PhysicallyChallenged, - COALESCE(SUM(vcd.no_of_people),0) TotalCount - FROM reg_details rd - LEFT JOIN visitor_count_details vcd ON rd.ref_id=vcd.ref_id - LEFT JOIN visit_amount_config vac ON vcd.user_type_id=vac.id - WHERE rd.booking_flag='B' - AND DATE(rd.visit_date) BETWEEN ? AND ? - GROUP BY rd.visit_date - ORDER BY rd.visit_date - """; + SELECT DATE_FORMAT(rd.visit_date,'%d-%m-%Y') AS visitDate,rd.visit_date AS actualDate, + COALESCE(SUM(CASE WHEN vac.user_type='Adult ' THEN vcd.no_of_people END),0) Adult, + COALESCE(SUM(CASE WHEN vac.user_type='Children [ below 10 year]' THEN vcd.no_of_people END),0) Children, + COALESCE(SUM(CASE WHEN vac.user_type='Senior Citizen [above 60+]' THEN vcd.no_of_people END),0) SeniorCitizen, + COALESCE(SUM(CASE WHEN vac.user_type='Students' THEN vcd.no_of_people END),0) Students, + COALESCE(SUM(CASE WHEN vac.user_type='Foreigner' THEN vcd.no_of_people END),0) Foreigner, + COALESCE(SUM(CASE WHEN vac.user_type='Physically challeged' THEN vcd.no_of_people END),0) PhysicallyChallenged, + COALESCE(SUM(vcd.no_of_people),0) TotalCount + FROM reg_details rd + LEFT JOIN visitor_count_details vcd ON rd.ref_id=vcd.ref_id + LEFT JOIN visit_amount_config vac ON vcd.user_type_id=vac.id + WHERE rd.booking_flag='B' + AND DATE(rd.visit_date) BETWEEN ? AND ? + GROUP BY rd.visit_date + ORDER BY rd.visit_date ASC + """; return jdbcTemplate.queryForList(sql, fromDate, toDate); } @@ -550,7 +550,7 @@ public class VphService { ON d.bookingDate = r.bookingDate - ORDER BY d.bookingDate; + ORDER BY d.bookingDate ; """; diff --git a/src/main/resources/templates/modules/iecomplaintsreport.html b/src/main/resources/templates/modules/iecomplaintsreport.html index 91995be..29ec397 100644 --- a/src/main/resources/templates/modules/iecomplaintsreport.html +++ b/src/main/resources/templates/modules/iecomplaintsreport.html @@ -221,9 +221,11 @@ Before Image Complaint Created Date + complaint Created Street After Image Completion Date + Completion Street @@ -443,12 +445,15 @@ ${c.complaint_created_date} +${c.complaint_street_name} ${c.after_image ? `` : 'Pending'} ${c.completion_date} +${c.completion_street_name ? c.completion_street_name : 'Pending'} + `; diff --git a/src/main/resources/templates/modules/vphreport.html b/src/main/resources/templates/modules/vphreport.html index ef85bb0..6aad94e 100644 --- a/src/main/resources/templates/modules/vphreport.html +++ b/src/main/resources/templates/modules/vphreport.html @@ -696,7 +696,7 @@ $("#visitorTable tbody").append(` - ${r.visitDate} + ${r.visitDate} ${r.Adult} ${r.Children} ${r.SeniorCitizen} @@ -719,7 +719,7 @@ // ✅ APPEND GRAND TOTAL ROW $("#visitorTable tbody").append(` - Grand Total + Grand Total ${totalAdult} ${totalChildren} ${totalSenior} diff --git a/src/main/resources/templates/modules/vphreportdashboard.html b/src/main/resources/templates/modules/vphreportdashboard.html index f3e1c52..c3a100c 100644 --- a/src/main/resources/templates/modules/vphreportdashboard.html +++ b/src/main/resources/templates/modules/vphreportdashboard.html @@ -869,7 +869,9 @@ $("#totalBookedTable tbody").append(` -${formatDate(r.bookingDate)} + + ${formatDate(r.bookingDate)} + @@ -901,7 +903,7 @@ // ✅ Grand Total Row $("#totalBookedTable tbody").append(` - Grand Total + Grand Total ${gTotalBookingCount} ${gTotal} ${gAdult} @@ -984,7 +986,9 @@ $("#totalVisitsTable tbody").append(` -${formatDate(r.bookingDate)} + + ${formatDate(r.bookingDate)} + @@ -1023,7 +1027,7 @@ // ✅ Grand Total Row $("#totalVisitsTable tbody").append(` - Grand Total + Grand Total ${gTotalBookingCount} ${gTotal} ${gAcceptedPeople}