From 21acaa100b0da6a9a982bacdf06415deeffb4e7f Mon Sep 17 00:00:00 2001
From: Hariprasath S <113695067+Hariprasath4022@users.noreply.github.com>
Date: Wed, 2 Sep 2026 16:27:17 +0530
Subject: [PATCH] Changes in Roadwar mis report

---
 .../configuration/DataSourceConfig.java       | 11 +++
 .../service/RoadWarService.java               | 30 +++++++
 .../modules/roadwarweb/misreport.html         | 81 +++++++++++++++++++
 3 files changed, 122 insertions(+)

diff --git a/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java b/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java
index 421b5ae..9d155d2 100644
--- a/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java
+++ b/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java
@@ -233,6 +233,17 @@ public class DataSourceConfig {
 		dataSource.setPassword(dbpassword);
 		return dataSource;
 	}
+	
+	//////////RoadWar //////////////////////
+	@Bean(name = "mysqlRoadWarDataSource")
+	public DataSource mysqlRoadWarDataSource() {
+		DriverManagerDataSource dataSource = new DriverManagerDataSource();
+		dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+		dataSource.setUrl("jdbc:mysql://" + host + "/gcc_roadwar");
+		dataSource.setUsername("root");
+		dataSource.setPassword(dbpassword);
+		return dataSource;
+	}
 
 	@Bean(name = "mysqlcowrspaceDataSource")
 	public DataSource mysqlCoworkspacebDataSource() {
diff --git a/src/main/java/com/gcc/commissionerreview/service/RoadWarService.java b/src/main/java/com/gcc/commissionerreview/service/RoadWarService.java
index f944aa5..4e3acbf 100644
--- a/src/main/java/com/gcc/commissionerreview/service/RoadWarService.java
+++ b/src/main/java/com/gcc/commissionerreview/service/RoadWarService.java
@@ -57,6 +57,10 @@ public class RoadWarService {
 	private String fileBaseUrl;
 	@Autowired
 	private JdbcTemplate jdbcTemplate;
+	
+	@Autowired
+	private JdbcTemplate roadwarjdbcTemplate;
+	
 	@Autowired
 	private Environment environment;
 	
@@ -65,6 +69,11 @@ public class RoadWarService {
 		this.jdbcTemplate = new JdbcTemplate(DataSource);
 	}
 	
+	@Autowired
+	public void setDataSource2(@Qualifier("mysqlRoadWarDataSource") DataSource DataSource) {
+		this.roadwarjdbcTemplate = new JdbcTemplate(DataSource);
+	}
+	
 	public RoadWarService(Environment environment) {
 
 		this.environment = environment;
@@ -931,6 +940,27 @@ public class RoadWarService {
 	        
 	        result.put("fileDetails", fileDetails);
 	        
+	        String roadId = String.valueOf(road.get("road_id"));
+	        //System.out.println("========Road id========="+roadId);
+	        List<Map<String, Object>> geolocdetails = roadwarjdbcTemplate.queryForList(
+	                "SELECT *, " +
+	                "CONCAT('" + fileBaseUrl + "/gccofficialapp/files', centre_img) AS centre_img_url " +
+	                "FROM centre_street_details " +
+	                "WHERE road_id = ? AND isactive = 1 AND isdelete = 0",
+	                roadId
+	        );
+	        // Replace null values with empty string
+	        for (Map<String, Object> row : geolocdetails) {
+	            for (Map.Entry<String, Object> entry : row.entrySet()) {
+	                if (entry.getValue() == null) {
+	                    entry.setValue("");
+	                }
+	            }
+	        }
+
+	        result.put("geolocdetails", geolocdetails);
+
+	        
 	        result.put("message", "Fetched Details Successfully");
 	        result.put("status", true);
 
diff --git a/src/main/resources/templates/modules/roadwarweb/misreport.html b/src/main/resources/templates/modules/roadwarweb/misreport.html
index b9aa4ed..7dceea8 100644
--- a/src/main/resources/templates/modules/roadwarweb/misreport.html
+++ b/src/main/resources/templates/modules/roadwarweb/misreport.html
@@ -1058,6 +1058,8 @@
                 
                 <div id="viewFileContainer"></div>  
                 
+                <div id="viewGeoLocContainer"></div> 
+                
                 <div class="text-center mt-3">
 				    <button type="button"
 				            id="btnDownloadPdf"
@@ -2715,6 +2717,85 @@ function fetchRoadWarDetails(refId) {
 	            fileContainer.html(html);
 	        }
 	        
+	        let GeoContainer = $("#viewGeoLocContainer");
+	        GeoContainer.empty();
+	        if (response.geolocdetails && response.geolocdetails.length > 0) {
+
+	        	            let html = `
+	        	                <h5 class="mt-4">GeoLocation Details</h5>
+	        	                <div class="row">
+	        	            `;
+
+	        	            $.each(response.geolocdetails, function(index, file) {
+
+	        	                let url = file.centre_img_url;
+	        	                let latitude = file.start_latitude || "";
+	        	                let longitude = file.start_longitude || "";
+	        	                
+	        	                
+	        	                html+=`<div class="mb-2">
+                                	<strong>Latitude:</strong> ${latitude}
+                                	</div>
+
+	                                <div class="mb-3">
+	                                    <strong>Longitude:</strong> ${longitude}
+	                                </div>`;
+	                                
+	                            if (url.trim() === "") {
+	                                // Image Not Available
+	                            	html += `
+	                                    <div class="col-md-2 col-4 mb-3 text-center">
+	                                        <div class="border rounded d-flex align-items-center justify-content-center"
+	                                             style="height:120px; width:100%; background:#f5f5f5;">
+	                                            <span class="text-muted">
+	                                                Image Not Available
+	                                            </span>
+	                                        </div>
+	                                    </div>
+	                                `;
+	                            } else {
+	                                let extension = url.split('.').pop().split('?')[0].toLowerCase();
+	                                // image/pdf
+	                                if (extension === "pdf") {
+
+	        	                    html += `
+	        	                    	 
+	        	                    
+	        	                        <div class="col-md-2 col-4 mb-3 text-center">
+	        	                    
+	        		                    	<div class="pdf-file-box" onclick="showPreview('${url}')">
+	        	
+	        		                       		PDF File ${index + 1}
+	        	
+	        		                  		 </div>        
+	        	                    
+	        	                        </div>
+	        	                    `;
+
+	        	                } else {
+
+	        	                    html += `
+	        	                        <div class="col-md-2 col-4 mb-3 text-center">
+
+	        	                            <img src="${url}"
+	        	                                 class="img-thumbnail"
+	        	                                 style="height:120px;width:100%;object-fit:cover;cursor:pointer;"
+	        	                                 onclick="showPreview('${url}')">
+
+	        	                        </div>
+	        	                    `;
+	        	                }
+	                            }  
+
+	        	                
+
+	        	            });
+
+	        	            html += "</div>";
+
+	        	            GeoContainer.html(html);
+	        	        }
+	        
 	        
 	        $('#titleModalLabel').text(`Road War Details - ${response.ref_id}`);