fixed the date issue on the vphreport and vphdashboard page

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;

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, ");
 			/*

src/main/java/com/gcc/commissionerreview/service/VphService.java

@@ -30,22 +30,22 @@ public class VphService {
     public List<Map<String, Object>> 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 ;
 
 
                                                 """;

src/main/resources/templates/modules/iecomplaintsreport.html

@@ -221,9 +221,11 @@
 
 								<th class="text-center">Before Image</th>
 								<th class="text-center">Complaint Created Date</th>
+								<th class="text-center">complaint Created Street</th>
 
 								<th class="text-center">After Image</th>
 								<th class="text-center">Completion Date</th>
+								<th class="text-center">Completion Street</th>
 							</tr>
 						</thead>
 
@@ -443,12 +445,15 @@
 </td>
 
 <td>${c.complaint_created_date}</td>
+<td>${c.complaint_street_name}</td>
 
 <td>
 ${c.after_image ? `<img src="${c.after_image}" width="80" class="preview-img" style="cursor:pointer">` : 'Pending'}
 </td>
 
 <td>${c.completion_date} </td>
+<td>${c.completion_street_name ? c.completion_street_name : 'Pending'}</td>
+
 
 </tr>
 `;

src/main/resources/templates/modules/vphreport.html

@@ -696,7 +696,7 @@
 
 						$("#visitorTable tbody").append(`
                     <tr>
-                        <td>${r.visitDate}</td>
+                        <td data-order="${r.actualDate}">${r.visitDate}</td>
                         <td>${r.Adult}</td>
                         <td>${r.Children}</td>
                         <td>${r.SeniorCitizen}</td>
@@ -719,7 +719,7 @@
 					// ✅ APPEND GRAND TOTAL ROW
 					$("#visitorTable tbody").append(`
                 <tr class="table-primary">
-                    <td>Grand Total</td>
+					   <td data-order="9999-12-31">Grand Total</td>
                     <td>${totalAdult}</td>
                     <td>${totalChildren}</td>
                     <td>${totalSenior}</td>

src/main/resources/templates/modules/vphreportdashboard.html

@@ -869,7 +869,9 @@
 						$("#totalBookedTable tbody").append(`
           <tr>
    
-<td class="nowrap">${formatDate(r.bookingDate)}</td>
+<td class="nowrap" data-order="${r.bookingDate}">
+    ${formatDate(r.bookingDate)}
+</td>
 	
 
 	<td>
@@ -901,7 +903,7 @@
 					// ✅ Grand Total Row
 					$("#totalBookedTable tbody").append(`
         <tr class="table-primary fw-bold">
-          <td>Grand Total</td>
+     <td data-order="9999-12-31">Grand Total</td>
           <td>${gTotalBookingCount}</td>
 		   <td>${gTotal}</td>
           <td>${gAdult}</td>
@@ -984,7 +986,9 @@
 						$("#totalVisitsTable tbody").append(`
           <tr>
    
-<td class="nowrap">${formatDate(r.bookingDate)}</td>
+<td class="nowrap" data-order="${r.bookingDate}">
+    ${formatDate(r.bookingDate)}
+</td>
 	
 
 	<td>
@@ -1023,7 +1027,7 @@
 					// ✅ Grand Total Row
 					$("#totalVisitsTable tbody").append(`
         <tr class="table-primary fw-bold">
-          <td>Grand Total</td>
+          <td data-order="9999-12-31">Grand Total</td>
           <td>${gTotalBookingCount}</td>
 		  <td>${gTotal}</td>
 		  <td>${gAcceptedPeople}</td>