From a6000efbb70dbdbd72fb79fd536ea1c86b510c71 Mon Sep 17 00:00:00 2001
From: Dizho A <dizhoananthan@gmail.com>
Date: Mon, 24 Aug 2026 12:09:50 +0530
Subject: [PATCH] first commit at GCC Shelter

---
 .../configuration/AppConfig.java              |   12 +-
 .../configuration/DataSourceConfig.java       |   26 +-
 .../controller/GccShelterController.java      |  360 +++
 .../controller/MainController.java            |   32 +
 .../ShelterInspectionController.java          |  258 ++
 .../service/GccShelterService.java            | 1181 +++++++
 .../service/MasterShelterService.java         |  139 +
 .../service/ShelterInspectionService.java     | 1419 +++++++++
 src/main/resources/application-dev.properties |    2 +-
 .../resources/application-prod.properties     |    2 +-
 src/main/resources/application.properties     |    3 +-
 .../modules/bulkwaste/bulkwastereport.html    |   72 +-
 .../shelterinspection/complaintlist.html      | 1891 +++++++++++
 .../modules/shelterinspection/dashboard.html  | 2809 +++++++++++++++++
 .../shelterinspection/meetinglist.html        | 1751 ++++++++++
 .../modules/shelterinspection/resucelist.html | 1848 +++++++++++
 .../shelterinspection/shelterlist.html        |  634 ++++
 .../modules/shelterinspection/visitlist.html  | 2147 +++++++++++++
 .../templates/modules/shelterpagereport.html  |  389 +++
 19 files changed, 14898 insertions(+), 77 deletions(-)
 create mode 100644 src/main/java/com/gcc/commissionerreview/controller/GccShelterController.java
 create mode 100644 src/main/java/com/gcc/commissionerreview/controller/ShelterInspectionController.java
 create mode 100644 src/main/java/com/gcc/commissionerreview/service/GccShelterService.java
 create mode 100644 src/main/java/com/gcc/commissionerreview/service/MasterShelterService.java
 create mode 100644 src/main/java/com/gcc/commissionerreview/service/ShelterInspectionService.java
 create mode 100644 src/main/resources/templates/modules/shelterinspection/complaintlist.html
 create mode 100644 src/main/resources/templates/modules/shelterinspection/dashboard.html
 create mode 100644 src/main/resources/templates/modules/shelterinspection/meetinglist.html
 create mode 100644 src/main/resources/templates/modules/shelterinspection/resucelist.html
 create mode 100644 src/main/resources/templates/modules/shelterinspection/shelterlist.html
 create mode 100644 src/main/resources/templates/modules/shelterinspection/visitlist.html
 create mode 100644 src/main/resources/templates/modules/shelterpagereport.html

diff --git a/src/main/java/com/gcc/commissionerreview/configuration/AppConfig.java b/src/main/java/com/gcc/commissionerreview/configuration/AppConfig.java
index 6426667..9ef9deb 100644
--- a/src/main/java/com/gcc/commissionerreview/configuration/AppConfig.java
+++ b/src/main/java/com/gcc/commissionerreview/configuration/AppConfig.java
@@ -11,7 +11,17 @@ import org.springframework.web.client.RestTemplate;
 @Component
 @ConfigurationProperties(prefix = "app")
 public class AppConfig {
-
+	
+	
+
+	public String shelterurl="https://gccservices.in/gccofficialapp/api/shelterinspection";
+	
+	public String sheltercomplainturl="https://gccservices.in/gccofficialapp/api/sheltercomplaint";
+	
+	public String sheltermeetingurl="https://gccservices.in/gccofficialapp/api/sheltersmcmeeting";
+	
+	public String shelterresuceurl="https://gccservices.in/gccofficialapp/api/shelterrescue";
+	
 
     @Bean
     public RestTemplate restTemplate() {
diff --git a/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java b/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java
index 2472fe3..421b5ae 100644
--- a/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java
+++ b/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java
@@ -17,8 +17,8 @@ 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";
@@ -278,5 +278,27 @@ public class DataSourceConfig {
 		dataSource.setPassword(dbpassword);
 		return dataSource;
 	}
+	
+	/////////////// Shelter Inspection /////////////////////
+	@Bean(name = "mysqlShelterinspectionDataSource")
+	public DataSource mysqlShelterinspectionDataSource() {
+		DriverManagerDataSource dataSource = new DriverManagerDataSource();
+		dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+		dataSource.setUrl("jdbc:mysql://" + host + "/gcc_night_shelter_inspection");
+		dataSource.setUsername("root");
+		dataSource.setPassword(dbpassword);
+		return dataSource;
+	}
+	
+	////////////////////////////// For Shelter ////////////////////////
+	@Bean(name = "mysqlShelterDataSource")
+	public DataSource mysqlShelterDataSource() {
+		DriverManagerDataSource dataSource = new DriverManagerDataSource();
+		dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+		dataSource.setUrl("jdbc:mysql://" + host + "/gcc_shelter");
+		dataSource.setUsername("root");
+		dataSource.setPassword(dbpassword);
+		return dataSource;
+	}
 
 }
diff --git a/src/main/java/com/gcc/commissionerreview/controller/GccShelterController.java b/src/main/java/com/gcc/commissionerreview/controller/GccShelterController.java
new file mode 100644
index 0000000..99eebec
--- /dev/null
+++ b/src/main/java/com/gcc/commissionerreview/controller/GccShelterController.java
@@ -0,0 +1,360 @@
+package com.gcc.commissionerreview.controller;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.HttpServerErrorException;
+import org.springframework.web.client.ResourceAccessException;
+import org.springframework.web.client.RestTemplate;
+
+import com.gcc.commissionerreview.configuration.AppConfig;
+import com.gcc.commissionerreview.service.MasterShelterService;
+import com.gcc.commissionerreview.service.GccShelterService;
+
+
+
+
+@RestController
+@RequestMapping("/commissionerreview/api/shelter")
+public class GccShelterController {
+
+    @Autowired
+    private GccShelterService shelterApiService;
+    
+    @Autowired
+    private MasterShelterService masterShelterService;
+    
+	private final RestTemplate restTemplate;
+	private final AppConfig appConfig;
+	
+	@Autowired  
+    public GccShelterController(RestTemplate restTemplate, AppConfig appConfig) {
+        this.restTemplate = restTemplate;
+        this.appConfig = appConfig;
+    }
+
+    @GetMapping("/shelterComplaintList")
+    public List<Map<String,Object>> shelterComplaintList(
+            @RequestParam(required=false) String fromDate,
+            @RequestParam(required=false) String toDate,
+            @RequestParam(required = false) String zone,
+            @RequestParam(required = false) String category) {
+        return shelterApiService.getShelterComplaintList(fromDate, toDate, zone, category);
+    }
+    
+    @GetMapping("/shelterComplaintDetails")
+    public List<Map<String, Object>> shelterComplaintDetails(
+            @RequestParam String uqid,
+            @RequestParam(required = false) String fromDate,
+            @RequestParam(required = false) String toDate) {
+        return shelterApiService.getShelterComplaintDetails(uqid, fromDate, toDate);
+    }
+    
+	 @GetMapping("/shelterComplaintMinDate")
+	 public String shelterComplaintMinDate() {
+	     return shelterApiService.getShelterComplaintMinDate();
+	 }
+    
+    @GetMapping("/shelterMeetingList")
+    public List<Map<String,Object>> shelterMeetingList(
+            @RequestParam(required=false) String fromDate,
+            @RequestParam(required=false) String toDate,
+            @RequestParam(required = false) String zone,
+            @RequestParam(required = false) String category) {
+        return shelterApiService.getShelterMeetingList(fromDate, toDate, zone, category);
+    }
+    
+    @GetMapping("/shelterMeetingDetails")
+    public List<Map<String, Object>> shelterMeetingDetails(
+            @RequestParam String uqid,
+            @RequestParam(required = false) String fromDate,
+            @RequestParam(required = false) String toDate) {
+        return shelterApiService.getShelterMeetingDetails(uqid, fromDate, toDate);
+    }
+    
+	 @GetMapping("/shelterMeetingMinDate")
+	 public String shelterMeetingMinDate() {
+	     return shelterApiService.getShelterMeetingMinDate();
+	 }
+    
+    @GetMapping("/shelterResuceList")
+    public List<Map<String,Object>> shelterResuceList(
+            @RequestParam(required=false) String fromDate,
+            @RequestParam(required=false) String toDate,
+            @RequestParam(required = false) String zone,
+            @RequestParam(required = false) String category) {
+        return shelterApiService.getShelterRescueList(fromDate, toDate, zone, category);
+    }
+    
+    @GetMapping("/shelterResuceDetails")
+    public List<Map<String, Object>> shelterResuceDetails(
+            @RequestParam String uqid,
+            @RequestParam(required = false) String fromDate,
+            @RequestParam(required = false) String toDate) {
+        return shelterApiService.getShelterRescueDetails(uqid, fromDate, toDate);
+    }
+    
+    @GetMapping("/shelterRescuedPeopleDetails")
+    public List<Map<String, Object>> getShelterRescuedPeopleDetails(
+            @RequestParam String surveyId,@RequestParam(required = false) String fromDate,
+            @RequestParam(required = false) String toDate) {
+        return shelterApiService.getShelterRescuedPeopleDetails(surveyId, fromDate, toDate);
+    }
+    
+	 @GetMapping("/shelterResuceMinDate")
+	 public String shelterResuceMinDate() {
+	     return shelterApiService.getShelterResuceMinDate();
+	 }
+    
+    
+    
+    @GetMapping("/complaintquestions")
+    public ResponseEntity<?> getcomplaintquestionsDetails(
+            @RequestParam("cid") String cid) {
+
+        try {
+
+            String apiUrl = appConfig.sheltercomplainturl + "/questions?cid=" + cid;
+
+            System.out.println("API URL for complaint questions: " + apiUrl);
+
+            ResponseEntity<Object> response = restTemplate.getForEntity( apiUrl, Object.class);
+            return ResponseEntity.status(response.getStatusCode()).body(response.getBody());
+
+        } 
+        
+        catch (HttpClientErrorException e) {
+            System.out.println("COmplaint Question API Client Error: " + e.getStatusCode());
+            return ResponseEntity.status(e.getStatusCode()).body(e.getResponseBodyAsString());
+        } 
+        
+        catch (HttpServerErrorException e) {
+            System.out.println("Complaint Question API Server Error: " + e.getStatusCode());
+            return ResponseEntity.status(e.getStatusCode()).body(e.getResponseBodyAsString());
+        } 
+        
+        catch (ResourceAccessException e) {
+            System.out.println("Complaint Question API Connection Error: " + e.getMessage());
+            return ResponseEntity.status(HttpStatus.BAD_GATEWAY)
+                    .body(
+                        Map.of(
+                            "status", false,
+                            "message",
+                            "Unable to connect to Complaint Question Master API."
+                        )
+                    );
+
+        } catch (Exception e) {
+
+            System.out.println("Complaint Question API Exception");
+
+            e.printStackTrace();
+
+            return ResponseEntity
+                    .status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .body(
+                        Map.of(
+                            "status", false,
+                            "message",
+                            "Unable to load complaint question details."
+                        )
+                    );
+        }
+    }
+    
+    @GetMapping("/meetingquestions")
+    public ResponseEntity<?> getmeetingquestionsDetails(
+            @RequestParam("cid") String cid) {
+
+        try {
+
+            String apiUrl =
+                    appConfig.sheltermeetingurl + "/questions?cid=" + cid;
+
+            System.out.println(
+                    "API URL for meeting questions: " + apiUrl
+            );
+
+            ResponseEntity<Object> response =
+                    restTemplate.getForEntity(
+                            apiUrl,
+                            Object.class
+                    );
+
+            return ResponseEntity
+                    .status(response.getStatusCode())
+                    .body(response.getBody());
+
+        } catch (HttpClientErrorException e) {
+
+            System.out.println(
+                    "Meeting Question API Client Error: " +
+                    e.getStatusCode()
+            );
+
+            return ResponseEntity
+                    .status(e.getStatusCode())
+                    .body(e.getResponseBodyAsString());
+
+        } catch (HttpServerErrorException e) {
+
+            System.out.println(
+                    "Meeting Question API Server Error: " +
+                    e.getStatusCode()
+            );
+
+            return ResponseEntity
+                    .status(e.getStatusCode())
+                    .body(e.getResponseBodyAsString());
+
+        } catch (ResourceAccessException e) {
+
+            System.out.println(
+                    "Meeting Question API Connection Error: " +
+                    e.getMessage()
+            );
+
+            return ResponseEntity
+                    .status(HttpStatus.BAD_GATEWAY)
+                    .body(
+                        Map.of(
+                            "status", false,
+                            "message",
+                            "Unable to connect to Meeting Question Master API."
+                        )
+                    );
+
+        } catch (Exception e) {
+
+            System.out.println(
+                    "Meeting Question API Exception"
+            );
+
+            e.printStackTrace();
+
+            return ResponseEntity
+                    .status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .body(
+                        Map.of(
+                            "status", false,
+                            "message",
+                            "Unable to load meeting question details."
+                        )
+                    );
+        }
+    }
+    
+    @GetMapping("/resucequestions")
+    public ResponseEntity<?> getresucequestionsDetails(
+            @RequestParam("cid") String cid) {
+
+        try {
+
+            String apiUrl =
+                    appConfig.shelterresuceurl + "/questions?cid=" + cid;
+
+            System.out.println(
+                    "API URL for meeting questions: " + apiUrl
+            );
+
+            ResponseEntity<Object> response =
+                    restTemplate.getForEntity(
+                            apiUrl,
+                            Object.class
+                    );
+
+            return ResponseEntity
+                    .status(response.getStatusCode())
+                    .body(response.getBody());
+
+        } catch (HttpClientErrorException e) {
+
+            System.out.println(
+                    "Resuce Question API Client Error: " +
+                    e.getStatusCode()
+            );
+
+            return ResponseEntity
+                    .status(e.getStatusCode())
+                    .body(e.getResponseBodyAsString());
+
+        } catch (HttpServerErrorException e) {
+
+            System.out.println(
+                    "Resuce Question API Server Error: " +
+                    e.getStatusCode()
+            );
+
+            return ResponseEntity
+                    .status(e.getStatusCode())
+                    .body(e.getResponseBodyAsString());
+
+        } catch (ResourceAccessException e) {
+
+            System.out.println(
+                    "Resuce Question API Connection Error: " +
+                    e.getMessage()
+            );
+
+            return ResponseEntity
+                    .status(HttpStatus.BAD_GATEWAY)
+                    .body(
+                        Map.of(
+                            "status", false,
+                            "message",
+                            "Unable to connect to Resuce Question Master API."
+                        )
+                    );
+
+        } catch (Exception e) {
+
+            System.out.println(
+                    "Resuce Question API Exception"
+            );
+
+            e.printStackTrace();
+
+            return ResponseEntity
+                    .status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .body(
+                        Map.of(
+                            "status", false,
+                            "message",
+                            "Unable to load Resuce question details."
+                        )
+                    );
+        }
+    }
+    
+    
+    @GetMapping("/categories")
+    public List<String> getCategories() {
+        return masterShelterService.getCategoryList();
+    }
+
+    @GetMapping("/zones")
+    public List<String> getZones() {
+        return masterShelterService.getZoneList();
+    }
+    
+    @GetMapping("/cdos")
+    public List<Map<String, Object>> getCdos() {
+        return masterShelterService.getCdos();
+    }
+    
+    @GetMapping("/years")
+    public List<Integer> getYears() {
+        return masterShelterService.getAvailableYears();
+    }
+
+  
+}
diff --git a/src/main/java/com/gcc/commissionerreview/controller/MainController.java b/src/main/java/com/gcc/commissionerreview/controller/MainController.java
index 1b83664..4f1a105 100644
--- a/src/main/java/com/gcc/commissionerreview/controller/MainController.java
+++ b/src/main/java/com/gcc/commissionerreview/controller/MainController.java
@@ -387,5 +387,37 @@ public class MainController {
     public String bootreport(Model model) {
         return "modules/boatreport";
     }
+    
+    // Shelter Review Main Controller
+    
+    @GetMapping("/shelterpagereport")
+    public String ShelterPageReport(Model model) {
+        return "modules/shelterpagereport";
+    }
+    
+    @GetMapping("/shelterlist")
+    public String ShelterList() {
+        return "modules/shelterinspection/shelterlist";
+    }
+    
+    @GetMapping("/visitlist")
+    public String VisitList() {
+        return "modules/shelterinspection/visitlist";
+    }
+
+    @GetMapping("/complaintlist")
+    public String ComplaintList() {
+        return "modules/shelterinspection/complaintlist";
+    }
+    
+    @GetMapping("/meetinglist")
+    public String MeetingList() {
+        return "modules/shelterinspection/meetinglist";
+    }
+    
+    @GetMapping("/resucelist")
+    public String ResuceList() {
+        return "modules/shelterinspection/resucelist";
+    }
 
 }
diff --git a/src/main/java/com/gcc/commissionerreview/controller/ShelterInspectionController.java b/src/main/java/com/gcc/commissionerreview/controller/ShelterInspectionController.java
new file mode 100644
index 0000000..4b621f0
--- /dev/null
+++ b/src/main/java/com/gcc/commissionerreview/controller/ShelterInspectionController.java
@@ -0,0 +1,258 @@
+package com.gcc.commissionerreview.controller;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.HttpServerErrorException;
+import org.springframework.web.client.ResourceAccessException;
+import org.springframework.web.client.RestTemplate;
+
+import com.gcc.commissionerreview.configuration.AppConfig;
+import com.gcc.commissionerreview.service.MasterShelterService;
+import com.gcc.commissionerreview.service.ShelterInspectionService;
+
+
+
+
+@RestController
+@RequestMapping("/commissionerreview/api/shelterinspection")
+public class ShelterInspectionController {
+
+    @Autowired
+    private ShelterInspectionService shelterApiService;
+    
+    @Autowired
+    private MasterShelterService masterShelterService;
+    
+	private final RestTemplate restTemplate;
+	private final AppConfig appConfig;
+	
+	@Autowired  
+    public ShelterInspectionController(RestTemplate restTemplate, AppConfig appConfig) {
+        this.restTemplate = restTemplate;
+        this.appConfig = appConfig;
+    }
+    
+    //private final RestTemplate restTemplate = new RestTemplate();
+    
+    @GetMapping("/Sheltercount")
+    public ResponseEntity<Map<String, Object>> getTotalCount() {
+
+        int count = shelterApiService.getTotalShelterCount();
+
+        Map<String, Object> response = new HashMap<>();
+        response.put("totalShelterCount", count);
+
+        return ResponseEntity.ok(response);
+    }
+    
+    @GetMapping("/dashboard")
+    public Map<String,Object> dashboard(
+            @RequestParam String type,
+            @RequestParam String value){
+
+        return shelterApiService.getDashboardData(type,value);
+    }
+    
+    @GetMapping("/top5Shelters")
+    public List<Map<String,Object>> top5Shelters(
+            @RequestParam String type,
+            @RequestParam String value){
+
+        return shelterApiService.getTop5Shelters(type,value);
+    }
+    
+    @GetMapping("/regionSummary")
+    public List<Map<String,Object>> regionSummary(
+            @RequestParam String type,
+            @RequestParam String value){
+
+        return shelterApiService.getRegionSummary(type,value);
+    }
+    
+    @GetMapping("/fundReceivedSummary")
+    public List<Map<String,Object>> fundSummary(
+            @RequestParam String type,
+            @RequestParam String value){
+
+        return shelterApiService.getFundReceivedSummary(type,value);
+    }
+    
+    @GetMapping("/fundReceivedShelterDetails")
+    public List<Map<String, Object>> fundReceivedShelterDetails(
+            @RequestParam String type,
+            @RequestParam String value) {
+
+        return shelterApiService.getFundReceivedShelterDetails( type, value);
+    }
+    
+    @GetMapping("/monthlyTrends")
+    public List<Map<String,Object>> monthlyTrends(
+            @RequestParam String type,
+            @RequestParam String value){
+
+        return shelterApiService.getMonthlyTrends(type,value);
+    }
+    
+    @GetMapping("/weeklyVisits")
+    public List<Map<String,Object>> weeklyVisits(
+            @RequestParam String type,
+            @RequestParam String value){
+    	
+    	List<Map<String,Object>> results = shelterApiService.getWeeklyVisits(type,value);
+    	System.out.println("Weekly Visits Results:" +results);
+
+        return results;
+    }
+    
+    @GetMapping("/latestVisitShelters")
+    public List<Map<String,Object>> latestVisitShelters(
+            @RequestParam String type,
+            @RequestParam String value){
+
+        return shelterApiService.getLatestVisitShelters(type,value);
+    }
+ 
+    
+    @GetMapping("/shelterList")
+    public List<Map<String,Object>> shelterList(
+            @RequestParam(required = false) String zone,
+            @RequestParam(required = false) String category) {
+        return shelterApiService.getShelterList(zone, category);
+
+    }
+    
+    @GetMapping("/visitList")
+    public List<Map<String,Object>> visitList(
+            @RequestParam(required=false) String fromDate,
+            @RequestParam(required=false) String toDate,
+            @RequestParam(required=false) String zone,
+            @RequestParam(required=false) String cdo){
+
+        return shelterApiService.getVisitList( fromDate, toDate, zone, cdo);
+    }
+    
+    @GetMapping("/visitDetails")
+    public Map<String,Object> visitDetails(@RequestParam String surveyId){
+        return shelterApiService.getVisitDetails(surveyId);
+    }
+    
+	 @GetMapping("/shelterVisitMinDate")
+	 public String shelterResuceMinDate() {
+	     return shelterApiService.getShelterVisitMinDate();
+	 }
+    
+    @GetMapping("/questions")
+    public ResponseEntity<?> getquestionsDetails(
+            @RequestParam("cid") String cid) {
+
+        try {
+
+            String apiUrl =
+                    appConfig.shelterurl + "/questions?cid=" + cid;
+
+            System.out.println(
+                    "API URL for night inspection questions: " + apiUrl
+            );
+
+            ResponseEntity<Object> response =
+                    restTemplate.getForEntity(
+                            apiUrl,
+                            Object.class
+                    );
+
+            return ResponseEntity
+                    .status(response.getStatusCode())
+                    .body(response.getBody());
+
+        } catch (HttpClientErrorException e) {
+
+            System.out.println(
+                    "Question API Client Error: " +
+                    e.getStatusCode()
+            );
+
+            return ResponseEntity
+                    .status(e.getStatusCode())
+                    .body(e.getResponseBodyAsString());
+
+        } catch (HttpServerErrorException e) {
+
+            System.out.println(
+                    "Question API Server Error: " +
+                    e.getStatusCode()
+            );
+
+            return ResponseEntity
+                    .status(e.getStatusCode())
+                    .body(e.getResponseBodyAsString());
+
+        } catch (ResourceAccessException e) {
+
+            System.out.println(
+                    "Question API Connection Error: " +
+                    e.getMessage()
+            );
+
+            return ResponseEntity
+                    .status(HttpStatus.BAD_GATEWAY)
+                    .body(
+                        Map.of(
+                            "status", false,
+                            "message",
+                            "Unable to connect to Question Master API."
+                        )
+                    );
+
+        } catch (Exception e) {
+
+            System.out.println(
+                    "Question API Exception"
+            );
+
+            e.printStackTrace();
+
+            return ResponseEntity
+                    .status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .body(
+                        Map.of(
+                            "status", false,
+                            "message",
+                            "Unable to load question details."
+                        )
+                    );
+        }
+    }
+    
+    
+    @GetMapping("/categories")
+    public List<String> getCategories() {
+        return masterShelterService.getCategoryList();
+    }
+
+    @GetMapping("/zones")
+    public List<String> getZones() {
+        return masterShelterService.getZoneList();
+    }
+    
+    @GetMapping("/cdos")
+    public List<Map<String, Object>> getCdos() {
+        return masterShelterService.getCdos();
+    }
+    
+    @GetMapping("/years")
+    public List<Integer> getYears() {
+        return masterShelterService.getAvailableYears();
+    }
+
+  
+}
diff --git a/src/main/java/com/gcc/commissionerreview/service/GccShelterService.java b/src/main/java/com/gcc/commissionerreview/service/GccShelterService.java
new file mode 100644
index 0000000..2e5b6dd
--- /dev/null
+++ b/src/main/java/com/gcc/commissionerreview/service/GccShelterService.java
@@ -0,0 +1,1181 @@
+package com.gcc.commissionerreview.service;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.sql.DataSource;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.core.env.Environment;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+@Service
+public class GccShelterService {
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+    
+    @Autowired
+    @Value("${fileBaseUrl}")
+
+    private String fileBaseUrl;
+    
+    public GccShelterService (Environment environment) {
+
+        this.fileBaseUrl = environment.getProperty("fileBaseUrl");
+    }
+
+    @Autowired
+    public void setDataSource(@Qualifier("mysqlShelterDataSource") DataSource dataSource) {
+        this.jdbcTemplate = new JdbcTemplate(dataSource);
+    }
+
+    private final RestTemplate restTemplate = new RestTemplate();
+
+    private static final String API_URL = "https://nightshelter.gccservices.in/api/shelters/";
+
+    
+	 // =========================================================
+	 // Shelter Complaint List
+	 // =========================================================
+	
+	 public List<Map<String, Object>> getShelterComplaintList( String fromDate,  String toDate, 
+			 	String zone, String category) {
+	
+	     ResponseEntity<List<Map<String, Object>>> response =
+	             restTemplate.exchange(
+	                     API_URL,
+	                     HttpMethod.GET,
+	                     null,
+	                     new ParameterizedTypeReference<List<Map<String, Object>>>() {
+	                     });
+	
+	     List<Map<String, Object>> apiList = response.getBody();
+	
+	     if (apiList == null) {
+	         return Collections.emptyList();
+	     }
+	
+	     // =========================================================
+	     // FILTER BY ZONE
+	     // =========================================================
+	
+	     if (zone != null && !zone.trim().isEmpty()) {
+	
+	         apiList = apiList.stream()
+	                 .filter(s ->
+	                         zone.equalsIgnoreCase(
+	                                 String.valueOf(s.get("zone"))
+	                         )
+	                 )
+	                 .collect(Collectors.toList());
+	     }
+	
+	     // =========================================================
+	     // FILTER BY CATEGORY
+	     // =========================================================
+	
+	     if (category != null && !category.trim().isEmpty()) {
+	
+	         apiList = apiList.stream()
+	                 .filter(s ->
+	                         category.equalsIgnoreCase(
+	                                 String.valueOf(s.get("category"))
+	                         )
+	                 )
+	                 .collect(Collectors.toList());
+	     }
+	
+	     List<Map<String, Object>> result = new ArrayList<>();
+	
+	
+	     // =========================================================
+	     // PROCESS EACH SHELTER
+	     // =========================================================
+	
+	     for (Map<String, Object> shelter : apiList) {
+	
+	         String uqid = String.valueOf( shelter.get("uqid") );
+	
+	         // =====================================================
+	         // TOTAL COMPLAINTS
+	         // COUNT DISTINCT SURVEY ID
+	         // =====================================================
+	
+	         StringBuilder complaintSql = new StringBuilder();
+	
+	         complaintSql.append("""
+	                 SELECT COUNT(DISTINCT s.survey_id)
+	
+	                 FROM surveyor_location_complaint_details s
+	
+	                 INNER JOIN shelter_complaint_response r
+	                         ON r.survey_id = s.survey_id
+	                        AND r.cby = s.loginId
+	                        AND r.isactive = 1
+	                        AND r.isdelete = 0
+	
+	                 WHERE s.shelter_id = ?
+	                 """);
+	
+	
+	         // =====================================================
+	         // PARAMETERS
+	         // =====================================================
+	
+	         List<Object> params = new ArrayList<>();
+	
+	         params.add(uqid);
+	
+	
+	         // =====================================================
+	         // FROM DATE
+	         // =====================================================
+	
+	         if (fromDate != null && !fromDate.isBlank()) {
+	             complaintSql.append( " AND DATE(r.cdate) >= ? " );
+	             params.add(fromDate);
+	         }
+	
+	
+	         // =====================================================
+	         // TO DATE
+	         // =====================================================
+	
+	         if (toDate != null && !toDate.isBlank()) {
+	             complaintSql.append( " AND DATE(r.cdate) <= ? " );
+	             params.add(toDate);
+	         }
+	
+	
+	         // =====================================================
+	         // EXECUTE QUERY
+	         // =====================================================
+	
+	         Integer totalComplaints =
+	                 jdbcTemplate.queryForObject(
+	                         complaintSql.toString(),
+	                         Integer.class,
+	                         params.toArray()
+	                 );
+	
+	
+	         // =====================================================
+	         // RESULT
+	         // =====================================================
+	
+	         Map<String, Object> row = new LinkedHashMap<>();
+	
+	         row.put( "uqid", uqid);
+	         row.put( "shelterName", shelter.get("shelter_name"));
+	         row.put( "zone", shelter.get("zone"));
+	         row.put( "category", shelter.get("category"));
+	         row.put(
+	                 "totalComplaints",
+	                 totalComplaints == null
+	                         ? 0
+	                         : totalComplaints
+	         );
+	
+	         result.add(row);
+	     }
+	
+	
+	     // =========================================================
+	     // SORT BY TOTAL COMPLAINTS - HIGH TO LOW
+	     // =========================================================
+	
+	     result.sort((a, b) ->
+	             Integer.compare(
+	                     ((Number) b.get("totalComplaints")).intValue(),
+	                     ((Number) a.get("totalComplaints")).intValue()
+	             )
+	     );
+	
+	
+	     return result;
+	 }
+
+	 
+	// =========================================================
+	// Shelter Complaint Details
+	// =========================================================
+
+	public List<Map<String, Object>> getShelterComplaintDetails(
+	        String uqid,
+	        String fromDate,
+	        String toDate) {
+
+
+	    // =========================================================
+	    // GET SHELTER DETAILS FROM API
+	    // =========================================================
+
+	    ResponseEntity<List<Map<String, Object>>> response =
+	            restTemplate.exchange(
+	                    API_URL,
+	                    HttpMethod.GET,
+	                    null,
+	                    new ParameterizedTypeReference<List<Map<String, Object>>>() {
+	                    });
+
+
+	    List<Map<String, Object>> apiList = response.getBody();
+
+
+	    if (apiList == null) {
+	        apiList = Collections.emptyList();
+	    }
+
+
+	    // =========================================================
+	    // FIND SHELTER NAME USING UQID
+	    // =========================================================
+
+	    String shelterName = "-";
+
+	    for (Map<String, Object> shelter : apiList) {
+
+	        String apiUqid = String.valueOf(shelter.get("uqid"));
+
+	        if (uqid.equalsIgnoreCase(apiUqid)) {
+	            shelterName =
+	                    String.valueOf(
+	                            shelter.get("shelter_name")
+	                    );
+	            break;
+	        }
+	    }
+
+
+	    // =========================================================
+	    // SQL
+	    // =========================================================
+
+	    StringBuilder sql = new StringBuilder();
+
+	    sql.append(" SELECT"
+	    		+ "	   r.survey_id,"
+	    		+ "	   ld.user_name AS cdo,"
+	    		+ "	   DATE(MAX(r.cdate)) AS complaint_date,"
+	    		+ ""
+	    		+ "	   MAX(CASE WHEN r.qid = 1 THEN r.answer END) AS qid_1,"
+	    		+ "	   MAX(CASE WHEN r.qid = 2 THEN r.answer END) AS qid_2,"
+	    		+ "	   MAX(CASE WHEN r.qid = 3 THEN CONCAT('"+fileBaseUrl+"/gccofficialapp/files', r.answer ) END) AS infrastructural_photo,"
+	    		+ ""
+	    		+ "	   MAX(CASE WHEN r.qid = 4 THEN r.answer END) AS qid_4,"
+	    		+ "	   MAX(CASE WHEN r.qid = 5 THEN r.answer END) AS qid_5,"
+	    		+ "	   MAX(CASE WHEN r.qid = 6 THEN CONCAT('"+fileBaseUrl+"/gccofficialapp/files', r.answer ) END) AS food_photo,"
+	    		+ ""
+	    		+ "	   MAX(CASE WHEN r.qid = 7 THEN r.answer END) AS qid_7,"
+	    		+ "	   MAX(CASE WHEN r.qid = 8 THEN r.answer END) AS qid_8,"
+	    		+ "	   MAX(CASE WHEN r.qid = 9 THEN CONCAT('"+fileBaseUrl+"/gccofficialapp/files', r.answer ) END) AS resident_photo,"
+	    		+ ""
+	    		+ "	   MAX(CASE WHEN r.qid = 10 THEN r.answer END) AS qid_10,"
+	    		+ "	   MAX(CASE WHEN r.qid = 11 THEN r.answer END) AS qid_11,"
+	    		+ "	   MAX(CASE WHEN r.qid = 12 THEN CONCAT('"+fileBaseUrl+"/gccofficialapp/files', r.answer ) END) AS maintenance_photo"
+	    		+ ""
+	    		+ "	   FROM shelter_complaint_response r"
+	    		+ ""
+	    		+ "	   INNER JOIN surveyor_location_complaint_details s"
+	    		+ "	      ON s.survey_id = r.survey_id"
+	    		+ "	      AND s.loginId = r.cby"
+	    		+ "	      AND s.shelter_id = ?"
+	    		+ ""
+	    		+ "	    INNER JOIN gcc_mobile_menus.login_details ld"
+	    		+ "	       ON ld.uid = r.cby"
+	    		+ ""
+	    		+ "	    WHERE r.isactive = 1"
+	    		+ "	         AND r.isdelete = 0"
+	    		+ "	         AND r.qid IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12) ");
+
+
+	    // =========================================================
+	    // PARAMETERS
+	    // =========================================================
+
+	    List<Object> params =
+	            new ArrayList<>();
+
+	    params.add(uqid);
+
+
+	    // =========================================================
+	    // FROM DATE
+	    // =========================================================
+
+	    if (fromDate != null && !fromDate.isBlank()) {
+	        sql.append( " AND DATE(r.cdate) >= ? " );
+	        params.add(fromDate);
+	    }
+
+	    // =========================================================
+	    // TO DATE
+	    // =========================================================
+
+	    if (toDate != null && !toDate.isBlank()) {
+	        sql.append( " AND DATE(r.cdate) <= ? " );
+	        params.add(toDate);
+	    }
+
+	    // =========================================================
+	    // GROUP BY + ORDER
+	    // =========================================================
+
+	    sql.append("""
+	            GROUP BY r.survey_id, ld.user_name, DATE(r.cdate)
+	            ORDER BY MAX(r.cdate) DESC
+	            """);
+
+
+	    // =========================================================
+	    // EXECUTE QUERY
+	    // =========================================================
+
+	    List<Map<String, Object>> list =
+	            jdbcTemplate.queryForList(
+	                    sql.toString(),params.toArray()
+	            );
+
+
+	    // =========================================================
+	    // RESULT
+	    // =========================================================
+
+	    List<Map<String, Object>> result = new ArrayList<>();
+
+	    int sno = 1;
+
+
+	    for (Map<String, Object> row : list) {
+
+	        Map<String, Object> data = new LinkedHashMap<>();
+
+	        data.put( "sno", sno++ );
+	        data.put( "surveyId", row.get("survey_id"));
+	        data.put( "shelterName", shelterName);
+	        data.put( "cdo", row.get("cdo"));
+	        data.put( "date", row.get("complaint_date"));
+	        data.put( "qid1", row.get("qid_1"));
+	        data.put( "qid2", row.get("qid_2"));
+	        data.put( "infrastructuralPhoto", row.get("infrastructural_photo"));
+	        
+	        data.put( "qid4", row.get("qid_4"));
+	        data.put( "qid5", row.get("qid_5"));
+	        data.put( "foodPhoto", row.get("food_photo"));  
+	        
+	        data.put( "qid7", row.get("qid_7"));
+	        data.put( "qid8", row.get("qid_8"));
+	        data.put( "residentPhoto", row.get("resident_photo"));  
+
+	        data.put( "qid10", row.get("qid_10"));
+	        data.put( "qid11", row.get("qid_11"));
+	        data.put( "maintenancePhoto", row.get("maintenance_photo"));
+
+
+	        result.add(data);
+	    }
+
+	    return result;
+	}
+	
+	// =========================================================
+	// GET MINIMUM COMPLAINT DATE
+	// Based on cdate
+	// =========================================================
+	public String getShelterComplaintMinDate() {
+
+	    String sql = """
+	        SELECT DATE(MIN(cdate))
+	        FROM shelter_complaint_response
+	        WHERE isactive = 1
+	          AND isdelete = 0
+	        """;
+
+	    String minDate = jdbcTemplate.queryForObject(sql, String.class);
+
+	    return minDate;
+	}
+
+	// =========================================================
+	// Shelter Meeting List
+	// =========================================================
+
+	public List<Map<String, Object>> getShelterMeetingList(
+	        String fromDate, String toDate, String zone, String category) {
+
+	    ResponseEntity<List<Map<String, Object>>> response =
+	            restTemplate.exchange(
+	                    API_URL,
+	                    HttpMethod.GET,
+	                    null,
+	                    new ParameterizedTypeReference<List<Map<String, Object>>>() {
+	                    });
+
+	    List<Map<String, Object>> apiList = response.getBody();
+
+	    if (apiList == null) {
+	        return Collections.emptyList();
+	    }
+
+
+	    // =========================================================
+	    // FILTER BY ZONE
+	    // =========================================================
+
+	    if (zone != null && !zone.trim().isEmpty()) {
+
+	        apiList = apiList.stream()
+	                .filter(s ->
+	                        zone.equalsIgnoreCase(
+	                                String.valueOf(s.get("zone"))
+	                        )
+	                )
+	                .collect(Collectors.toList());
+	    }
+
+
+	    // =========================================================
+	    // FILTER BY CATEGORY
+	    // =========================================================
+
+	    if (category != null && !category.trim().isEmpty()) {
+
+	        apiList = apiList.stream()
+	                .filter(s ->
+	                        category.equalsIgnoreCase(
+	                                String.valueOf(s.get("category"))
+	                        )
+	                )
+	                .collect(Collectors.toList());
+	    }
+
+
+	    List<Map<String, Object>> result = new ArrayList<>();
+
+
+	    // =========================================================
+	    // PROCESS EACH SHELTER
+	    // =========================================================
+
+	    for (Map<String, Object> shelter : apiList) {
+
+	        String uqid = String.valueOf( shelter.get("uqid") );
+
+
+	        // =====================================================
+	        // TOTAL MEETINGS
+	        // COUNT DISTINCT SURVEY ID
+	        // =====================================================
+
+	        StringBuilder meetingSql = new StringBuilder();
+
+	        meetingSql.append("""
+	                SELECT COUNT(DISTINCT s.survey_id)
+
+	                FROM surveyor_location_smc_meeting_details s
+
+	                INNER JOIN shelter_smc_meeting_response r
+	                        ON r.survey_id = s.survey_id
+	                       AND r.cby = s.loginId
+	                       AND r.isactive = 1
+	                       AND r.isdelete = 0
+
+	                WHERE s.shelter_id = ?
+	                """);
+
+
+	        // =====================================================
+	        // PARAMETERS
+	        // =====================================================
+
+	        List<Object> params = new ArrayList<>();
+
+	        params.add(uqid);
+
+
+	        // =====================================================
+	        // FROM DATE
+	        // =====================================================
+
+	        if (fromDate != null && !fromDate.isBlank()) {
+	            meetingSql.append( " AND DATE(r.cdate) >= ? " );
+	            params.add(fromDate);
+	        }
+
+
+	        // =====================================================
+	        // TO DATE
+	        // =====================================================
+
+	        if (toDate != null && !toDate.isBlank()) {
+	            meetingSql.append( " AND DATE(r.cdate) <= ? " );
+	            params.add(toDate);
+	        }
+
+
+	        // =====================================================
+	        // EXECUTE QUERY
+	        // =====================================================
+
+	        Integer totalMeetings =
+	                jdbcTemplate.queryForObject(
+	                        meetingSql.toString(),
+	                        Integer.class,
+	                        params.toArray()
+	                );
+
+
+	        // =====================================================
+	        // RESULT
+	        // =====================================================
+
+	        Map<String, Object> row = new LinkedHashMap<>();
+
+	        row.put( "uqid", uqid );
+	        row.put( "shelterName", shelter.get("shelter_name"));
+	        row.put( "zone", shelter.get("zone"));
+	        row.put( "category", shelter.get("category") );
+
+	        row.put(
+	                "totalMeetings",
+	                totalMeetings == null
+	                        ? 0
+	                        : totalMeetings
+	        );
+
+	        result.add(row);
+	    }
+
+	    // =========================================================
+	    // SORT BY TOTAL MEETINGS - HIGH TO LOW
+	    // =========================================================
+
+	    result.sort((a, b) ->
+	            Integer.compare(
+	                    ((Number) b.get("totalMeetings")).intValue(),
+	                    ((Number) a.get("totalMeetings")).intValue()
+	            )
+	    );
+
+	    return result;
+	}
+	
+	
+	// =========================================================
+	// Shelter Meeting Details
+	// =========================================================
+
+	public List<Map<String, Object>> getShelterMeetingDetails(
+	        String uqid, String fromDate, String toDate) {
+
+	    // =========================================================
+	    // GET SHELTER DETAILS FROM API
+	    // =========================================================
+
+	    ResponseEntity<List<Map<String, Object>>> response =
+	            restTemplate.exchange(
+	                    API_URL,
+	                    HttpMethod.GET,
+	                    null,
+	                    new ParameterizedTypeReference<List<Map<String, Object>>>() {
+	                    });
+
+	    List<Map<String, Object>> apiList = response.getBody();
+
+	    if (apiList == null) {
+	        apiList = Collections.emptyList();
+	    }
+
+	    // =========================================================
+	    // FIND SHELTER NAME USING UQID
+	    // =========================================================
+
+	    String shelterName = "-";
+
+	    for (Map<String, Object> shelter : apiList) {
+
+	        String apiUqid = String.valueOf(shelter.get("uqid"));
+
+	        if (uqid.equalsIgnoreCase(apiUqid)) {
+	            shelterName = String.valueOf(shelter.get("shelter_name"));
+	            break;
+	        }
+	    }
+
+
+	    // =========================================================
+	    // SQL
+	    // =========================================================
+
+	    StringBuilder sql = new StringBuilder();
+
+	    sql.append("SELECT"
+	    		+ "	   r.survey_id,"
+	    		+ "	   ld.user_name AS cdo,"
+	    		+ "	   DATE(MAX(r.cdate)) AS meeting_date,"
+	    		+ ""
+	    		+ "	   MAX(CASE WHEN r.qid = 2 THEN CONCAT('"+fileBaseUrl+"/gccofficialapp/files', r.answer ) END) AS meeting_photo,"
+	    		+ "	   MAX(CASE WHEN r.qid = 3 THEN r.answer END) AS qid_3,"
+	    		+ "	   MAX(CASE WHEN r.qid = 4 THEN r.answer END) AS qid_4,"
+	    		+ "	   MAX(CASE WHEN r.qid = 5 THEN r.answer END) AS qid_5,"
+	    		+ "	   MAX(CASE WHEN r.qid = 6 THEN r.answer END) AS qid_6"
+	    		+ ""
+	    		+ "	   FROM shelter_smc_meeting_response r"
+	    		+ ""
+	    		+ "	   INNER JOIN surveyor_location_smc_meeting_details s"
+	    		+ "	      ON s.survey_id = r.survey_id"
+	    		+ "	      AND s.loginId = r.cby"
+	    		+ "	      AND s.shelter_id = ?"
+	    		+ ""
+	    		+ "	   INNER JOIN gcc_mobile_menus.login_details ld"
+	    		+ "	       ON ld.uid = r.cby"
+	    		+ ""
+	    		+ "	   WHERE r.isactive = 1"
+	    		+ "	      AND r.isdelete = 0"
+	    		+ "	      AND r.qid IN (2, 3, 4, 5, 6)");
+
+
+	    // =========================================================
+	    // PARAMETERS
+	    // =========================================================
+
+	    List<Object> params = new ArrayList<>();
+
+	    params.add(uqid);
+
+
+	    // =========================================================
+	    // FROM DATE
+	    // =========================================================
+
+	    if (fromDate != null && !fromDate.isBlank()) {
+	        sql.append(" AND DATE(r.cdate) >= ? " );
+	        params.add(fromDate);
+	    }
+
+
+	    // =========================================================
+	    // TO DATE
+	    // =========================================================
+
+	    if (toDate != null && !toDate.isBlank()) {
+	        sql.append(" AND DATE(r.cdate) <= ? ");
+	        params.add(toDate);
+	    }
+
+
+	    // =========================================================
+	    // GROUP BY + ORDER
+	    // =========================================================
+
+	    sql.append("""
+	            GROUP BY r.survey_id, ld.user_name, DATE(r.cdate)
+	            ORDER BY MAX(r.cdate) DESC
+	            """);
+
+
+	    // =========================================================
+	    // EXECUTE QUERY
+	    // =========================================================
+
+	    List<Map<String, Object>> list =
+	            jdbcTemplate.queryForList(
+	                    sql.toString(),params.toArray()
+	            );
+
+
+	    // =========================================================
+	    // RESULT
+	    // =========================================================
+
+	    List<Map<String, Object>> result = new ArrayList<>();
+
+	    int sno = 1;
+
+	    for (Map<String, Object> row : list) {
+
+	        Map<String, Object> data = new LinkedHashMap<>();
+
+	        data.put( "sno", sno++ );
+	        data.put( "surveyId", row.get("survey_id"));
+	        data.put( "shelterName", shelterName);
+	        data.put( "cdo", row.get("cdo"));
+	        data.put( "date", row.get("meeting_date"));
+	        data.put( "meetingPhoto", row.get("meeting_photo"));
+	        data.put( "qid3", row.get("qid_3"));
+	        data.put( "qid4", row.get("qid_4"));
+	        data.put( "qid5", row.get("qid_5"));
+	        data.put( "qid6", row.get("qid_6"));
+
+	        result.add(data);
+	    }
+
+	    return result;
+	}
+	
+	// =========================================================
+	// GET MINIMUM MEETING DATE
+	// Based on cdate
+	// =========================================================
+	public String getShelterMeetingMinDate() {
+
+	    String sql = """
+	        SELECT DATE(MIN(cdate))
+	        FROM shelter_smc_meeting_response
+	        WHERE isactive = 1
+	          AND isdelete = 0
+	        """;
+
+	    String minDate = jdbcTemplate.queryForObject(sql, String.class);
+
+	    return minDate;
+	}
+	
+
+	
+
+	// =========================================================
+	// Shelter Rescue List
+	// =========================================================
+
+	public List<Map<String, Object>> getShelterRescueList(
+        	String fromDate, String toDate, String zone, String category) {
+
+	    ResponseEntity<List<Map<String, Object>>> response =
+	            restTemplate.exchange(
+	                    API_URL,
+	                    HttpMethod.GET,
+	                    null,
+	                    new ParameterizedTypeReference<List<Map<String, Object>>>() {
+	                    });
+
+	    List<Map<String, Object>> apiList = response.getBody();
+
+	    if (apiList == null) {
+	        return Collections.emptyList();
+	    }
+
+
+	    // =========================================================
+	    // FILTER BY ZONE
+	    // =========================================================
+
+	    if (zone != null && !zone.trim().isEmpty()) {
+
+	        apiList = apiList.stream()
+	                .filter(s ->
+	                        zone.equalsIgnoreCase(
+	                                String.valueOf(s.get("zone"))
+	                        )
+	                )
+	                .collect(Collectors.toList());
+	    }
+
+
+	    // =========================================================
+	    // FILTER BY CATEGORY
+	    // =========================================================
+
+	    if (category != null && !category.trim().isEmpty()) {
+
+	        apiList = apiList.stream()
+	                .filter(s ->
+	                        category.equalsIgnoreCase(
+	                                String.valueOf(s.get("category"))
+	                        )
+	                )
+	                .collect(Collectors.toList());
+	    }
+
+
+	    List<Map<String, Object>> result = new ArrayList<>();
+
+
+	    // =========================================================
+	    // PROCESS EACH SHELTER
+	    // =========================================================
+
+	    for (Map<String, Object> shelter : apiList) {
+
+	        String uqid = String.valueOf(shelter.get("uqid"));
+
+	        // =====================================================
+	        // TOTAL RESCUES
+	        // COUNT DISTINCT SURVEY ID
+	        // =====================================================
+
+	        StringBuilder rescueSql = new StringBuilder();
+
+	        rescueSql.append("""
+	                SELECT COUNT(DISTINCT s.survey_id)
+
+	                FROM surveyor_location_resuce_details s
+
+	                INNER JOIN shelter_resuce_response r
+	                        ON r.survey_id = s.survey_id
+	                       AND r.cby = s.loginId
+	                       AND r.isactive = 1
+	                       AND r.isdelete = 0
+
+	                WHERE s.shelter_id = ?
+	                """);
+
+
+	        // =====================================================
+	        // PARAMETERS
+	        // =====================================================
+
+	        List<Object> params = new ArrayList<>();
+
+	        params.add(uqid);
+
+
+	        // =====================================================
+	        // FROM DATE
+	        // =====================================================
+
+	        if (fromDate != null && !fromDate.isBlank()) {
+	            rescueSql.append( " AND DATE(r.cdate) >= ? ");
+	            params.add(fromDate);
+	        }
+
+
+	        // =====================================================
+	        // TO DATE
+	        // =====================================================
+
+	        if (toDate != null && !toDate.isBlank()) {
+	            rescueSql.append( " AND DATE(r.cdate) <= ? " );
+	            params.add(toDate);
+	        }
+
+
+	        // =====================================================
+	        // EXECUTE QUERY
+	        // =====================================================
+
+	        Integer totalResuces =
+	                jdbcTemplate.queryForObject(
+	                        rescueSql.toString(),
+	                        Integer.class,
+	                        params.toArray()
+	                );
+
+
+	        // =====================================================
+	        // RESULT
+	        // =====================================================
+
+	        Map<String, Object> row = new LinkedHashMap<>();
+
+	        row.put("uqid",uqid );
+	        row.put("shelterName",shelter.get("shelter_name"));
+	        row.put("zone",shelter.get("zone"));
+	        row.put("category", shelter.get("category"));
+	        row.put(
+	                "totalResuces",
+	                totalResuces == null
+	                        ? 0
+	                        : totalResuces
+	        );
+
+	        result.add(row);
+	    }
+
+
+	    // =========================================================
+	    // SORT BY TOTAL RESCUES - HIGH TO LOW
+	    // =========================================================
+
+	    result.sort((a, b) ->
+	            Integer.compare(
+	                    ((Number) b.get("totalResuces")).intValue(),
+	                    ((Number) a.get("totalResuces")).intValue()
+	            )
+	    );
+
+
+	    return result;
+	}
+	
+
+	
+	// =========================================================
+	// Shelter Rescue Details
+	// =========================================================
+
+	public List<Map<String, Object>> getShelterRescueDetails( String uqid, String fromDate, String toDate) {
+
+	    // =========================================================
+	    // GET SHELTER DETAILS FROM API
+	    // =========================================================
+
+	    ResponseEntity<List<Map<String, Object>>> response =
+	            restTemplate.exchange(
+	                    API_URL,
+	                    HttpMethod.GET,
+	                    null,
+	                    new ParameterizedTypeReference<List<Map<String, Object>>>() {
+	                    });
+
+	    List<Map<String, Object>> apiList = response.getBody();
+
+	    if (apiList == null) {
+	        apiList = Collections.emptyList();
+	    }
+
+
+	    // =========================================================
+	    // FIND SHELTER NAME USING UQID
+	    // =========================================================
+
+	    String shelterName = "-";
+
+	    for (Map<String, Object> shelter : apiList) {
+
+	        String apiUqid = String.valueOf(shelter.get("uqid"));
+	        if (uqid.equalsIgnoreCase(apiUqid)) {
+	            shelterName = String.valueOf(shelter.get("shelter_name"));
+	            break;
+	        }
+	    }
+
+
+	    // =========================================================
+	    // SQL
+	    // =========================================================
+
+	    StringBuilder sql = new StringBuilder();
+
+	    sql.append("SELECT"
+	    		+ "	       r.survey_id,"
+	    		+ "	       ld.user_name AS cdo,"
+	    		+ "	       DATE(MAX(r.cdate)) AS rescue_date,"
+	    		+ ""
+	    		+ "	       MAX(CASE WHEN r.qid = 1 THEN r.answer END) AS qid_1,"
+	    		+ "	       MAX(CASE WHEN r.qid = 2 THEN r.answer END) AS qid_2,"
+	    		+ "	       MAX(CASE WHEN r.qid = 3 THEN r.answer END) AS qid_3,"
+	    		+ "	       MAX(CASE WHEN r.qid = 4 THEN r.answer END) AS qid_4,"
+	    		+ "	       MAX(CASE WHEN r.qid = 5 THEN r.answer END) AS qid_5,"
+	    		+ "	       MAX(CASE WHEN r.qid = 11 THEN r.answer END) AS qid_11"
+	    		+ ""
+	    		+ "	   FROM shelter_resuce_response r"
+	    		+ ""
+	    		+ "	   INNER JOIN surveyor_location_resuce_details s"
+	    		+ "	     ON s.survey_id = r.survey_id"
+	    		+ "	     AND s.loginId = r.cby"
+	    		+ "	     AND s.shelter_id = ?"
+	    		+ ""
+	    		+ "	   INNER JOIN gcc_mobile_menus.login_details ld"
+	    		+ "	     ON ld.uid = r.cby"
+	    		+ ""
+	    		+ "	   WHERE r.isactive = 1"
+	    		+ "	     AND r.isdelete = 0"
+	    		+ "	     AND r.qid IN (1, 2, 3, 4, 5,  11)");
+
+
+	    // =========================================================
+	    // PARAMETERS
+	    // =========================================================
+
+	    List<Object> params = new ArrayList<>();
+
+	    params.add(uqid);
+
+
+	    // =========================================================
+	    // FROM DATE
+	    // =========================================================
+
+	    if (fromDate != null && !fromDate.isBlank()) {
+	        sql.append( " AND DATE(r.cdate) >= ? " );
+	        params.add(fromDate);
+	    }
+
+
+	    // =========================================================
+	    // TO DATE
+	    // =========================================================
+
+	    if (toDate != null && !toDate.isBlank()) {
+	        sql.append( " AND DATE(r.cdate) <= ? " );
+	        params.add(toDate);
+	    }
+
+
+	    // =========================================================
+	    // GROUP BY + ORDER
+	    // =========================================================
+
+	    sql.append("""
+	            GROUP BY r.survey_id, ld.user_name, DATE(r.cdate)
+	            ORDER BY MAX(r.cdate) DESC
+	            """);
+
+
+	    // =========================================================
+	    // EXECUTE QUERY
+	    // =========================================================
+
+	    List<Map<String, Object>> list =
+	            jdbcTemplate.queryForList(
+	                    sql.toString(),params.toArray()
+	            );
+
+	    // =========================================================
+	    // RESULT
+	    // =========================================================
+
+	    List<Map<String, Object>> result = new ArrayList<>();
+
+	    int sno = 1;
+
+	    for (Map<String, Object> row : list) {
+
+	        Map<String, Object> data = new LinkedHashMap<>();
+
+	        data.put( "sno", sno++ );
+	        data.put( "surveyId", row.get("survey_id"));
+	        data.put( "shelterName", shelterName);
+	        data.put( "cdo", row.get("cdo"));
+	        data.put( "date", row.get("rescue_date"));
+	        data.put( "qid1", row.get("qid_1"));
+	        data.put( "qid2", row.get("qid_2"));
+	        data.put( "qid3", row.get("qid_3"));
+	        data.put( "qid4", row.get("qid_4"));
+	        data.put( "qid5", row.get("qid_5"));
+	        data.put( "qid11", row.get("qid_11"));
+	        
+	        result.add(data);
+	    }
+
+	    return result;
+	}
+	
+	// =========================================================
+	// Shelter Rescued People Details
+	// =========================================================
+
+	public List<Map<String, Object>> getShelterRescuedPeopleDetails(
+	        String surveyId,
+	        String fromDate,
+	        String toDate) {
+
+	    StringBuilder sql = new StringBuilder();
+
+	    sql.append(" SELECT ")
+	       .append("    MAX(CASE WHEN qid = 7 THEN answer END) AS name, ")
+	       .append("    MAX(CASE WHEN qid = 8 THEN answer END) AS age, ")
+	       .append("    MAX(CASE WHEN qid = 9 THEN answer END) AS gender, ")
+	       .append("    MAX(CASE WHEN qid = 10 THEN answer END) AS shelter_assigned ")
+	       .append(" FROM ( ")
+	       .append("    SELECT id, qid, answer, ")
+	       .append("        SUM(CASE WHEN qid = 7 THEN 1 ELSE 0 END) ")
+	       .append("        OVER (ORDER BY id) AS person_no ")
+	       .append("    FROM shelter_rescue_family_response ")
+	       .append("    WHERE survey_id = ? ")
+	       .append("      AND isactive = 1 ")
+	       .append("      AND isdelete = 0 ")
+	       .append("      AND qid IN (7, 8, 9, 10) ");
+
+	    // =========================================================
+	    // FROM DATE
+	    // =========================================================
+
+	    List<Object> params = new ArrayList<>();
+
+	    params.add(surveyId);
+
+	    if (fromDate != null && !fromDate.isBlank()) {
+	        sql.append(" AND DATE(cdate) >= ? ");
+	        params.add(fromDate);
+	    }
+
+	    // =========================================================
+	    // TO DATE
+	    // =========================================================
+
+	    if (toDate != null && !toDate.isBlank()) {
+	        sql.append(" AND DATE(cdate) <= ? ");
+	        params.add(toDate);
+	    }
+
+	    // =========================================================
+	    // GROUP
+	    // =========================================================
+
+	    sql.append(" ) x ")
+	       .append(" GROUP BY person_no ")
+	       .append(" ORDER BY person_no ");
+
+	    // =========================================================
+	    // EXECUTE
+	    // =========================================================
+
+	    List<Map<String, Object>> list =
+	            jdbcTemplate.queryForList(
+	                    sql.toString(),
+	                    params.toArray()
+	            );
+
+	    // =========================================================
+	    // RESULT
+	    // =========================================================
+
+	    List<Map<String, Object>> result =
+	            new ArrayList<>();
+
+	    for (Map<String, Object> row : list) {
+
+	        Map<String, Object> data = new LinkedHashMap<>();
+
+	        data.put( "name", row.get("name") == null ? "-" : row.get("name"));
+	        data.put("age", row.get("age") == null ? "-" : row.get("age"));
+	        data.put("gender", row.get("gender") == null ? "-" : row.get("gender"));
+	        data.put("shelterAssigned", row.get("shelter_assigned") == null ? "-" : row.get("shelter_assigned"));
+
+	        result.add(data);
+	    }
+
+	    return result;
+	}
+
+	// =========================================================
+	// GET MINIMUM RESUCE DATE
+	// Based on cdate
+	// =========================================================
+	public String getShelterResuceMinDate() {
+
+	    String sql = """
+	        SELECT DATE(MIN(cdate))
+	        FROM shelter_resuce_response
+	        WHERE isactive = 1
+	          AND isdelete = 0
+	        """;
+
+	    String minDate = jdbcTemplate.queryForObject(sql, String.class);
+
+	    return minDate;
+	}
+
+
+
+}
diff --git a/src/main/java/com/gcc/commissionerreview/service/MasterShelterService.java b/src/main/java/com/gcc/commissionerreview/service/MasterShelterService.java
new file mode 100644
index 0000000..747e0dc
--- /dev/null
+++ b/src/main/java/com/gcc/commissionerreview/service/MasterShelterService.java
@@ -0,0 +1,139 @@
+package com.gcc.commissionerreview.service;
+
+
+import java.util.Collections;
+import java.util.Comparator;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import javax.sql.DataSource;
+
+
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.client.RestTemplate;
+
+@Service
+public class MasterShelterService {
+	
+	@Autowired
+	private JdbcTemplate jdbcTemplate;
+
+	@Autowired
+	public void setDataSource(@Qualifier("mysqlShelterinspectionDataSource") DataSource dataSource) {
+		this.jdbcTemplate = new JdbcTemplate(dataSource);
+	}
+	
+	
+    private final RestTemplate restTemplate = new RestTemplate();
+
+    private static final String API_URL = "https://nightshelter.gccservices.in/api/shelters/";
+
+    // Category Dropdown
+    
+    public List<String> getCategoryList() {
+
+        ResponseEntity<List<Map<String, Object>>> response =
+                restTemplate.exchange(
+                        API_URL,
+                        HttpMethod.GET,
+                        null,
+                        new ParameterizedTypeReference<List<Map<String, Object>>>() {});
+
+        List<Map<String, Object>> apiList = response.getBody();
+
+        if (apiList == null) {
+            return Collections.emptyList();
+        }
+
+        return apiList.stream()
+                .map(x -> String.valueOf(x.get("category")))
+                .filter(Objects::nonNull)
+                .distinct()
+                .sorted()
+                .collect(Collectors.toList());
+    }
+	
+    
+    //Zone Dropdown
+    
+    public List<String> getZoneList() {
+
+        ResponseEntity<List<Map<String, Object>>> response =
+                restTemplate.exchange(
+                        API_URL,
+                        HttpMethod.GET,
+                        null,
+                        new ParameterizedTypeReference<List<Map<String, Object>>>() {});
+
+        List<Map<String, Object>> apiList = response.getBody();
+
+        if (apiList == null) {
+            return Collections.emptyList();
+        }
+
+        return apiList.stream()
+                .map(x -> String.valueOf(x.get("zone")))
+                .filter(Objects::nonNull)
+                .distinct()
+                .sorted(Comparator.comparingInt(z ->
+                        Integer.parseInt(z.replaceAll("[^0-9]", ""))))
+                .collect(Collectors.toList());
+    }
+    
+   
+    
+    
+    //CDO Dropdown
+    
+    public List<Map<String,Object>> getCdos(){
+
+        String sql="""
+            SELECT DISTINCT
+                uid,
+                user_name
+            FROM login_details
+            ORDER BY user_name
+        """;
+
+        return jdbcTemplate.queryForList(sql);
+
+    }
+
+
+	
+    
+    // Year Dropdown
+    
+    public List<Integer> getAvailableYears() {
+
+        String sql = """
+            SELECT DISTINCT YEAR(cdate) AS year
+            FROM night_shelter_inspection_response
+            WHERE isactive = 1
+              AND isdelete = 0
+            ORDER BY YEAR(cdate) DESC
+        """;
+
+        return jdbcTemplate.queryForList(sql, Integer.class);
+    }
+   
+    
+    
+    // SHelter List
+    
+    
+    
+    
+
+}
diff --git a/src/main/java/com/gcc/commissionerreview/service/ShelterInspectionService.java b/src/main/java/com/gcc/commissionerreview/service/ShelterInspectionService.java
new file mode 100644
index 0000000..90d8a79
--- /dev/null
+++ b/src/main/java/com/gcc/commissionerreview/service/ShelterInspectionService.java
@@ -0,0 +1,1419 @@
+package com.gcc.commissionerreview.service;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.sql.DataSource;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+@Service
+public class ShelterInspectionService {
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    @Autowired
+    public void setDataSource(@Qualifier("mysqlShelterinspectionDataSource") DataSource dataSource) {
+        this.jdbcTemplate = new JdbcTemplate(dataSource);
+    }
+
+    private final RestTemplate restTemplate = new RestTemplate();
+
+    private static final String API_URL = "https://nightshelter.gccservices.in/api/shelters/";
+
+    public int getTotalShelterCount() {
+
+        ResponseEntity<List<Map<String, Object>>> response = restTemplate.exchange(
+                API_URL,
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<List<Map<String, Object>>>() {
+                });
+
+        List<Map<String, Object>> shelters = response.getBody();
+
+        return shelters != null ? shelters.size() : 0;
+    }
+
+    // Dashboard
+
+    public Map<String, Object> getDashboardData(String type, String value) {
+
+        Map<String, Object> response = new LinkedHashMap<>();
+
+        String dateCondition = "";
+
+        if ("day".equalsIgnoreCase(type)) {
+            dateCondition = " AND DATE(cdate) = ? ";
+        } else if ("month".equalsIgnoreCase(type)) {
+            dateCondition = " AND DATE_FORMAT(cdate,'%Y-%m') = ? ";
+        } else if ("year".equalsIgnoreCase(type)) {
+            dateCondition = " AND YEAR(cdate) = ? ";
+        }
+
+        String dashboardSql = """
+                SELECT
+
+                    COALESCE(SUM(CASE WHEN qid = 4 THEN CAST(answer AS UNSIGNED) END),0) AS totalResidents,
+
+                    COUNT(DISTINCT survey_id) AS numberOfVisits,
+
+                    COALESCE(SUM(CASE WHEN qid = 16 THEN CAST(answer AS UNSIGNED) END),0) AS rehabilitation,
+
+                    COALESCE(SUM(CASE WHEN qid = 17 THEN CAST(answer AS UNSIGNED) END),0) AS reintegration,
+
+                    COALESCE(SUM(CASE WHEN qid = 48 THEN CAST(answer AS UNSIGNED) END),0) AS entitlementAccess,
+
+                    COALESCE(SUM(CASE WHEN qid = 11 THEN CAST(answer AS UNSIGNED) END),0) AS leftWithInfo,
+
+                    COALESCE(SUM(CASE WHEN qid = 13 THEN CAST(answer AS UNSIGNED) END),0) AS leftWithoutInfo,
+
+                    COALESCE(SUM(CASE WHEN qid = 10 THEN CAST(answer AS UNSIGNED) END),0) AS deathCount
+
+                FROM night_shelter_inspection_response
+
+                WHERE isactive = 1
+                  AND isdelete = 0
+
+                """ + dateCondition;
+
+        if (dateCondition.isEmpty()) {
+            response.putAll(jdbcTemplate.queryForMap(dashboardSql));
+        } else {
+            response.putAll(jdbcTemplate.queryForMap(dashboardSql, value));
+        }
+
+        return response;
+    }
+
+    // Top 5 Shelter List
+
+    public List<Map<String, Object>> getTop5Shelters(String type, String value) {
+
+        ResponseEntity<List<Map<String, Object>>> response = restTemplate.exchange(
+                API_URL,
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<List<Map<String, Object>>>() {
+                });
+
+        List<Map<String, Object>> apiList = response.getBody();
+
+        if (apiList == null) {
+            return Collections.emptyList();
+        }
+
+        List<Map<String, Object>> result = new ArrayList<>();
+
+        // Date filter
+        StringBuilder dateCondition = new StringBuilder();
+
+        if ("day".equalsIgnoreCase(type)) {
+            dateCondition.append(" AND DATE(r.cdate) = ? ");
+        } else if ("month".equalsIgnoreCase(type)) {
+            dateCondition.append(" AND DATE_FORMAT(r.cdate,'%Y-%m') = ? ");
+        } else if ("year".equalsIgnoreCase(type)) {
+            dateCondition.append(" AND YEAR(r.cdate) = ? ");
+        }
+
+        for (Map<String, Object> shelter : apiList) {
+
+            String uqid = String.valueOf(shelter.get("uqid"));
+
+            String sql = """
+                    SELECT
+                        COALESCE(SUM(CAST(r.answer AS UNSIGNED)),0) AS totalResidents
+                    FROM night_shelter_inspection_response r
+                    WHERE r.qid = 4
+                      AND r.isactive = 1
+                      AND r.isdelete = 0
+                      AND EXISTS (
+                          SELECT 1
+                          FROM surveyor_location_details s
+                          WHERE s.loginId = r.cby
+                            AND s.shelter_id = ?
+                      )
+                    """ + dateCondition;
+
+            Integer residents;
+
+            if (dateCondition.length() == 0) {
+                residents = jdbcTemplate.queryForObject(
+                        sql,
+                        Integer.class,
+                        uqid);
+            } else {
+                residents = jdbcTemplate.queryForObject(
+                        sql,
+                        Integer.class,
+                        uqid,
+                        value);
+            }
+
+            Map<String, Object> row = new LinkedHashMap<>();
+
+            row.put("uqid", uqid);
+            row.put("shelterName", shelter.get("shelter_name"));
+            row.put("zone", shelter.get("zone"));
+            row.put("category", shelter.get("category"));
+            row.put("totalResidents", residents == null ? 0 : residents);
+
+            result.add(row);
+        }
+
+        result.sort((a, b) -> Integer.compare(
+                ((Number) b.get("totalResidents")).intValue(),
+                ((Number) a.get("totalResidents")).intValue()));
+
+        return result.stream()
+                .limit(5)
+                .collect(Collectors.toList());
+    }
+
+    // Region Summary
+
+    public List<Map<String, Object>> getRegionSummary(String type, String value) {
+
+        ResponseEntity<List<Map<String, Object>>> response = restTemplate.exchange(
+                API_URL,
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<List<Map<String, Object>>>() {
+                });
+
+        List<Map<String, Object>> apiData = response.getBody();
+
+        if (apiData == null) {
+            return Collections.emptyList();
+        }
+
+        String dateCondition = "";
+
+        if ("day".equalsIgnoreCase(type)) {
+            dateCondition = " AND DATE(r.cdate)=? ";
+        } else if ("month".equalsIgnoreCase(type)) {
+            dateCondition = " AND DATE_FORMAT(r.cdate,'%Y-%m')=? ";
+        } else if ("year".equalsIgnoreCase(type)) {
+            dateCondition = " AND YEAR(r.cdate)=? ";
+        }
+
+        StringBuilder sql = new StringBuilder();
+
+        sql.append("""
+                    SELECT
+                        s.shelter_id,
+
+                        COALESCE(
+                            SUM(
+                                CASE
+                                    WHEN r.qid = 4
+                                    THEN CAST(r.answer AS UNSIGNED)
+                                    ELSE 0
+                                END
+                            ),
+                            0
+                        ) AS totalResidents,
+
+                        COUNT(DISTINCT r.survey_id) AS totalVisits
+
+                    FROM surveyor_location_details s
+
+                    LEFT JOIN night_shelter_inspection_response r
+                           ON r.survey_id = s.survey_id
+                          AND r.cby = s.loginId
+                          AND r.isactive = 1
+                          AND r.isdelete = 0
+                """);
+
+        List<Object> params = new ArrayList<>();
+
+        if ("day".equalsIgnoreCase(type)) {
+
+            sql.append(" WHERE DATE(r.cdate)=? ");
+            params.add(value);
+
+        } else if ("month".equalsIgnoreCase(type)) {
+
+            sql.append(" WHERE DATE_FORMAT(r.cdate,'%Y-%m')=? ");
+            params.add(value);
+
+        } else if ("year".equalsIgnoreCase(type)) {
+
+            sql.append(" WHERE YEAR(r.cdate)=? ");
+            params.add(value);
+
+        }
+
+        sql.append("""
+                    GROUP BY s.shelter_id
+                """);
+
+        List<Map<String, Object>> dbData;
+
+        if (params.isEmpty()) {
+
+            dbData = jdbcTemplate.queryForList(sql.toString());
+
+        } else {
+
+            dbData = jdbcTemplate.queryForList(
+                    sql.toString(),
+                    params.toArray());
+
+        }
+
+        Map<String, Map<String, Object>> dbMap = new HashMap<>();
+
+        for (Map<String, Object> row : dbData) {
+            dbMap.put(
+                    String.valueOf(row.get("shelter_id")),
+                    row);
+        }
+
+        Map<String, Map<String, Object>> regionMap = new LinkedHashMap<>();
+
+        for (Map<String, Object> api : apiData) {
+
+            String uqid = String.valueOf(api.get("uqid"));
+            String region = String.valueOf(api.get("region"));
+
+            Map<String, Object> db = dbMap.get(uqid);
+
+            int residents = 0;
+            int visits = 0;
+
+            if (db != null) {
+                residents = ((Number) db.get("totalResidents")).intValue();
+                visits = ((Number) db.get("totalVisits")).intValue();
+            }
+
+            Map<String, Object> regionRow = regionMap.computeIfAbsent(region, k -> {
+
+                Map<String, Object> m = new LinkedHashMap<>();
+
+                m.put("region", region);
+                m.put("totalShelters", 0);
+                m.put("totalResidents", 0);
+                m.put("totalVisits", 0);
+
+                return m;
+
+            });
+
+            regionRow.put(
+                    "totalShelters",
+                    (Integer) regionRow.get("totalShelters") + 1);
+
+            regionRow.put(
+                    "totalResidents",
+                    (Integer) regionRow.get("totalResidents") + residents);
+
+            regionRow.put(
+                    "totalVisits",
+                    (Integer) regionRow.get("totalVisits") + visits);
+
+        }
+
+        return new ArrayList<>(regionMap.values());
+
+    }
+
+    // Fund Received Summary
+
+    public List<Map<String, Object>> getFundReceivedSummary(String type, String value) {
+
+        String dateCondition = "";
+
+        if ("day".equalsIgnoreCase(type)) {
+            dateCondition = " AND DATE(r.cdate)=? ";
+        } else if ("month".equalsIgnoreCase(type)) {
+            dateCondition = " AND DATE_FORMAT(r.cdate,'%Y-%m')=? ";
+        } else if ("year".equalsIgnoreCase(type)) {
+            dateCondition = " AND YEAR(r.cdate)=? ";
+        }
+
+        String sql = """
+                SELECT
+
+                    am.answer AS fund_type,
+                    COUNT(r.id) AS total
+
+                FROM night_shelter_inspection_answer_master am
+                LEFT JOIN night_shelter_inspection_response r
+
+                    ON CAST(r.answer AS UNSIGNED)=am.id
+                    AND r.qid=51
+                    AND r.isactive=1
+                    AND r.isdelete=0
+                """
+                + dateCondition +
+                """
+
+                        WHERE
+                            am.qid=51
+                            AND am.isactive=1
+                            AND am.isdelete=0
+
+                        GROUP BY
+                            am.id,
+                            am.answer
+
+                        ORDER BY
+                            am.orderby
+
+                        """;
+
+        if (dateCondition.isEmpty()) {
+            return jdbcTemplate.queryForList(sql);
+        } else {
+            return jdbcTemplate.queryForList(sql, value);
+        }
+
+    }
+
+    // Fund Recieved Total Details
+
+    public List<Map<String, Object>> getFundReceivedShelterDetails(
+            String type,
+            String value) {
+
+        /* Get shelter details from external API */
+        ResponseEntity<List<Map<String, Object>>> response = restTemplate.exchange(
+                API_URL,
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<List<Map<String, Object>>>() {
+                });
+
+        List<Map<String, Object>> apiList = response.getBody();
+
+        if (apiList == null) {
+            apiList = Collections.emptyList();
+        }
+
+        /* Create API shelter map using uqid */
+        Map<String, Map<String, Object>> shelterApiMap = new HashMap<>();
+
+        for (Map<String, Object> shelter : apiList) {
+            String uqid = String.valueOf(shelter.get("uqid"));
+            shelterApiMap.put(uqid, shelter);
+        }
+
+        /* Date filter */
+        String dateCondition = "";
+
+        if ("day".equalsIgnoreCase(type)) {
+            dateCondition = " AND DATE(r.cdate) = ? ";
+        } else if ("month".equalsIgnoreCase(type)) {
+            dateCondition = " AND DATE_FORMAT(r.cdate,'%Y-%m') = ? ";
+        } else if ("year".equalsIgnoreCase(type)) {
+            dateCondition = " AND YEAR(r.cdate) = ? ";
+        }
+
+        /*
+         * Get fund response + shelter mapping
+         *
+         * r.answer -> fund master id
+         * r.qid -> 51
+         * r.cby -> loginId
+         * r.survey_id -> survey_id
+         *
+         * surveyor_location_details:
+         * loginId -> r.cby
+         * survey_id -> r.survey_id
+         * shelter_id -> shelter
+         */
+        String sql = """
+                SELECT
+
+                    am.id AS fund_id,
+                    am.answer AS fund_type,
+
+                    r.id AS response_id,
+                    r.qid,
+                    r.cby,
+                    r.survey_id,
+
+                    s.loginId,
+                    s.survey_id AS location_survey_id,
+                    s.shelter_id
+
+                FROM night_shelter_inspection_response r
+
+                INNER JOIN night_shelter_inspection_answer_master am
+                    ON CAST(r.answer AS UNSIGNED) = am.id
+                    AND am.qid = 51
+                    AND am.isactive = 1
+                    AND am.isdelete = 0
+
+                INNER JOIN surveyor_location_details s
+                    ON s.loginId = r.cby
+                    AND s.survey_id = r.survey_id
+
+                WHERE r.qid = 51
+                  AND r.isactive = 1
+                  AND r.isdelete = 0
+                """
+                + dateCondition +
+                """
+
+                        ORDER BY am.orderby
+                        """;
+
+        /* Execute query */
+        List<Map<String, Object>> dbList;
+
+        if (dateCondition.isEmpty()) {
+            dbList = jdbcTemplate.queryForList(sql);
+        } else {
+            dbList = jdbcTemplate.queryForList(sql, value);
+        }
+
+        /* Group by Fund Type */
+        Map<String, Map<String, Object>> fundMap = new LinkedHashMap<>();
+
+        for (Map<String, Object> row : dbList) {
+
+            String fundId = String.valueOf(row.get("fund_id"));
+            String fundType = String.valueOf(row.get("fund_type"));
+            String shelterId = String.valueOf(row.get("shelter_id"));
+
+            // Create fund group
+
+            Map<String, Object> fundRow = fundMap.computeIfAbsent(
+                    fundId, k -> {
+
+                        Map<String, Object> map = new LinkedHashMap<>();
+
+                        map.put("fund_id", fundId);
+                        map.put("fund_type", fundType);
+                        map.put("total", 0);
+
+                        map.put("shelters", new ArrayList<Map<String, Object>>());
+
+                        return map;
+                    });
+
+            /*
+             * Existing total + 1
+             *
+             * This keeps the same meaning as:
+             * COUNT(r.id)
+             */
+            int total = ((Number) fundRow.get("total")).intValue();
+            fundRow.put("total", total + 1);
+
+            /* Shelter list */
+            @SuppressWarnings("unchecked")
+            List<Map<String, Object>> shelters = (List<Map<String, Object>>) fundRow.get("shelters");
+
+            // Avoid duplicate shelter in same fund type
+
+            boolean alreadyExists = shelters.stream()
+                    .anyMatch(
+                            x -> shelterId.equals(
+                                    String.valueOf(
+                                            x.get("shelter_id"))));
+
+            if (!alreadyExists) {
+
+                Map<String, Object> apiShelter = shelterApiMap.get(shelterId);
+
+                Map<String, Object> shelter = new LinkedHashMap<>();
+
+                shelter.put("shelter_id", shelterId);
+
+                if (apiShelter != null) {
+
+                    shelter.put("shelter_name", apiShelter.get("shelter_name"));
+                    shelter.put("zone", apiShelter.get("zone"));
+                    shelter.put("division", apiShelter.get("division"));
+                    shelter.put("shelter_type", apiShelter.get("shelter_type"));
+                    shelter.put("category", apiShelter.get("category"));
+
+                } else {
+
+                    shelter.put("shelter_name", "-");
+                    shelter.put("zone", "-");
+                    shelter.put("division", "-");
+                    shelter.put("shelter_type", "-");
+                    shelter.put("category", "-");
+                }
+
+                // Add DB details also
+
+                shelter.put("qid", row.get("qid"));
+                shelter.put("cby", row.get("cby"));
+                shelter.put("survey_id", row.get("survey_id"));
+                shelter.put("loginId", row.get("loginId"));
+                shelter.put("location_survey_id", row.get("location_survey_id"));
+
+                shelters.add(shelter);
+            }
+        }
+
+        return new ArrayList<>(fundMap.values());
+    }
+
+    // Monthly Trends
+
+    public List<Map<String, Object>> getMonthlyTrends(String type, String value) {
+
+        StringBuilder sql = new StringBuilder();
+
+        sql.append("""
+                    SELECT
+
+                        MONTH(cdate) AS month_no,
+
+                        DATE_FORMAT(cdate,'%b') AS month,
+
+                        COALESCE(SUM(
+                            CASE
+                                WHEN qid = 4
+                                THEN CAST(answer AS UNSIGNED)
+                            END
+                        ),0) AS residents,
+
+                        COALESCE(SUM(
+                            CASE
+                                WHEN qid = 16
+                                THEN CAST(answer AS UNSIGNED)
+                            END
+                        ),0) AS rehabilitated,
+
+                        COALESCE(SUM(
+                            CASE
+                                WHEN qid = 17
+                                THEN CAST(answer AS UNSIGNED)
+                            END
+                        ),0) AS reintegration,
+
+                        COALESCE(SUM(
+                            CASE
+                                WHEN qid = 10
+                                THEN CAST(answer AS UNSIGNED)
+                            END
+                        ),0) AS death
+
+                    FROM night_shelter_inspection_response
+
+                    WHERE isactive = 1
+                      AND isdelete = 0
+                """);
+
+        List<Object> params = new ArrayList<>();
+
+        if ("day".equalsIgnoreCase(type)) {
+
+            sql.append(" AND DATE(cdate)=? ");
+            params.add(value);
+
+        } else if ("month".equalsIgnoreCase(type)) {
+
+            sql.append(" AND DATE_FORMAT(cdate,'%Y-%m')=? ");
+            params.add(value);
+
+        } else if ("year".equalsIgnoreCase(type)) {
+
+            sql.append(" AND YEAR(cdate)=? ");
+            params.add(value);
+
+        }
+
+        sql.append("""
+                    GROUP BY
+                        MONTH(cdate),
+                        DATE_FORMAT(cdate,'%b')
+
+                    ORDER BY
+                        MONTH(cdate)
+                """);
+
+        List<Map<String, Object>> list;
+
+        if (params.isEmpty()) {
+
+            list = jdbcTemplate.queryForList(sql.toString());
+
+        } else {
+
+            list = jdbcTemplate.queryForList(
+                    sql.toString(),
+                    params.toArray());
+
+        }
+
+        for (Map<String, Object> row : list) {
+
+            int totalCount = ((Number) row.get("residents")).intValue()
+                    + ((Number) row.get("rehabilitated")).intValue()
+                    + ((Number) row.get("reintegration")).intValue()
+                    + ((Number) row.get("death")).intValue();
+
+            row.put("total_count", totalCount);
+
+        }
+
+        return list;
+
+    }
+
+    // CDO Week Visit
+
+    public List<Map<String, Object>> getWeeklyVisits(String type, String value) {
+
+        StringBuilder sql = new StringBuilder();
+
+        sql.append("""
+                    SELECT
+
+                        DAYOFWEEK(sld.cdate) AS day_no,
+
+                        DATE_FORMAT(sld.cdate,'%a') AS day_name,
+
+                        COUNT(DISTINCT sld.loginId) AS visits
+
+                    FROM surveyor_location_details sld
+
+                    INNER JOIN night_shelter_inspection_response nr
+                        ON nr.cby = sld.loginId
+
+                    WHERE
+                        sld.is_active = 1
+                        AND sld.is_delete = 0
+                """);
+
+        List<Object> params = new ArrayList<>();
+
+        if ("day".equalsIgnoreCase(type)) {
+
+            sql.append(" AND DATE(sld.cdate)=? ");
+            params.add(value);
+
+        } else if ("month".equalsIgnoreCase(type)) {
+
+            sql.append(" AND DATE_FORMAT(sld.cdate,'%Y-%m')=? ");
+            params.add(value);
+
+        } else if ("year".equalsIgnoreCase(type)) {
+
+            sql.append(" AND YEAR(sld.cdate)=? ");
+            params.add(value);
+
+        } else {
+
+            // Default - Current Week
+            sql.append(" AND YEARWEEK(sld.cdate,1)=YEARWEEK(CURDATE(),1) ");
+
+        }
+
+        sql.append("""
+                    GROUP BY
+                        DAYOFWEEK(sld.cdate),
+                        DATE_FORMAT(sld.cdate,'%a')
+
+                    ORDER BY
+                        DAYOFWEEK(sld.cdate)
+                """);
+
+        if (params.isEmpty()) {
+
+            return jdbcTemplate.queryForList(sql.toString());
+
+        }
+
+        return jdbcTemplate.queryForList(
+                sql.toString(),
+                params.toArray());
+
+    }
+
+    // Latest Visit Shelter
+
+    public List<Map<String, Object>> getLatestVisitShelters(
+            String type,
+            String value) {
+
+        ResponseEntity<List<Map<String, Object>>> response = restTemplate.exchange(
+                API_URL,
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<List<Map<String, Object>>>() {
+                });
+
+        List<Map<String, Object>> apiList = response.getBody();
+
+        if (apiList == null) {
+            return Collections.emptyList();
+        }
+
+        List<Map<String, Object>> result = new ArrayList<>();
+
+        for (Map<String, Object> shelter : apiList) {
+
+            String uqid = String.valueOf(shelter.get("uqid"));
+
+            StringBuilder sql = new StringBuilder();
+
+            sql.append("""
+                        SELECT
+
+                            ld.user_name,
+
+                            MAX(r.cdate) AS visit_date
+
+                        FROM night_shelter_inspection_response r
+
+                        INNER JOIN surveyor_location_details s
+                            ON r.cby = s.loginId AND r.survey_id = s.survey_id
+
+                        INNER JOIN gcc_mobile_menus.login_details ld
+                            ON ld.uid = s.loginId
+
+                        WHERE r.isactive = 1
+                          AND r.isdelete = 0
+                          AND s.shelter_id = ?
+                    """);
+
+            List<Object> params = new ArrayList<>();
+            params.add(uqid);
+
+            if ("day".equalsIgnoreCase(type)) {
+
+                sql.append(" AND DATE(r.cdate)=? ");
+                params.add(value);
+
+            } else if ("month".equalsIgnoreCase(type)) {
+
+                sql.append(" AND DATE_FORMAT(r.cdate,'%Y-%m')=? ");
+                params.add(value);
+
+            } else if ("year".equalsIgnoreCase(type)) {
+
+                sql.append(" AND YEAR(r.cdate)=? ");
+                params.add(value);
+
+            }
+
+            sql.append("""
+                        GROUP BY
+                            ld.user_name
+
+                        ORDER BY
+                            visit_date DESC
+
+                        LIMIT 1
+                    """);
+
+            List<Map<String, Object>> list = jdbcTemplate.queryForList(
+                    sql.toString(),
+                    params.toArray());
+
+            Map<String, Object> row = new LinkedHashMap<>();
+
+            row.put("shelterName", shelter.get("shelter_name"));
+            row.put("zone", shelter.get("zone"));
+
+            if (!list.isEmpty()) {
+
+                LocalDateTime visit = (LocalDateTime) list.get(0).get("visit_date");
+
+                row.put("userName",
+                        list.get(0).get("user_name"));
+
+                row.put("visitDate", visit);
+
+                row.put("date",
+                        visit.format(
+                                DateTimeFormatter.ofPattern("dd/MM/yyyy")));
+
+                row.put("time",
+                        visit.format(
+                                DateTimeFormatter.ofPattern("hh:mm a")));
+
+            } else {
+
+                row.put("userName", "-");
+                row.put("visitDate", null);
+                row.put("date", "-");
+                row.put("time", "-");
+
+            }
+
+            result.add(row);
+
+        }
+
+        result.sort((a, b) -> {
+
+            LocalDateTime t1 = (LocalDateTime) a.get("visitDate");
+            LocalDateTime t2 = (LocalDateTime) b.get("visitDate");
+
+            if (t1 == null && t2 == null)
+                return 0;
+
+            if (t1 == null)
+                return 1;
+
+            if (t2 == null)
+                return -1;
+
+            return t2.compareTo(t1);
+
+        });
+
+        return result.stream()
+                .limit(5)
+                .collect(Collectors.toList());
+
+    }
+
+    // SHelter List
+
+    public List<Map<String, Object>> getShelterList(String zone, String category) {
+
+        ResponseEntity<List<Map<String, Object>>> response = restTemplate.exchange(
+                API_URL,
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<List<Map<String, Object>>>() {
+                });
+
+        List<Map<String, Object>> apiList = response.getBody();
+
+        if (apiList == null) {
+            return Collections.emptyList();
+        }
+
+        // Filter by Zone
+        if (zone != null && !zone.trim().isEmpty()) {
+            apiList = apiList.stream()
+                    .filter(s -> zone.equalsIgnoreCase(String.valueOf(s.get("zone"))))
+                    .collect(Collectors.toList());
+        }
+
+        // Filter by Category
+        if (category != null && !category.trim().isEmpty()) {
+            apiList = apiList.stream()
+                    .filter(s -> category.equalsIgnoreCase(String.valueOf(s.get("category"))))
+                    .collect(Collectors.toList());
+        }
+
+        List<Map<String, Object>> result = new ArrayList<>();
+
+        for (Map<String, Object> shelter : apiList) {
+
+            String uqid = String.valueOf(shelter.get("uqid"));
+
+            // Total Residents
+            String residentSql = """
+                        SELECT
+                            COALESCE(SUM(
+                                CASE
+                                    WHEN r.qid = 4
+                                    THEN CAST(r.answer AS UNSIGNED)
+                                    ELSE 0
+                                END
+                            ),0)
+                        FROM surveyor_location_details s
+
+                        LEFT JOIN night_shelter_inspection_response r
+                               ON r.survey_id = s.survey_id
+                              AND r.cby = s.loginId
+                              AND r.isactive = 1
+                              AND r.isdelete = 0
+
+                        WHERE s.shelter_id = ?
+                    """;
+
+            Integer residents = jdbcTemplate.queryForObject(
+                    residentSql,
+                    Integer.class,
+                    uqid);
+
+            // Latest Visit
+            String latestVisitSql = """
+                        SELECT MAX(r.cdate)
+                        FROM surveyor_location_details s
+
+                        LEFT JOIN night_shelter_inspection_response r
+                               ON r.survey_id = s.survey_id
+                              AND r.cby = s.loginId
+                              AND r.isactive = 1
+                              AND r.isdelete = 0
+
+                        WHERE s.shelter_id = ?
+                    """;
+
+            LocalDateTime visitDate = jdbcTemplate.queryForObject(
+                    latestVisitSql,
+                    LocalDateTime.class,
+                    uqid);
+
+            String latestVisit = "-";
+
+            if (visitDate != null) {
+
+                LocalDate today = LocalDate.now();
+
+                if (visitDate.toLocalDate().isEqual(today)) {
+                    latestVisit = "Today";
+                } else if (visitDate.toLocalDate().isEqual(today.minusDays(1))) {
+                    latestVisit = "Yesterday";
+                } else {
+                    latestVisit = visitDate.format(
+                            DateTimeFormatter.ofPattern("dd/MM/yyyy"));
+                }
+            }
+
+            // Maintenance Status
+            String maintenanceSql = """
+                        SELECT
+                            SUM(CASE WHEN CAST(r.answer AS UNSIGNED) = 1 THEN 1 ELSE 0 END) AS answer1_count,
+                            SUM(CASE WHEN CAST(r.answer AS UNSIGNED) = 2 THEN 1 ELSE 0 END) AS answer2_count,
+                            SUM(CASE WHEN CAST(r.answer AS UNSIGNED) = 3 THEN 1 ELSE 0 END) AS answer3_count,
+                            SUM(CASE WHEN CAST(r.answer AS UNSIGNED) = 4 THEN 1 ELSE 0 END) AS answer4_count,
+
+                            MAX(CASE WHEN m.id = 1 THEN m.english_name END) AS well_maintained,
+                            MAX(CASE WHEN m.id = 2 THEN m.english_name END) AS averagely_maintained,
+                            MAX(CASE WHEN m.id = 3 THEN m.english_name END) AS poorly_maintained,
+                            MAX(CASE WHEN m.id = 4 THEN m.english_name END) AS extremely_bad
+
+                        FROM surveyor_location_details s
+
+                        LEFT JOIN night_shelter_inspection_response r
+                               ON r.survey_id = s.survey_id
+                              AND r.cby = s.loginId
+                              AND r.isactive = 1
+                              AND r.isdelete = 0
+                              AND r.qid BETWEEN 53 AND 58
+
+                        LEFT JOIN night_shelter_inspection_questions_master q
+                               ON q.qid = r.qid
+                              AND q.master_table_name = 'shelter_maintenance_master'
+                              AND q.isactive = 1
+                              AND q.isdelete = 0
+
+                        LEFT JOIN shelter_maintenance_master m
+                               ON m.id = CAST(r.answer AS UNSIGNED)
+                              AND m.isactive = 1
+                              AND m.isdelete = 0
+
+                        WHERE s.shelter_id = ?
+                    """;
+
+            Map<String, Object> maintenanceData = jdbcTemplate.queryForMap(maintenanceSql, uqid);
+
+            int answer1Count = maintenanceData.get("answer1_count") == null
+                    ? 0
+                    : ((Number) maintenanceData.get("answer1_count")).intValue();
+
+            int answer2Count = maintenanceData.get("answer2_count") == null
+                    ? 0
+                    : ((Number) maintenanceData.get("answer2_count")).intValue();
+
+            int answer3Count = maintenanceData.get("answer3_count") == null
+                    ? 0
+                    : ((Number) maintenanceData.get("answer3_count")).intValue();
+
+            int answer4Count = maintenanceData.get("answer4_count") == null
+                    ? 0
+                    : ((Number) maintenanceData.get("answer4_count")).intValue();
+
+            String maintenanceStatus = "Not Available";
+
+            if (answer1Count >= 4) {
+                maintenanceStatus = "Well maintained";
+            } else if (answer2Count >= 3) {
+                maintenanceStatus = "Averagely maintained";
+            } else if (answer3Count >= 2) {
+                maintenanceStatus = "Poorly maintained";
+            } else if (answer4Count >= 2) {
+                maintenanceStatus = "Extremely bad condition";
+            }
+
+            Map<String, Object> row = new LinkedHashMap<>();
+
+            row.put("uqid", uqid);
+            row.put("shelterName", shelter.get("shelter_name"));
+            row.put("zone", shelter.get("zone"));
+            row.put("category", shelter.get("category"));
+            row.put("totalResidents", residents == null ? 0 : residents);
+            row.put("latestVisit", latestVisit);
+
+            // NEW
+            row.put("maintenanceStatus", maintenanceStatus);
+
+            result.add(row);
+        }
+
+        result.sort((a, b) -> Integer.compare(
+                ((Number) b.get("totalResidents")).intValue(),
+                ((Number) a.get("totalResidents")).intValue()));
+
+        return result;
+    }
+
+    // Visit List
+    public List<Map<String, Object>> getVisitList(String fromDate, String toDate, String zone, String cdo) {
+
+        ResponseEntity<List<Map<String, Object>>> response = restTemplate.exchange(
+                API_URL,
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<List<Map<String, Object>>>() {
+                });
+
+        List<Map<String, Object>> apiShelters = response.getBody();
+
+        if (apiShelters == null) {
+            return Collections.emptyList();
+        }
+
+        StringBuilder sql = new StringBuilder();
+
+        sql.append("""
+                    SELECT
+                        r.survey_id,
+                        s.shelter_id,
+
+                        ld.uid,
+                        ld.user_name,
+                        MAX(r.cdate) AS visitDate,
+
+                        MAX(
+                            CASE
+                                WHEN r.qid = 19 AND r.answer = '19' THEN 'OK'
+                                WHEN r.qid = 19 AND r.answer = '20' THEN 'Issue'
+                            END
+                        ) AS food,
+
+                        CONCAT(
+                            MAX(
+                                CASE
+                                    WHEN r.qid = 3
+                                    THEN LENGTH(r.answer) - LENGTH(REPLACE(r.answer, ',', '')) + 1
+                                END
+                            ),
+                            '/5'
+                        ) AS staff,
+
+                    SUM(
+                        CASE
+                            WHEN r.qid BETWEEN 53 AND 58
+                                 AND CAST(r.answer AS UNSIGNED) = 1
+                            THEN 1
+                            ELSE 0
+                        END
+                    ) AS maintenance_1,
+
+
+                    SUM(
+                        CASE
+                            WHEN r.qid BETWEEN 53 AND 58
+                                 AND CAST(r.answer AS UNSIGNED) = 2
+                            THEN 1
+                            ELSE 0
+                        END
+                    ) AS maintenance_2,
+
+
+                    SUM(
+                        CASE
+                            WHEN r.qid BETWEEN 53 AND 58
+                                 AND CAST(r.answer AS UNSIGNED) = 3
+                            THEN 1
+                            ELSE 0
+                        END
+                    ) AS maintenance_3,
+
+
+                    SUM(
+                        CASE
+                            WHEN r.qid BETWEEN 53 AND 58
+                                 AND CAST(r.answer AS UNSIGNED) = 4
+                            THEN 1
+                            ELSE 0
+                        END
+                    ) AS maintenance_4
+
+
+                    FROM night_shelter_inspection_response r
+
+                    INNER JOIN surveyor_location_details s
+                  ON r.cby = s.loginId
+                  AND r.survey_id = s.survey_id
+
+                    INNER JOIN gcc_mobile_menus.login_details ld
+                        ON ld.uid = s.loginId
+
+                    WHERE r.isactive = 1
+                      AND r.isdelete = 0
+                """);
+
+        List<Object> params = new ArrayList<>();
+
+        if (fromDate != null && !fromDate.isBlank()) {
+            sql.append(" AND DATE(r.cdate) >= ? ");
+            params.add(fromDate);
+        }
+
+        if (toDate != null && !toDate.isBlank()) {
+            sql.append(" AND DATE(r.cdate) <= ? ");
+            params.add(toDate);
+        }
+
+        if (cdo != null && !cdo.isBlank()) {
+            sql.append(" AND ld.uid = ? ");
+            params.add(Integer.parseInt(cdo));
+        }
+
+        sql.append("""
+                    GROUP BY
+                        r.survey_id,
+                        s.shelter_id,
+                        ld.uid,
+                        ld.user_name
+
+                    ORDER BY
+                        visitDate DESC
+                """);
+
+        List<Map<String, Object>> dbList = jdbcTemplate.queryForList(sql.toString(), params.toArray());
+
+        List<Map<String, Object>> result = new ArrayList<>();
+
+        for (Map<String, Object> db : dbList) {
+
+            String shelterId = String.valueOf(db.get("shelter_id"));
+
+            Map<String, Object> api = apiShelters.stream()
+
+                    .filter(x -> shelterId.equals(String.valueOf(x.get("uqid"))))
+
+                    .findFirst()
+
+                    .orElse(null);
+
+            if (api == null)
+                continue;
+
+            String apiZone = String.valueOf(api.get("zone"));
+
+            if (zone != null && !zone.isBlank()
+                    && !zone.equalsIgnoreCase(apiZone)) {
+                continue;
+            }
+
+            LocalDateTime dt = (LocalDateTime) db.get("visitDate");
+
+            String date = "-";
+            String time = "-";
+
+            if (dt != null) {
+                date = dt.format(DateTimeFormatter.ofPattern("dd/MM/yyyy"));
+                time = dt.format(DateTimeFormatter.ofPattern("hh:mm a"));
+            }
+
+            // =========================
+            // MAINTENANCE COUNTS
+            // =========================
+
+            int maintenance1 = db.get("maintenance_1") == null
+                    ? 0
+                    : ((Number) db.get("maintenance_1"))
+                            .intValue();
+
+            int maintenance2 = db.get("maintenance_2") == null
+                    ? 0
+                    : ((Number) db.get("maintenance_2"))
+                            .intValue();
+
+            int maintenance3 = db.get("maintenance_3") == null
+                    ? 0
+                    : ((Number) db.get("maintenance_3"))
+                            .intValue();
+
+            int maintenance4 = db.get("maintenance_4") == null
+                    ? 0
+                    : ((Number) db.get("maintenance_4"))
+                            .intValue();
+
+            // =========================
+            // MAINTENANCE STATUS
+            // =========================
+
+            String maintenanceStatus = "Not Available";
+
+            if (maintenance1 >= 4) {
+                maintenanceStatus = "Well maintained";
+            } else if (maintenance2 >= 3) {
+                maintenanceStatus = "Averagely maintained";
+            } else if (maintenance3 >= 2) {
+                maintenanceStatus = "Poorly maintained";
+            } else if (maintenance4 >= 2) {
+                maintenanceStatus = "Extremely bad condition";
+            }
+
+            Map<String, Object> row = new LinkedHashMap<>();
+
+            row.put("surveyId", db.get("survey_id"));
+
+            row.put("shelterName", api.get("shelter_name"));
+            row.put("zone", api.get("zone"));
+            row.put("userName", db.get("user_name"));
+
+            row.put("date", date);
+            row.put("time", time);
+
+            row.put("food", db.get("food"));
+            row.put("staff", db.get("staff"));
+
+            row.put("maintenanceStatus", maintenanceStatus);
+
+            result.add(row);
+
+        }
+
+        return result;
+
+    }
+
+    // Visit Details for modal box
+
+    public Map<String, Object> getVisitDetails(String surveyId) {
+
+        ResponseEntity<List<Map<String, Object>>> response = restTemplate.exchange(
+                API_URL,
+                HttpMethod.GET,
+                null,
+                new ParameterizedTypeReference<List<Map<String, Object>>>() {
+                });
+
+        List<Map<String, Object>> apiShelters = response.getBody();
+
+        if (apiShelters == null) {
+            apiShelters = Collections.emptyList();
+        }
+
+        String sql = """
+                SELECT
+                    r.qid,
+                    r.answer,
+                    r.cdate,
+                    ld.user_name,
+                    s.shelter_id
+
+                FROM night_shelter_inspection_response r
+
+                INNER JOIN surveyor_location_details s
+                    ON s.loginId = r.cby
+
+                INNER JOIN gcc_mobile_menus.login_details ld
+                    ON ld.uid = s.loginId
+
+                WHERE r.survey_id = ?
+
+                ORDER BY r.qid
+                """;
+
+        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql, surveyId);
+
+        if (list.isEmpty()) {
+            return Collections.emptyMap();
+        }
+
+        Map<String, Object> first = list.get(0);
+
+        String shelterId = String.valueOf(first.get("shelter_id"));
+
+        Map<String, Object> api = apiShelters.stream()
+                .filter(x -> shelterId.equals(String.valueOf(x.get("uqid"))))
+                .findFirst()
+                .orElse(null);
+
+        Map<String, String> answers = new LinkedHashMap<>();
+
+        for (Map<String, Object> row : list) {
+
+            answers.put(
+                    String.valueOf(row.get("qid")),
+                    String.valueOf(row.get("answer")));
+        }
+
+        LocalDateTime dateTime = (LocalDateTime) first.get("cdate");
+
+        Map<String, Object> result = new LinkedHashMap<>();
+
+        result.put("surveyId", surveyId);
+
+        result.put("userName", first.get("user_name"));
+
+        result.put("date",
+                dateTime.format(
+                        DateTimeFormatter.ofPattern("dd/MM/yyyy")));
+
+        result.put("time",
+                dateTime.format(
+                        DateTimeFormatter.ofPattern("hh:mm a")));
+
+        if (api != null) {
+
+            result.put("region", api.get("region"));
+            result.put("zone", api.get("zone"));
+            result.put("division", api.get("division"));
+            result.put("uqid", api.get("uqid"));
+            result.put("shelterName", api.get("shelter_name"));
+            result.put("category", api.get("category"));
+            result.put("shelterType", api.get("shelter_type"));
+            result.put("latitude", api.get("latitude"));
+            result.put("longitude", api.get("longitude"));
+            result.put("address", api.get("address"));
+            result.put("image", api.get("image"));
+
+        }
+
+        result.put("answers", answers);
+
+        return result;
+
+    }
+    
+	// =========================================================
+	// GET MINIMUM MEETING DATE
+	// Based on cdate
+	// =========================================================
+	public String getShelterVisitMinDate() {
+
+	    String sql = """
+	        SELECT DATE(MIN(cdate))
+	        FROM night_shelter_inspection_response
+	        WHERE isactive = 1
+	          AND isdelete = 0
+	        """;
+
+	    String minDate = jdbcTemplate.queryForObject(sql, String.class);
+
+	    return minDate;
+	}
+
+}
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index 3fc6833..5546ddf 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -13,4 +13,4 @@ server.port=8078
 #secondary.datasource.username=FAS
 #secondary.datasource.password=FAS
 #secondary.datasource.driver-class-name=oracle.jdbc.OracleDriver
-fileBaseUrl=https://gccservices.in
\ No newline at end of file
+fileBaseUrl=https://gccservices.in
diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties
index d59c49f..a138386 100644
--- a/src/main/resources/application-prod.properties
+++ b/src/main/resources/application-prod.properties
@@ -35,4 +35,4 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 # OR for detailed debugging:
 #  logging.level.root=INFO
 
- fileBaseUrl=https://gccservices.in
\ No newline at end of file
+fileBaseUrl=https://gccservices.in
\ No newline at end of file
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index a015c68..196b48f 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1 +1,2 @@
-spring.profiles.active=prod
\ No newline at end of file
+spring.profiles.active=prod
+#spring.profiles.active=dev
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/bulkwaste/bulkwastereport.html b/src/main/resources/templates/modules/bulkwaste/bulkwastereport.html
index 37c8b40..6d26864 100644
--- a/src/main/resources/templates/modules/bulkwaste/bulkwastereport.html
+++ b/src/main/resources/templates/modules/bulkwaste/bulkwastereport.html
@@ -357,11 +357,7 @@
     let endDate   = $('#endDate').val();
     let category  = $('#categoryId').val();
 
-<!--    // ✅ first load → don't filter by date-->
-<!--    if (!isFilter) {-->
-<!--        startDate = "";-->
-<!--        endDate = "";-->
-<!--    }-->
+
 
    // ✅ correct validation
     if (isFilter) {
@@ -1191,73 +1187,7 @@ function renderBulkRequestCards(data) {
     loadZoneReport(false);
 }
 
-<!--    function loadDefaultDate() {-->
-
-<!--    // ✅ fixed launch date-->
-<!--    let d = "2026-03-10";-->
-
-<!--     // today date-->
-<!--    let today = new Date().toISOString().split('T')[0];-->
-
-<!--    // set value-->
-<!--    $('#startDate').val(d);-->
-<!--    $('#endDate').val(today);-->
-
-<!--    // set min date (cannot select before launch)-->
-<!--    $('#startDate').attr('min', start);-->
-<!--    $('#endDate').attr('min', start);-->
-
-<!--    // max = today-->
-<!--    // max date-->
-<!--    $('#startDate, #endDate').attr('max', today);-->
-
-<!--    // trigger validation-->
-<!--    $('#startDate').trigger('change');-->
-
-<!--    // store default-->
-<!--    $('#startDate').data('defaultDate', start);-->
-<!--    $('#endDate').data('defaultDate', today);-->
-
-<!--    // load table without filter-->
-<!--    loadZoneReport(false);-->
-<!--}-->
-
-<!--    function loadDefaultDate() {-->
-
-<!--        $.ajax({-->
-<!--            url: '/commissionerreview/api/bulkwaste/getMinDate',-->
-<!--            method: 'GET',-->
-
-<!--            success: function(res){-->
-<!--                if(res.status === "Success"){-->
-
-<!--                 let d = res.date;-->
-
-<!--                // set value first-->
-<!--                $('#startDate').val(d);-->
-
-<!--                // set min date-->
-<!--                $('#startDate').attr('min', d);-->
-<!--                $('#endDate').attr('min', d);-->
-
-<!--                // also set max today (safe)-->
-<!--                const today = new Date().toISOString().split('T')[0];-->
-<!--                $('#startDate, #endDate').attr('max', today);-->
-
-<!--                // force refresh validation-->
-<!--                $('#startDate').trigger('change');-->
-
-<!--                // store default-->
-<!--                $('#startDate').data('defaultDate', d);-->
-
-<!--                // load table without filter-->
-<!--                loadZoneReport(false);-->
-
-<!--                }-->
-<!--            }-->
-<!--        });-->
 
-<!--    }-->
 
   function loadCategoryList() {
 
diff --git a/src/main/resources/templates/modules/shelterinspection/complaintlist.html b/src/main/resources/templates/modules/shelterinspection/complaintlist.html
new file mode 100644
index 0000000..f40d098
--- /dev/null
+++ b/src/main/resources/templates/modules/shelterinspection/complaintlist.html
@@ -0,0 +1,1891 @@
+
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+
+<head>
+    <title>Shelter Complaint List</title>
+
+    <!-- Bootstrap 5 CSS -->
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/css/bootstrap.min.css" rel="stylesheet">
+    <!-- FontAwesome CSS for icons -->
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css" rel="stylesheet">
+    <!-- DataTables CSS -->
+    <link href="https://cdn.datatables.net/1.13.4/css/jquery.dataTables.min.css" rel="stylesheet" />
+    <link href="https://cdn.datatables.net/buttons/2.3.6/css/buttons.dataTables.min.css" rel="stylesheet" />
+
+    <style>
+        body {
+            background-color: #f8f9fa;
+        }
+
+        .page-header-title h4 {
+            margin: 20px 0;
+            text-align: center;
+            font-weight: bold;
+            color: #003366;
+            text-transform: uppercase;
+        }
+
+        .filter-section {
+            background: #fff;
+            padding: 15px;
+            border-radius: 8px;
+            box-shadow: 0 4px 6px rgba(0, 0, 0, 0.05);
+            margin-bottom: 20px;
+        }
+
+        thead th {
+            background-color: #003366 !important;
+            color: white !important;
+        }
+
+        .report-container {
+            background: #fff;
+            padding: 15px;
+            border-radius: 8px;
+            box-shadow: 0 4px 6px rgba(0, 0, 0, 0.05);
+        }
+
+		/* ==============================
+		   DATATABLE ALIGNMENT
+		   ============================== */
+		
+		#detailDataTable {
+		    width: 100% !important;
+		    table-layout: fixed !important;
+		    border-collapse: collapse !important;
+		}
+		
+		#detailDataTable th,
+		#detailDataTable td {
+		    box-sizing: border-box !important;
+		    text-align: center !important;
+		    vertical-align: middle !important;
+		    border: 1px solid #dee2e6 !important;
+		}
+		
+		#detailDataTable thead th {
+		    background-color: #003366 !important;
+		    color: #ffffff !important;
+		    white-space: normal !important;
+		    word-break: normal !important;
+		    padding: 10px 8px !important;
+		}
+		
+		#detailDataTable tbody td {
+		    white-space: normal !important;
+		    word-break: break-word !important;
+		    overflow-wrap: anywhere !important;
+		    padding: 8px !important;
+		}
+		
+		/* Column widths */
+		#detailDataTable th:nth-child(1),
+		#detailDataTable td:nth-child(1) {
+		    width: 6% !important;
+		}
+		
+		#detailDataTable th:nth-child(2),
+		#detailDataTable td:nth-child(2) {
+		    width: 25% !important;
+		}
+		
+		#detailDataTable th:nth-child(3),
+		#detailDataTable td:nth-child(3) {
+		    width: 9% !important;
+		}
+		
+		#detailDataTable th:nth-child(4),
+		#detailDataTable td:nth-child(4) {
+		    width: 15% !important;
+		}
+		
+		#detailDataTable th:nth-child(5),
+		#detailDataTable td:nth-child(5) {
+		    width: 9% !important;
+		}
+		
+		#detailDataTable th:nth-child(6),
+		#detailDataTable td:nth-child(6) {
+		    width: 13% !important;
+		}
+		
+		#detailDataTable th:nth-child(7),
+		#detailDataTable td:nth-child(7) {
+		    width: 14% !important;
+		}
+		
+		#detailDataTable th:nth-child(8),
+		#detailDataTable td:nth-child(8) {
+		    width: 9% !important;
+		}
+		
+		/* =========================================================
+		   Complaint View Photo Badge
+		========================================================= */
+		
+		.complaint-answer-cell {
+		    width: 100%;
+		    display: flex;
+		    justify-content: center;
+		    align-items: center;
+		    gap: 5px;
+		    text-align: center;
+		}
+		
+		.complaint-photo-badge {
+		    display: inline-flex;
+		    align-items: center;
+		    justify-content: center;
+		    padding: 0.35em 0.65em;
+		    font-size: 75%;
+		    font-weight: 700;
+		    line-height: 1;
+		    color: #fff !important;
+		    background-color: #0dcaf0;
+		    border: 0;
+		    border-radius: 0.375rem;
+		    text-decoration: none !important;
+		    cursor: pointer;
+		    white-space: nowrap;
+		}
+		
+		.complaint-photo-badge:hover {
+		    color: #fff !important;
+		    background-color: #0aa2c0;
+		}
+		
+		.complaint-photo-badge i {
+		    color: #fff !important;
+		    margin-right: 4px;
+		}
+        
+    </style>
+</head>
+
+<body>
+
+    <div class="container-fluid py-4">
+        <div class="page-header-title d-flex justify-content-between align-items-center">
+            <a href="/commissionerreview/shelterpagereport" class="btn btn-secondary"><i
+                    class="fa-solid fa-arrow-left"></i> Back to Abstract</a>
+            <h4 class="mb-0 mx-auto">Shelter Complaint List</h4>
+            <div style="width: 100px;"></div>
+        </div>
+
+        <!-- Filter Section -->
+        <div class="filter-section d-flex justify-content-center align-items-end gap-3 flex-wrap mt-3">
+        
+            <!-- From Date -->
+			    <div>
+			        <label for="fromDate" class="form-label fw-bold">From Date:</label>
+			        <input type="date" id="fromDate" class="form-control">
+			    </div>
+			
+			
+			    <!-- To Date -->
+			    <div>
+			        <label for="toDate" class="form-label fw-bold">To Date:</label>
+			        <input type="date" id="toDate" class="form-control">
+			    </div>
+			    
+	            <div>
+	                <label for="zone" class="form-label fw-bold">Zone:</label>
+	                <select id="zone" class="form-select">
+	                    <option value="">All Zone</option>
+	                </select>
+	            </div>
+	            <div>
+	                <label for="category" class="form-label fw-bold">Category:</label>
+	                <select id="category" class="form-select">
+	                    <option value="">All Category</option>
+	                </select>
+	            </div>
+	            <div>
+	                <button id="btnSearch" class="btn btn-primary px-4"><i class="fa-solid fa-search"></i> Search</button>
+	            </div>
+	            <div>
+	                <button class="btn btn-secondary px-4" onclick="resetFilters()"><i class="fa-solid fa-rotate-left"></i> Reset </button>
+	            </div>
+        </div>
+        <div class="report-container">
+            <table id="detailDataTable" class="table table-striped table-bordered display nowrap" style="width:100%;">
+                <thead>
+                    <tr>
+                		<th class="text-center">S.No</th>
+						<th class="text-center">SHELTER</th>
+	                    <!-- <th class="text-center">ZONE</th>
+	                    <th class="text-center">CATEGORY</th>
+	                    <th class="text-center">RESIDENTS</th>
+	                    <th class="text-center">OCCUPANCY STATUS</th>
+	                    <th class="text-center">MAINTENANCE STATUS</th> -->
+						<th class="text-center">No of Complaints</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <!-- Populated via JS -->
+                </tbody>
+            </table>
+        </div>
+     </div>
+     
+     
+
+	<!-- =========================================================
+	     SHELTER COMPLAINT DETAILS MODAL
+	========================================================= -->
+	
+	<div class="modal fade" id="complaintDetailsModal" tabindex="-1" 
+		  data-backdrop="static" data-keyboard="false">
+	
+	    <div class="modal-dialog modal-xl modal-dialog-centered">
+	
+	        <div class="modal-content">
+	
+	            <!-- Modal Header -->
+	            <div class="modal-header bg-primary text-white" style="background-color: #003366 !important;">
+	
+	                <!-- <h5 class="modal-title" >
+	                    Shelter Complaint Details
+	                </h5> -->
+	                
+            	    <div>
+	                    <div class="d-flex align-items-center">					
+					        <h5 class="mb-0">Shelter Complaint Details</h5>
+					        <span class="mx-2">-</span>
+					        <h5 class="mb-0" id="complaintModalShelterName"></h5>
+					    </div>
+                    </div>
+	
+	                <button type="button" class="btn-close btn-close-white" 
+	                		data-bs-dismiss="modal" aria-label="Close">
+					</button>
+	
+	            </div>
+	
+	
+	            <!-- Modal Body -->
+	            <div class="modal-body">
+	
+	                <div class="table-responsive">
+	
+	                    <table id="complaintDetailsTable" class="table table-striped table-bordered nowrap" 
+	                    	   style="width:100%;">
+	
+	                        <thead>
+	                            <tr>
+	                                <th class="text-center">S.No</th>
+	                                <th class="text-center">CDO</th>
+	                                <th class="text-center">Date</th>
+	                                <th class="text-center">Infrastructural Complaints</th>
+	                                <th class="text-center">Problems related to food</th>
+	                                <th class="text-center">Residents related Issues</th>
+	                                <th class="text-center">Maintenance related Issues</th>
+	                            </tr>
+	                        </thead>
+	
+	                        <tbody>
+	                        </tbody>
+	
+	                    </table>
+	
+	                </div>
+	
+	            </div>
+	
+	
+	            <!-- Modal Footer -->
+	            <div class="modal-footer">
+	                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
+	                    Close
+	                </button>
+	            </div>
+	
+	        </div>
+	
+	    </div>
+	
+	</div>
+	
+	<!-- =========================================================
+	     COMPLAINT PHOTO MODAL
+		========================================================= -->
+	
+	<div class="modal fade" id="complaintPhotoModal" tabindex="-1" data-backdrop="static" data-keyboard="false">
+	
+	    <div class="modal-dialog modal-lg modal-dialog-centered">
+	
+	        <div class="modal-content">
+	
+	            <!-- Header -->
+	            <div class="modal-header bg-primary text-white"
+	                 style="background-color: #003366 !important;">
+	
+	                <h5 class="modal-title" id="complaintPhotoModalTitle">
+	                    Complaint Photo
+	                </h5>
+	
+	                <button type="button" class="btn-close btn-close-white" 
+	                		data-bs-dismiss="modal" aria-label="Close">
+	                </button>
+	
+	            </div>
+	
+	
+	            <!-- Body -->
+	            <div class="modal-body text-center">
+	
+	                <!-- Photo -->
+	                <div id="complaintPhotoContainer">
+	
+	                    <img id="complaintModalPhoto" src="" class="img-fluid rounded"
+	                         style="max-height: 450px; max-width: 100%;">
+	                </div>
+	
+	
+	                <!-- Remark -->
+	                <div class="mt-4 text-left">
+	
+	                    <h6 class="font-weight-bold">
+	                        Remark
+	                    </h6>
+	
+	                    <div id="complaintModalRemark" class="border rounded p-3 bg-light"
+	                         style="min-height: 50px;">
+	                    </div>
+	
+	                </div>
+	
+	            </div>
+	
+	
+	            <!-- Footer -->
+	            <div class="modal-footer">
+	                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
+	                    Close
+	                </button>	
+	            </div>
+	
+	        </div>
+	
+	    </div>
+	
+	</div>
+
+
+        <!-- Scripts -->
+        <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.bundle.min.js"></script>
+        
+
+        <!-- DataTables JS -->
+        <script src="https://cdn.datatables.net/1.13.4/js/jquery.dataTables.min.js"></script>
+        <script src="https://cdn.datatables.net/buttons/2.3.6/js/dataTables.buttons.min.js"></script>
+        <script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.html5.min.js"></script>
+        <script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.print.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
+
+        <!-- SweetAlert -->
+        <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+        
+      <script th:inline="javascript">
+
+    var dataTable = null;
+    var complaintDetailsDataTable = null;
+   // var complaintPhotoData = [];
+   
+   let complaintPhotoData = [];
+
+    $(document).ready(function () {
+
+        // Load dropdowns
+        loadDropdowns();
+        
+
+
+        // Initialize DataTable
+        dataTable = $('#detailDataTable').DataTable({
+
+	    autoWidth: false,
+	    
+	    columnDefs: [
+	        { width: "6%",  targets: 0 },
+	        { width: "25%", targets: 1 },
+	        { width: "9%",  targets: 2 }
+	     /*    { width: "15%", targets: 3 },
+	        { width: "9%",  targets: 4 },
+	        { width: "13%", targets: 5 },
+	        { width: "14%", targets: 6 },
+	        { width: "9%",  targets: 7 } */
+	    ],
+	   
+	    
+	    responsive: false,
+	    scrollX: false,
+
+	    searching: true,
+	    paging: true,
+	    info: true,
+	    ordering: true,
+	    dom: '<"d-flex justify-content-between align-items-center mb-3"lfB>rtip',
+	
+	    lengthMenu: [
+	        [10, 25, 50, 100, -1],
+	        [10, 25, 50, 100, "All"]
+	    ],
+	
+	    buttons: [
+	
+	        {
+	            extend: 'excelHtml5',
+	            text: '<i class="fa-solid fa-file-excel"></i> Excel',
+	            className: 'btn btn-success btn-sm me-2',
+	
+	            title: function () {
+	                return 'Commissioner Review - Shelter Complaint Report';
+	            },
+	
+	            filename: function () {
+	
+	                var zone =
+	                    $('#zone option:selected').text()
+	                        .replace(/[^a-zA-Z0-9]/g, '_');
+	
+	                var category =
+	                    $('#category option:selected').text()
+	                        .replace(/[^a-zA-Z0-9]/g, '_');
+	
+	                return 'Shelter_Complaint_' +
+	                       zone + '_' + category
+	                       + '_Reports';
+	            },
+	
+	            exportOptions: {
+	                stripHtml: true,
+	
+	                format: {
+	                    body: function (data, row, column, node) {
+	                        var div = document.createElement("div");
+	                        div.innerHTML = data;
+	                        return div.textContent || div.innerText || "";
+	                    }
+	                }
+	            }
+	        },
+	
+	        {
+	            extend: 'pdfHtml5',
+	            text: '<i class="fa-solid fa-file-pdf"></i> PDF',
+	            className: 'btn btn-danger btn-sm',
+	            orientation: 'landscape',
+	            pageSize: 'A4',
+	            title: function () {
+	                return 'Commissioner Review - Shelter Complaint Report';
+	            },
+	
+	            filename: function () {
+	
+	                var zone =
+	                    $('#zone option:selected').text()
+	                        .replace(/[^a-zA-Z0-9]/g, '_');
+	
+	                var category =
+	                    $('#category option:selected').text()
+	                        .replace(/[^a-zA-Z0-9]/g, '_');
+	
+	                return 'Shelter_Complaint_' +
+	                       zone + '_' + category
+	                       + '_Reports';
+	            },
+	
+	            exportOptions: {
+	                stripHtml: true,
+	
+	                format: {
+	                    body: function (data, row, column, node) {
+	                        var div = document.createElement("div");
+	                        div.innerHTML = data;
+	                        return div.textContent || div.innerText || "";
+	                    }
+	                }
+	            },
+	            
+	            customize: function (doc) {
+
+	                // =====================================================
+	                // TITLE
+	                // =====================================================
+
+	                doc.styles.title = {
+	                    fontSize: 14,
+	                    bold: true,
+	                    alignment: 'center',
+	                    margin: [0, 0, 0, 10]
+	                };
+
+
+	                // =====================================================
+	                // PAGE MARGINS
+	                // Give maximum width to the table
+	                // =====================================================
+
+	                doc.pageMargins = [15, 30, 15, 30];
+
+
+	                // =====================================================
+	                // DEFAULT FONT
+	                // =====================================================
+
+	                doc.defaultStyle = { fontSize: 8, alignment: 'center' };
+
+	                // =====================================================
+	                // GET TABLE
+	                // =====================================================
+
+	                var table = doc.content[1].table;
+
+
+	                // =====================================================
+	                // FIT TABLE TO FULL A4 WIDTH
+	                // A4 Landscape usable width ≈ 812
+	                // =====================================================
+
+	                table.widths = [
+	                    45,     // S.No
+	                    600,    // Shelter
+	                    130     // No of Rescue
+	                ];
+
+
+	                // =====================================================
+	                // HEADER
+	                // =====================================================
+
+	                if (table.body.length > 0) {
+	                    table.body[0].forEach(function (cell) {
+	                        if (typeof cell === 'object') {
+	                            cell.bold = true;
+	                            cell.fontSize = 9;
+	                            cell.alignment = 'center';
+	                        }
+	                    });
+	                }
+
+
+	                // =====================================================
+	                // BODY ALIGNMENT
+	                // =====================================================
+
+	                table.body.forEach(function (row, rowIndex) {
+	                    row.forEach(function (cell) {
+	                        if (typeof cell === 'object') {
+	                            cell.alignment = 'center';
+	                            cell.margin = [ 3, 4, 3, 4 ];
+	                        }
+	                    });
+	                });
+
+
+	                // =====================================================
+	                // KEEP ROW TOGETHER
+	                // =====================================================
+
+	                table.dontBreakRows = true;
+	                table.headerRows = 1;
+
+
+	                // =====================================================
+	                // TABLE BORDERS
+	                // =====================================================
+
+	                table.layout = {
+	                    hLineWidth: function () { return 0.5; },
+	                    vLineWidth: function () { return 0.5; },
+	                    paddingLeft: function () { return 3; },
+	                    paddingRight: function () { return 3; },
+	                    paddingTop: function () { return 3; },
+	                    paddingBottom: function () { return 3; }
+	                };
+
+	            }
+	
+
+	        }
+	
+	    ]
+	
+	});
+        
+        // Search button
+        $('#btnSearch').click(function () {
+            loadDetailedReport();
+        });
+
+
+        // Load data initially
+        // loadDetailedReport();
+        
+        // =========================================================
+		// INITIALIZE DEFAULT DATES
+		// =========================================================
+		
+		initializeComplaintDates();
+    });
+
+
+
+    // =========================================================
+    // LOAD DROPDOWNS
+    // =========================================================
+
+    function loadDropdowns() {
+
+        // -------------------------
+        // Zone
+        // -------------------------
+
+        $.ajax({
+            url: "/commissionerreview/api/shelterinspection/zones",
+            type: "GET",
+            success: function (data) {
+                let options =
+                    '<option value="">All Zones</option>';
+
+                data.forEach(function (zone) {
+                    options +=
+                        '<option value="' + zone + '">' +
+                        zone +
+                        '</option>';
+                });
+
+                $("#zone").html(options);
+            },
+
+            error: function () {
+                Swal.fire(
+                    'Error',
+                    'Unable to load zones.',
+                    'error'
+                );
+            }
+
+        });
+
+
+        // -------------------------
+        // Category
+        // -------------------------
+
+        $.ajax({
+            url: "/commissionerreview/api/shelterinspection/categories",
+            type: "GET",
+            success: function (data) {
+                let options =
+                    '<option value="">All Categories</option>';
+
+                data.forEach(function (category) {
+                    let text = formatCategory(category);
+                    options +=
+                        '<option value="' + category + '">' +
+                        text +
+                        '</option>';
+                });
+
+                $("#category").html(options);
+
+            },
+
+            error: function () {
+                Swal.fire(
+                    'Error',
+                    'Unable to load categories.',
+                    'error'
+                );
+            }
+        });
+
+    }
+    
+	 // =========================================================
+	 // INITIALIZE COMPLAINT DATE FILTER
+	 // From Date = Minimum DB cdate
+	 // To Date   = Today
+	 // =========================================================
+	
+	 function initializeComplaintDates() {
+	
+	     $.ajax({
+	         url: "/commissionerreview/api/shelter/shelterComplaintMinDate",
+	         type: "GET",
+	         success: function (minDate) {
+	
+	             console.log("Minimum Complaint cdate:", minDate);
+	
+	             // =================================================
+	             // TODAY
+	             // =================================================
+	
+	             var today = new Date();
+	
+	             var yyyy = today.getFullYear();
+	
+	             var mm = String(today.getMonth() + 1).padStart(2, '0');
+	             var dd = String(today.getDate()).padStart(2, '0');
+	             var todayString = yyyy + '-' + mm + '-' + dd;
+	
+	
+	             // =================================================
+	             // FROM DATE
+	             // =================================================
+	
+	             if (minDate) {
+	                 $('#fromDate').val(minDate);
+	             } else {
+	                 // If no DB date found,
+	                 // use today
+	
+	                 $('#fromDate').val(todayString);
+	             }
+	
+	
+	             // =================================================
+	             // TO DATE = TODAY
+	             // =================================================
+	
+	             $('#toDate').val(todayString);
+	
+	
+	             // =================================================
+	             // LOAD REPORT
+	             // =================================================
+	
+	             loadDetailedReport();
+	
+	         },
+	
+	         error: function (xhr) {
+	
+	             console.error("Unable to get minimum complaint date:",);
+	
+	             // =================================================
+	             // FALLBACK TO TODAY
+	             // =================================================
+	
+	             var today = new Date();
+	
+	             var yyyy = today.getFullYear();
+	
+	             var mm = String(today.getMonth() + 1).padStart(2, '0');
+	             var dd = String(today.getDate()).padStart(2, '0');
+	             var todayString = yyyy + '-' + mm + '-' + dd;
+	
+	
+	             $('#fromDate').val(todayString);
+	             $('#toDate').val(todayString);
+	
+	             loadDetailedReport();
+	
+	         }
+	
+	     });
+	
+	 }
+
+    	
+    	
+   	// =========================================================
+	// LOAD SHELTER COMPLAINT REPORT
+	// =========================================================
+	
+	 function loadDetailedReport() {
+	
+	    var fromDate = $('#fromDate').val() || '';
+	    var toDate = $('#toDate').val() || '';
+	
+	    var zone = $('#zone').val() || '';
+	    var category = $('#category').val() || '';
+	
+	
+	    // =====================================================
+	    // DATE VALIDATION
+	    // =====================================================
+	
+	    if (fromDate && toDate) {
+	
+	        if (fromDate > toDate) {
+	
+	            Swal.fire({
+	                icon: 'warning',
+	                title: 'Invalid Date Range',
+	                text: 'To Date cannot be earlier than From Date.'
+	            });
+	
+	            return;
+	        }
+	    }
+	
+	
+	    // =====================================================
+	    // LOADING
+	    // =====================================================
+	
+	    Swal.fire({
+	        title: 'Loading...',
+	        allowOutsideClick: false,
+	        allowEscapeKey: false,
+	        didOpen: function () {
+	            Swal.showLoading();
+	        }
+	    });
+	
+	
+	    // =====================================================
+	    // API CALL
+	    // =====================================================
+	
+	    $.ajax({
+	        url: "/commissionerreview/api/shelter/shelterComplaintList",
+	        type: "GET",
+	        data: {
+	            fromDate: fromDate,
+	            toDate: toDate,
+	
+	            zone: zone,
+	            category: category
+	        },
+	
+	        success: function (response) {
+	            Swal.close();
+	            console.log( "Complaint List Response:", response);
+	            populateTable(response);
+	        },
+	
+	        error: function (xhr) {
+	
+	            Swal.close();
+	            console.error( "Complaint List Error:", xhr );
+	            Swal.fire({
+	                icon: 'error',
+	                title: 'Error',
+	                text: 'Unable to load shelter complaint list.'
+	            });
+	
+	        }
+	
+	    });
+	} 
+
+    // =========================================================
+    // POPULATE TABLE
+    // =========================================================
+
+    function populateTable(data) {
+
+        dataTable.clear();
+
+        if (!data || data.length === 0) {
+            dataTable.draw();
+            return;
+        }
+
+
+        data.forEach(function (item, index) {
+            var shelterName = item.shelterName || '-';
+    /*     var zone =
+                item.zone || '-';
+            var category =
+                formatCategory(item.category);
+            var residents =
+                item.totalResidents || 0;
+            var occupancyStatus =
+                getStatusBadge(residents);
+            var maintenanceStatus =
+                getMaintenanceBadge(
+                    item.maintenanceStatus
+                ); */
+            var totalcomplaints = item.totalComplaints || '0';
+                
+            var complaintLink;
+
+            if (Number(totalcomplaints) > 0) {
+
+                // =========================================================
+                // COMPLAINTS AVAILABLE - CLICKABLE
+                // =========================================================
+
+                complaintLink =
+                    '<a href="javascript:void(0);" ' +
+                    'class="complaint-count" ' +
+                    'data-uqid="' + item.uqid + '">' +
+                    totalcomplaints +
+                    '</a>';
+
+            } else {
+
+                // =========================================================
+                // ZERO COMPLAINTS - NOT CLICKABLE
+                // =========================================================
+
+                complaintLink =
+                    '<span class="text-muted">' +
+                    '0' +
+                    '</span>';
+            }
+
+            dataTable.row.add([
+                index + 1,
+                '<strong>' +
+                    shelterName +
+                '</strong>',
+
+              /*   zone,
+                category,
+                residents,
+                occupancyStatus,
+                maintenanceStatus,
+                totalcomplaints */
+                
+                complaintLink
+            ]);
+        });
+
+
+        dataTable.draw();
+
+    }
+
+
+
+    // =========================================================
+    // CATEGORY FORMAT
+    // =========================================================
+
+    function formatCategory(category) {
+        if (!category) {
+            return "-";
+        }
+
+        return category
+            .replace(/-/g, " ")
+            .replace(/\b\w/g, function (letter) {
+                return letter.toUpperCase();
+            });
+    }
+    
+    $(document).on('click', '.complaint-count', function () {
+        var uqid = $(this).data('uqid');
+        $("#complaintModalShelterName").text("Loading...");
+        loadComplaintDetails(uqid);
+    });
+    
+    
+
+    
+    // =========================================================
+    // COMPLAINT DETAILS DATATABLES
+    // =========================================================
+    	
+    	function initializeComplaintDetailsTable() {
+
+		    if ($.fn.DataTable.isDataTable('#complaintDetailsTable')) 
+		    {
+		        $('#complaintDetailsTable').DataTable().clear().destroy();
+		    }
+		
+		    complaintDetailsDataTable =
+		        $('#complaintDetailsTable').DataTable({
+
+		        	 paging: true,
+	                 ordering: false,
+	                 info: true,
+	                 scrollX: true,
+	                 scrollY: "60vh",
+	                 scrollCollapse: true,
+	                 autoWidth: false,
+		             pageLength: 10,
+		            
+		            lengthMenu: [
+		                [10, 25, 50, 100, -1],
+		                [10, 25, 50, 100, "All"]
+		            ],
+		            
+		            buttons: [
+		            	
+		            	{
+		            	    extend: 'excelHtml5',
+		            	    text: '<i class="fa-solid fa-file-excel"></i> Excel',
+		            	    className: 'btn btn-success btn-sm me-2',
+		            	    title: function () {
+		            	        return 'Commissioner Review - Shelter Complaint Detail';
+		            	    },
+
+		            	    filename: function () {
+
+		            	        var zone = $('#zone option:selected').text().replace(/[^a-zA-Z0-9]/g, '_');
+		            	        var category = $('#category option:selected').text().replace(/[^a-zA-Z0-9]/g, '_');
+
+		            	        return 'Shelter_Complaint_' +
+		            	               zone + '_' + category +
+		            	               '_Details';
+		            	    },
+
+		            	    exportOptions: {
+		            	        stripHtml: true,
+		            	        format: {
+		            	            body: function (data, row, column, node) {
+		            	                var div = document.createElement("div");
+		            	                div.innerHTML = data;
+		            	                return div.textContent || div.innerText || "";
+		            	            }
+		            	        }
+		            	    },
+
+		            	    // =====================================================
+		            	    // EXCEL DATA
+		            	    // =====================================================
+
+		            	    customizeData: function (data) {
+
+		            	        // -------------------------------------------------
+		            	        // HEADERS
+		            	        // -------------------------------------------------
+
+		            	        data.header = [
+
+		            	            'S.No',
+		            	            'CDO',
+		            	            'Date',
+
+		            	            'Infrastructural Complaints',
+		            	            'Infrastructural Photo URL',
+
+		            	            'Problems related to food',
+		            	            'Food Photo URL',
+
+		            	            'Residents related Issues',
+		            	            'Residents Photo URL',
+
+		            	            'Maintenance related Issues',
+		            	            'Maintenance Photo URL'
+
+		            	        ];
+
+
+		            	        // -------------------------------------------------
+		            	        // BODY
+		            	        // -------------------------------------------------
+
+		            	        data.body.forEach(function (row, index) {
+
+		            	            var photos = complaintPhotoData[index] || {};
+		            	            var infrastructureUrl = photos.infrastructuralPhoto || '';
+		            	            var foodUrl = photos.foodPhoto || '';
+		            	            var residentUrl = photos.residentPhoto || '';
+		            	            var maintenanceUrl = photos.maintenancePhoto || '';
+
+		            	            console.log("EXCEL ROW:", index, photos);
+
+		            	            data.body[index] = [
+
+		            	                // S.No
+		            	                row[0],
+
+		            	                // CDO
+		            	                row[1],
+
+		            	                // Date
+		            	                row[2],
+
+
+		            	                // =========================================
+		            	                // INFRASTRUCTURAL
+		            	                // =========================================
+
+		            	                row[3],
+
+		            	                // Infrastructure Photo URL
+		            	                infrastructureUrl,
+
+
+		            	                // =========================================
+		            	                // FOOD
+		            	                // =========================================
+
+		            	                row[4],
+
+		            	                // Food Photo URL
+		            	                foodUrl,
+
+
+		            	                // =========================================
+		            	                // RESIDENT
+		            	                // =========================================
+
+		            	                row[5],
+
+		            	                // Resident Photo URL
+		            	                residentUrl,
+
+
+		            	                // =========================================
+		            	                // MAINTENANCE
+		            	                // =========================================
+
+		            	                row[6],
+
+		            	                // Maintenance Photo URL
+		            	                maintenanceUrl
+
+		            	            ];
+
+		            	        });
+
+		            	    }
+
+		            	},
+		            	
+		            	
+		     	        {
+		     	            extend: 'pdfHtml5',
+		     	            text: '<i class="fa-solid fa-file-pdf"></i> PDF',
+		     	            className: 'btn btn-danger btn-sm',
+		     	            orientation: 'landscape',
+		     	            pageSize: 'A4',
+		     	            title: function () {
+		     	                return 'Commissioner Review - Shelter Complaint Detail';
+		     	            },
+		     	
+		     	            filename: function () {
+		     	
+		     	                var zone = $('#zone option:selected').text().replace(/[^a-zA-Z0-9]/g, '_');
+		     	                var category = $('#category option:selected').text().replace(/[^a-zA-Z0-9]/g, '_');
+		     	
+		     	                return 'Shelter_Complaint_' +
+		     	                       zone + '_' + category
+		     	                       + '_Details';
+		     	            },
+		     	
+		     	            exportOptions: {
+		     	                stripHtml: true,
+		     	
+		     	                format: {
+		     	                    body: function (data, row, column, node) {
+		     	                        var div = document.createElement("div");
+		     	                        div.innerHTML = data;
+		     	                        return div.textContent || div.innerText || "";
+		     	                    }
+		     	                }
+		     	            },
+		     	            
+		     	           customize: function (doc) {
+
+		     	        	    // =====================================================
+		     	        	    // PAGE
+		     	        	    // =====================================================
+
+		     	        	    doc.pageOrientation = 'landscape';
+		     	        	    doc.pageSize = 'A4';
+		     	        	    doc.pageMargins = [15, 30, 15, 30];
+
+
+		     	        	    // =====================================================
+		     	        	    // TITLE
+		     	        	    // =====================================================
+
+		     	        	    doc.styles.title = {
+		     	        	        fontSize: 14,
+		     	        	        bold: true,
+		     	        	        alignment: 'center',
+		     	        	        margin: [0, 0, 0, 10]
+		     	        	    };
+
+
+		     	        	    // =====================================================
+		     	        	    // DEFAULT FONT
+		     	        	    // =====================================================
+
+		     	        	    doc.defaultStyle = { fontSize: 7 };
+
+		     	        	    // =====================================================
+		     	        	    // GET PDF TABLE
+		     	        	    // =====================================================
+
+		     	        	    var table = doc.content[1].table;
+
+		     	        	    // =====================================================
+		     	        	    // CLEAN TABLE DATA
+		     	        	    // =====================================================
+
+		     	        	    table.body = table.body.map(function (row, rowIndex) {
+
+		     	        	        return row.map(function (cell) {
+
+		     	        	            var value = '';
+
+		     	        	            if (cell === null || cell === undefined) {
+		     	        	                value = '';
+		     	        	            } else if (typeof cell === 'object') {
+		     	        	                if (cell.text !== undefined) {
+		     	        	                    value = cell.text;
+		     	        	                } else {
+		     	        	                    value = String(cell);
+		     	        	                }
+		     	        	            } else {
+		     	        	                value = String(cell);
+		     	        	            }
+
+
+		     	        	            // Remove HTML
+		     	        	            var temp = document.createElement("div");
+		     	        	            temp.innerHTML = value;
+		     	        	            value = temp.textContent || temp.innerText || "";
+
+		     	        	            // Clean spaces
+		     	        	            value = value.replace(/\s+/g, ' ').trim();
+
+		     	        	            return {
+		     	        	                text: value,
+		     	        	                alignment: 'center',
+		     	        	                fontSize: 7,
+		     	        	                margin: [2, 4, 2, 4]
+		     	        	            };
+
+		     	        	        });
+
+		     	        	    });
+
+		     	        	    	
+     	        	    	    // =====================================================
+							    // THEAD BACKGROUND COLOR
+							    // =====================================================
+							
+							    if (table.body.length > 0) {
+							        table.body[0].forEach(function (cell) {
+							            cell.fillColor = '#003366';
+							            cell.color = '#ffffff';
+							            cell.bold = true;
+							            cell.fontSize = 10;
+							            cell.alignment = 'center';
+							            cell.margin = [2, 4, 2, 4];
+							        });
+							    }
+
+
+		     	        	    // =====================================================
+		     	        	    // BODY BACKGROUND COLOR
+		     	        	    // =====================================================
+
+		     	        	    for (var i = 1; i < table.body.length; i++) {
+		     	        	        for (var j = 0; j < table.body[i].length; j++) {
+		     	        	            table.body[i][j].fillColor = (i % 2 === 1) ? '#f2f2f2' : '#ffffff';
+		     	        	            table.body[i][j].color = '#000000';
+		     	        	            table.body[i][j].alignment = 'center';
+		     	        	            table.body[i][j].fontSize = 9 ;
+		     	        	        }
+		     	        	    }
+
+
+		     	        	    // =====================================================
+		     	        	    // COLUMN WIDTH
+		     	        	    // =====================================================
+
+		     	        	    table.widths = [
+
+		     	        	        30,     // S.No
+		     	        	        60,     // CDO
+		     	        	        60,     // Date
+		     	        	        150,    // Infrastructural Complaints
+		     	        	        150,    // Problems related to food
+		     	        	        150,    // Residents related Issues
+		     	        	        150     // Maintenance related Issues
+
+		     	        	    ];
+
+
+		     	        	    // =====================================================
+		     	        	    // TABLE LAYOUT
+		     	        	    // =====================================================
+
+		     	        	    table.layout = {
+		     	        	        hLineWidth: function () { return 0.5; },
+		     	        	        vLineWidth: function () { return 0.5; },
+		     	        	        paddingLeft: function () { return 2; },
+		     	        	        paddingRight: function () { return 2; },
+		     	        	        paddingTop: function () { return 3; },
+		     	        	        paddingBottom: function () { return 3; }
+		     	        	    };
+
+
+		     	        	    // =====================================================
+		     	        	    // TABLE SETTINGS
+		     	        	    // =====================================================
+
+		     	        	    table.headerRows = 1;
+
+		     	        	    table.dontBreakRows = true;
+
+		     	        	}
+		     	
+		     	        }
+		     	
+		     	    ],
+		
+		            columnDefs: [
+		                { width: "60px", targets: 0, className: "text-center" },
+		                { width: "150px", targets: 1, className: "text-center" },
+		                { width: "120px", targets: 2, className: "text-center" },
+		                { width: "250px", targets: 3, className: "text-center" },
+		                { width: "220px", targets: 4, className: "text-center" },
+		                { width: "220px", targets: 5, className: "text-center" },
+		                { width: "250px", targets: 6, className: "text-center" }
+		            ],
+		
+		             dom:
+		            	    '<"d-flex justify-content-between align-items-center mb-3"lfB>' +
+		            	    'rtip'
+
+		        });
+		}
+    
+    
+    	function loadComplaintDetails(uqid) {
+
+    	    // =========================================================
+    	    // GET CURRENT FILTER DATES
+    	    // =========================================================
+
+    	    var fromDate = $('#fromDate').val() || '';
+    	    var toDate = $('#toDate').val() || '';
+
+    	    console.log("Complaint Details Filter:");
+    	    console.log("UQID:", uqid);
+    	    console.log("From Date:", fromDate);
+    	    console.log("To Date:", toDate);
+
+
+    	    $.ajax({
+    	        url: "/commissionerreview/api/shelter/shelterComplaintDetails",
+    	        type: "GET",
+    	        data: {
+    	            uqid: uqid,
+    	            fromDate: fromDate,
+    	            toDate: toDate
+    	        },
+
+    	        success: function(data) {
+    	            console.log( "Complaint Details:", data );
+    	            
+    	            
+    	            var shelterName = "-";
+
+    	            if (data && data.length > 0) {
+    	                shelterName = data[0].shelterName || "-";
+    	            }
+
+
+    	            $("#complaintModalShelterName").text(shelterName);
+
+    	            // =====================================================
+    	            // LOAD QUESTION MASTER FIRST
+    	            // =====================================================
+
+    	            loadComplaintQuestionMaster(function() {
+
+
+    	                // =================================================
+    	                // INITIALIZE DATATABLE
+    	                // =================================================
+
+    	                initializeComplaintDetailsTable();
+
+
+    	                // =================================================
+    	                // CLEAR OLD DATA
+    	                // =================================================
+
+    	                complaintDetailsDataTable.clear();
+    	                
+    	                complaintPhotoData = [];
+
+
+    	                // =================================================
+    	                // ADD DATA
+    	                // =================================================
+
+    	                if (data && data.length > 0) {
+    	                	
+    	                	data.forEach(function(item) {
+    	                		
+    	                		complaintPhotoData.push({
+
+    	                		    infrastructuralPhoto:
+    	                		        item.infrastructuralPhoto || '',
+
+    	                		    foodPhoto:
+    	                		        item.foodPhoto || '',
+
+    	                		    residentPhoto:
+    	                		        item.residentPhoto || '',
+
+    	                		    maintenancePhoto:
+    	                		        item.maintenancePhoto || ''
+
+    	                		});
+    	                		
+    	                /* 		complaintPhotoData.push({
+    	                		    infrastructuralPhoto: item.infrastructuralPhoto || '',
+    	                		    foodPhoto: item.foodPhoto || '',
+    	                		    residentPhoto: item.residentPhoto || '',
+    	                		    maintenancePhoto: item.maintenancePhoto || ''
+    	                		}); */
+
+    	                	    complaintDetailsDataTable.row.add([
+
+    	                	        item.sno || '-',
+    	                	        item.cdo || '-',
+
+    	                	        formatComplaintDate(item.date),
+
+    	                	        // =====================================================
+    	                	        // INFRASTRUCTURAL
+    	                	        // qid1 = Answer
+    	                	        // qid2 = Remark
+    	                	        // infrastructuralPhoto = Photo
+    	                	        // =====================================================
+
+    	                	        formatComplaintAnswerWithPhoto(
+    	                	            1,
+    	                	            item.qid1,
+    	                	            item.infrastructuralPhoto,
+    	                	            item.qid2
+    	                	        ),
+
+
+    	                	        // =====================================================
+    	                	        // FOOD
+    	                	        // qid4 = Answer
+    	                	        // qid5 = Remark
+    	                	        // foodPhoto = Photo
+    	                	        // =====================================================
+
+    	                	        formatComplaintAnswerWithPhoto(
+    	                	            4,
+    	                	            item.qid4,
+    	                	            item.foodPhoto,
+    	                	            item.qid5
+    	                	        ),
+
+
+    	                	        // =====================================================
+    	                	        // RESIDENT
+    	                	        // qid7 = Answer
+    	                	        // qid8 = Remark
+    	                	        // residentPhoto = Photo
+    	                	        // =====================================================
+
+    	                	        formatComplaintAnswerWithPhoto(
+    	                	            7,
+    	                	            item.qid7,
+    	                	            item.residentPhoto,
+    	                	            item.qid8
+    	                	        ),
+
+
+    	                	        // =====================================================
+    	                	        // MAINTENANCE
+    	                	        // qid10 = Answer
+    	                	        // qid11 = Remark
+    	                	        // maintenancePhoto = Photo
+    	                	        // =====================================================
+
+    	                	        formatComplaintAnswerWithPhoto(
+    	                	            10,
+    	                	            item.qid10,
+    	                	            item.maintenancePhoto,
+    	                	            item.qid11
+    	                	        )
+
+    	                	    ]);
+
+    	                	});
+
+    	                }
+
+
+    	                // =================================================
+    	                // DRAW
+    	                // =================================================
+
+    	                complaintDetailsDataTable.draw();
+
+    	                // =================================================
+    	                // OPEN MODAL
+    	                // =================================================
+    	                	
+ 	                	$("#complaintDetailsModal").modal({
+			        	    backdrop: 'static',
+			        	    keyboard: false
+			        	});
+			           
+			            $("#complaintDetailsModal").modal("show");
+
+    	                // =================================================
+    	                // FIX DATATABLE WIDTH
+    	                // =================================================
+
+    	                setTimeout(function() {
+    	                    complaintDetailsDataTable
+    	                        .columns.adjust();
+    	                }, 300);
+
+    	            });
+
+    	        },
+
+    	        error: function(xhr) {
+    	            console.error( "Complaint Details Error:", xhr );
+    	            Swal.fire({
+    	                icon: 'error',
+    	                title: 'Error',
+    	                text: 'Unable to load complaint details.'
+    	            });
+
+    	        }
+
+    	    });
+    	}
+    	
+    	
+    	// =========================================================
+		// COMPLAINT PHOTO BUTTON
+		// =========================================================
+
+		$(document).on("click", ".complaintPhotoBtn", function () {
+		
+		    var photoUrl = $(this).attr("data-photo");
+		    var remark = $(this).attr("data-remark");
+		    var title = $(this).attr("data-title");
+		
+		    // =====================================================
+		    // SET TITLE
+		    // =====================================================
+		
+		    $("#complaintPhotoModalTitle").text(title || "Complaint Photo");
+		
+		
+		    // =====================================================
+		    // SET PHOTO
+		    // =====================================================
+		
+		    if (photoUrl && photoUrl.trim() !== "") {
+		        $("#complaintModalPhoto").attr("src", photoUrl).show();
+		    } else {
+		        $("#complaintModalPhoto").hide();
+		    }
+		
+		
+		    // =====================================================
+		    // SET REMARK
+		    // =====================================================
+		
+		    if (remark && remark.trim() !== "") {
+		        $("#complaintModalRemark").text(remark);
+		
+		    } else {
+		        $("#complaintModalRemark").text("No Remark");
+		    }
+		
+	    // =====================================================
+	    // OPEN MODAL
+	    // =====================================================
+	
+		    $("#complaintPhotoModal").modal({
+		        backdrop: "static",
+		        keyboard: false
+		    });
+		
+		    $("#complaintPhotoModal").modal("show");
+	
+		});
+
+    
+    	// =========================================================
+    	// COMPLAINT QUESTION MASTER
+    	// =========================================================
+
+    	let complaintQuestionMaster = [];
+    	
+    	function loadComplaintQuestionMaster(callback) {
+
+    	    $.ajax({
+    	        url: "/commissionerreview/api/shelter/complaintquestions",
+    	        type: "GET",
+    	        data: {
+    	            cid: 1
+    	        },
+    	        dataType: "json",
+
+    	        success: function(res) {
+
+    	            console.log( "Complaint Question Master:", res );
+
+    	            if (
+    	                res &&
+    	                res.data &&
+    	                Array.isArray(res.data)
+    	            ) {
+    	            	
+    	                complaintQuestionMaster = res.data;
+    	                console.log( "Complaint Questions Loaded:", complaintQuestionMaster.length );
+
+    	                if (callback) {
+    	                    callback();
+    	                }
+
+    	            } else {
+    	                console.error( "Complaint question master data not found.", res );
+    	                
+    	                complaintQuestionMaster = [];
+
+    	                if (callback) {
+    	                    callback();
+    	                }
+    	            }
+    	        },
+
+    	        error: function(xhr, status, error) {
+    	            console.error( "Complaint Question Master API Error:", xhr.status, error );
+    	            console.error( "Response:", xhr.responseText );
+    	            complaintQuestionMaster = [];
+
+    	            if (callback) {
+    	                callback();
+    	            }
+    	        }
+    	    });
+    	}
+    	
+    	// =========================================================
+    	// FORMAT COMPLAINT ANSWER USING QUESTION MASTER
+    	// =========================================================
+
+    	function formatComplaintAnswer(qid, value) {
+
+    	    if (value === null || value === undefined || value === '') {
+    	        return '-';
+    	    }
+
+    	    var question = complaintQuestionMaster.find(
+    	        function(q) {
+    	            return String(q.qid) === String(qid);
+    	        }
+    	    );
+
+    	    if (!question) {
+    	        console.warn( "Question not found:", qid );
+    	        return value;
+    	    }
+
+    	    if (!question.options || !Array.isArray(question.options)) {
+    	        console.warn( "Options not found for qid:", qid );
+    	        return value;
+    	    }
+
+    	    var option = question.options.find(
+    	        function(o) {
+    	            return String(o.option_id) === String(value);
+    	        }
+    	    );
+
+    	    if (option) {
+    	        return option.english_name;
+    	    }
+
+    	    console.warn("Option not found:", qid, value );
+
+    	    return value;
+    	}
+    	
+    	function formatComplaintAnswerWithPhoto( qid, answer, photo, remark ) {
+
+    		    // =========================================================
+    		    // GET YES / NO BADGE
+    		    // =========================================================
+
+    		    var answerHtml = formatComplaintAnswer(qid, answer);
+
+    		    // =========================================================
+    		    // CHECK ANSWER TEXT
+    		    // =========================================================
+
+    		    var tempDiv = document.createElement("div");
+
+    		    tempDiv.innerHTML = answerHtml;
+
+    		    var answerText = (tempDiv.textContent || tempDiv.innerText || "")
+    		        .trim().toLowerCase();
+
+    		    // =========================================================
+    		    // YES + PHOTO
+    		    // =========================================================
+
+    		    if (answerText === "yes" &&
+    		        photo &&
+    		        photo.trim() !== "" ) {
+
+    		        return `
+    		            <div class="complaint-answer-cell">
+
+    		                ${answerHtml}
+
+    		                <button type="button"
+    		                        class="complaint-photo-badge complaintPhotoBtn"
+    		                        data-photo="${escapeHtml(photo)}"
+    		                        data-remark="${escapeHtml(remark || "")}"
+    		                        data-title="${getComplaintPhotoTitle(qid)}">
+
+    		                    <i class="fa-solid fa-image"></i>
+    		                    View Photo
+
+    		                </button>
+
+    		            </div>
+    		        `;
+    		    }
+
+
+    		    // =========================================================
+    		    // NO / WITHOUT PHOTO
+    		    // =========================================================
+
+    		    return `
+    		        <div class="complaint-answer-cell">
+    		            ${answerHtml}
+    		        </div>
+    		    `;
+    		}
+    	
+    	// =========================================================
+	    // formatComplaintAnswerWithPhoto
+	    // =========================================================
+
+  
+    	
+    	function getComplaintPhotoTitle(qid) {
+
+    	    switch (String(qid)) {
+
+    	        case "1": return "Infrastructural Complaint Photo & Remark";
+    	        case "4": return "Food Problem Photo & Remark";
+    	        case "7": return "Resident Issue Photo & Remark";
+    	        case "10": return "Maintenance Issue Photo & Remark";
+
+    	        default: return "Complaint Photo & Remark";
+    	    }
+    	}
+    	
+    	function escapeHtml(value) {
+
+    	    if (value === null || value === undefined) {
+    	        return "";
+    	    }
+
+    	    return String(value)
+    	        .replace(/&/g, "&amp;")
+    	        .replace(/</g, "&lt;")
+    	        .replace(/>/g, "&gt;")
+    	        .replace(/"/g, "&quot;")
+    	        .replace(/'/g, "&#039;");
+    	}
+    	
+    	// =========================================================
+    	// COMPLAINT DATE FORMAT
+    	// =========================================================
+    	
+    	function formatComplaintAnswer(qid, value) {
+
+    	    if (
+    	        value === null ||
+    	        value === undefined ||
+    	        value === ''
+    	    ) {
+    	        return '-';
+    	    }
+
+    	    var question = complaintQuestionMaster.find(
+    	        function(q) {
+    	            return String(q.qid) === String(qid);
+    	        }
+    	    );
+
+    	    if (!question || !question.options) {
+    	        return value;
+    	    }
+
+    	    var option = question.options.find(
+    	        function(o) {
+    	            return String(o.option_id) === String(value);
+    	        }
+    	    );
+
+    	    if (!option) {
+    	        return value;
+    	    }
+
+    	    var answer = option.english_name;
+
+    	    if (answer === "Yes") {
+    	        return '<span class="badge bg-success">Yes</span>';
+    	    }
+
+    	    if (answer === "No") {
+    	        return '<span class="badge bg-danger">No</span>';
+    	    }
+
+    	    return answer;
+    	}
+    	
+    	// =========================================================
+    	// COMPLAINT DATE FORMAT
+    	// =========================================================
+
+    	function formatComplaintDate(date) {
+
+    	    if (!date) {
+    	        return '-';
+    	    }
+
+    	    var parts = String(date).split('-');
+
+    	    if (parts.length === 3) {
+    	        return parts[2] + '/' +
+    	               parts[1] + '/' +
+    	               parts[0];
+    	    }
+
+    	    return date;
+    	}
+    	
+
+    // =========================================================
+    // RESET FILTERS
+    // =========================================================
+
+    function resetFilters() {
+	    $('#fromDate').val('');
+	    $('#toDate').val('');
+        $("#zone").val("");
+        $("#category").val("");
+        //loadDetailedReport();
+        
+        initializeComplaintDates();
+    }
+
+</script>
+
+  
+</body>
+
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/shelterinspection/dashboard.html b/src/main/resources/templates/modules/shelterinspection/dashboard.html
new file mode 100644
index 0000000..319c38d
--- /dev/null
+++ b/src/main/resources/templates/modules/shelterinspection/dashboard.html
@@ -0,0 +1,2809 @@
+<!DOCTYPE html>
+<html lang="en" dir="" xmlns:th="http://www.thymeleaf.org">
+<head th:replace="~{fragments/modules/base/head :: head}">
+	<link rel="stylesheet" th:href="@{/assets/css/bootstrap.min.css}">
+	
+	<!-- DataTables -->
+	<link rel="stylesheet" href="https://cdn.datatables.net/1.13.8/css/dataTables.bootstrap5.min.css">
+	<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.2/css/buttons.bootstrap5.min.css">
+
+	<link rel="stylesheet" th:href="@{/assets/css/style.css}">
+	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css">
+	
+	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css">
+	<script src="https://cdn.jsdelivr.net/npm/flatpickr"></script>
+
+	<script th:src="@{/assets/js/jquery.min.js}"></script>
+
+	<script th:src="@{/assets/js/bootstrap.bundle.min.js}"></script>
+
+	
+</head>
+
+<style>
+	
+	/* Full Page Loader */
+	.page-loader {
+	    position: fixed;
+	    top: 0;
+	    left: 0;
+	    width: 100%;
+	    height: 100%;
+	    background: rgba(255, 255, 255, 0.75);
+	    z-index: 99999;
+	
+	    display: none;
+	
+	    align-items: center;
+	    justify-content: center;
+	}
+	
+	/* Loader content */
+	.page-loader-content {
+	    text-align: center;
+	    background: #ffffff;
+	    padding: 25px 40px;
+	    border-radius: 10px;
+	
+	    box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
+	
+	    font-weight: 600;
+	    color: #156082;
+	}
+	
+	/*Date Filter*/
+	.filterBtn{
+	    border-radius:8px;
+	    padding:8px 22px;
+	    font-weight:600;
+	}
+	
+	.filterBtn.active{
+	    background:#233443;
+	    color:#fff;
+	    border-color:#233443;
+	}
+	
+	.filterBtn:not(.active){
+	    background:#fff;
+	    color:#666;
+	}
+	
+	
+		.report-card {
+			border-radius: 12px;
+			padding: 20px;
+			background: #fff;
+			box-shadow: 0 2px 10px rgba(0, 0, 0, 0.08);
+			height: 100%;
+		}
+
+		.report-title {
+			font-size: 12px;
+			color: #777;
+			text-transform: uppercase;
+		}
+
+		.report-count {
+			font-size: 32px;
+			font-weight: 700;
+			color: #222;
+		}
+
+		.section-box {
+			border-radius: 12px;
+			background: #fff;
+			padding: 20px;
+			margin-top: 20px;
+			box-shadow: 0 2px 10px rgba(0, 0, 0, 0.08);
+		}
+
+		.section-title {
+			font-size: 18px;
+			font-weight: 600;
+			margin-bottom: 15px;
+		}
+
+		.progress {
+			height: 10px;
+			border-radius: 20px;
+		}
+
+		.report-row {
+			margin-bottom: 15px;
+		}
+
+
+		.report-card {
+			min-height: 130px;
+		}
+
+		.report-count {
+			margin-top: 10px;
+		}
+
+		.section-box {
+			min-height: 100%;
+		}
+
+		.progress-bar {
+			border-radius: 20px;
+		}
+
+		body {
+			background: #f5f7fb;
+		}
+		
+		.dashboard-card {
+		    height: 150px;
+		    border-radius: 12px;
+		    box-shadow: 0 2px 10px rgba(0,0,0,0.08);
+		}
+		
+		.dashboard-card .card-body{
+		    height:100%;
+		    display:flex;
+		    flex-direction:row;
+		    align-items:center;
+		    justify-content:flex-start;
+		    gap:5px;
+		    padding:20px;
+		}
+		
+		.dashboard-details{
+		    display:flex;
+		    flex-direction:column;
+		    justify-content:center;
+		    text-align:left;
+		}
+		
+
+		
+		.dashboard-card .card-title{
+		    height: 48px;              /* Same title height for every card */
+		    display: flex;
+		    align-items: center;
+		    justify-content: center;
+		    text-align: center;
+		    font-size: 14px;
+		    line-height: 1.2;
+		    margin-bottom: 0;
+		}
+		
+		.dashboard-count{
+		    font-size: 38px;
+		    font-weight: 700;
+		    margin: 0;
+		}
+
+
+		.dashboard-icon{
+		    width:55px;
+		    height:55px;
+		    min-width:55px;
+		    border-radius:50%;
+		    display:flex;
+		    justify-content:center;
+		    align-items:center;
+		    font-size:22px;
+		}
+		
+		.dashboard-details h2{
+		    margin:0;
+		    font-size:34px;
+		    font-weight:700;
+		    line-height:1;
+		}
+		
+		.dashboard-details h6{
+		    margin:6px 0 0;
+		    font-size:15px;
+		    font-weight:600;
+		}
+		
+		.dashboard-details small{
+		    color:#999;
+		    font-size:13px;
+		}
+		
+		
+		/* =====================================================
+   SECOND ROW DASHBOARD CARD
+   Icon + Count in same line
+   Title below
+   ===================================================== */
+
+.dashboard-second-card .card-body {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+
+    padding: 15px;
+    gap: 5px;
+}
+
+
+/* Icon + Count same line */
+.dashboard-second-card .dashboard-details {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+
+    width: 100%;
+    gap: 4px;
+
+    text-align: center;
+}
+
+
+/* Move icon before count */
+.dashboard-second-card .dashboard-icon {
+    width: 45px;
+    height: 45px;
+    min-width: 45px;
+
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    border-radius: 50%;
+
+    font-size: 20px;
+
+    margin: 0;
+}
+
+
+/* Count */
+.dashboard-second-card .dashboard-details h2 {
+    margin: 0;
+
+    font-size: 34px;
+    font-weight: 700;
+
+    line-height: 1;
+}
+
+
+/* Title below icon + count */
+.dashboard-second-card .dashboard-details h6 {
+    position: absolute;
+
+    margin-top: 95px;
+
+    font-size: 15px;
+    font-weight: 600;
+
+    line-height: 1.2;
+
+    text-align: center;
+}
+		
+		.shelter-bg{
+		    background:#EAF4FF !important;
+		    color:#2196F3 !important;
+		}
+		
+		.resident-bg{
+		    background:#EAFBF1 !important;
+		    color:#4CAF50 !important;
+		}
+		
+		.visit-bg{
+		    background:#F8EEFF !important;
+		    color:#9C27B0 !important;
+		}
+		
+		.rescue-bg{
+		    background:#FFF6E6 !important;
+		    color:#FF9800 !important;
+		}
+		
+		.rehab-bg{
+		    background:#FFF0F0 !important;
+		    color:#F44336 !important;
+		}
+		
+		.reintegration-bg{
+		    background:#FFF5E6 !important;
+		    color:#FF9800 !important;
+		}
+		
+		.entitlement-bg{
+		    background:#EEF8FF !important;
+		    color:#03A9F4 !important;
+		}
+		
+		.info-bg{
+		    background:#EFFAF0 !important;
+		    color:#4CAF50 !important;
+		}
+		
+		.left-bg{
+		    background:#FFF3F3 !important;
+		    color:#F44336 !important;
+		}
+		
+		.death-bg{
+		    background:#FFEDED !important;
+		    color:#E53935 !important;
+		}
+		
+		
+		/* SHelters List */
+		
+		
+		.shelter-table thead th{
+		    font-size:12px;
+		    color:#8b95a1;
+		    border:none;
+		    font-weight:600;
+		    text-transform:uppercase;
+		}
+		
+		.shelter-table tbody td{
+		    border-top:1px solid #edf1f5;
+		    vertical-align:middle;
+		    padding:16px 10px;
+		    font-size:14px;
+		}
+		
+		.shelter-name{
+		    font-weight:600;
+		    color:#2c3e50;
+		}
+		
+		.zone-text{
+		    color:#2980b9;
+		    font-weight:600;
+		}
+		
+		.badge-category{
+		    padding:5px 12px;
+		    border-radius:30px;
+		    font-size:12px;
+		    font-weight:600;
+		}
+		
+		.badge-men{
+		    background:#E8F4FD;
+		    color:#3498db;
+		}
+		
+		.badge-women{
+		    background:#FDEEF5;
+		    color:#e91e63;
+		}
+		
+		.badge-special{
+		    background:#FFF3E0;
+		    color:#fb8c00;
+		}
+		
+		.resident-count{
+		    font-size:18px;
+		    font-weight:700;
+		    color:#1f4e79;
+		}
+		
+		.status-good{
+		    color:#4CAF50;
+		    font-weight:600;
+		}
+		
+		.btn-view-all {
+		    background: #EAF5FB;
+		    color: #1f6ea5;
+		    /*border: 2px solid #1f6ea5;    thick border */
+		    border: 1.5px solid #1f6ea5;
+		    border-radius: 8px;
+		    width: 100%;
+		    font-weight: 600;
+		    cursor: pointer;
+		}
+		
+		.btn-view-all:hover {
+		    background: #1f6ea5;
+		    color: #ffffff;
+		}
+
+
+		/* Fund List */
+
+		.fund-row{
+		    margin-bottom:18px;
+		}
+		
+		.fund-left{
+		    display:flex;
+		    align-items:center;
+		    gap:8px;
+		    width:75%;
+		}
+		
+		.fund-dot{
+		    width:8px;
+		    height:8px;
+		    border-radius:50%;
+		}
+		
+		.fund-text{
+		    font-size:13px;
+		    color:#5d6778;
+		    flex:1;
+		}
+		
+		.fund-progress{
+		    height:5px;
+		    background:#edf1f5;
+		    border-radius:10px;
+		    overflow:hidden;
+		    margin-top:6px;
+		}
+		
+		.fund-progress-bar{
+		    height:100%;
+		    border-radius:10px;
+		}
+		
+		.fund-total{
+		    font-weight:700;
+		    color:#444;
+		    font-size:14px;
+		}
+		
+		
+		/* Recent Visit */
+		.recent-visit-item{
+		    display:flex;
+		    align-items:center;
+		    margin-bottom:18px;
+		}
+		
+		.visit-icon{
+		    width:38px;
+		    height:38px;
+		    border-radius:10px;
+		    background:#E8F4FA;
+		    display:flex;
+		    align-items:center;
+		    justify-content:center;
+		    color:#2C6C88;
+		    margin-right:12px;
+		}
+		
+		.visit-title{
+		    font-size:14px;
+		    font-weight:600;
+		    color:#263238;
+		}
+		
+		.visit-subtitle{
+		 	display:flex;
+		    align-items:center;
+		    gap:25px;
+		    font-size:12px;
+		    color:#8A9099;
+		    margin-top:2px;
+		}
+		
+		
+		/* Fund Shelter Modal */
+		#fundShelterModal .modal-dialog {
+		    max-width: 95%;
+		    margin: 1.75rem auto;
+		}
+		
+		#fundShelterModal .modal-content {
+		    border-radius: 6px;
+		    overflow: hidden;
+		}
+		
+		#fundShelterModal .modal-header {
+		    background: #40516f;
+		    color: #fff;
+		    padding: 12px 18px;
+		}
+		
+		#fundShelterModal .modal-title {
+		    font-size: 16px;
+		    font-weight: 500;
+		}
+		
+		#fundShelterModal .modal-header .close {
+		    color: #fff;
+		    opacity: 0.8;
+		    font-size: 24px;
+		}
+		
+		#fundShelterModal .modal-header .close:hover {
+		    color: #fff;
+		    opacity: 1;
+		}
+		
+		#fundShelterModal .modal-body {
+		    padding: 18px;
+		}
+		
+		#fundShelterModal .modal-footer {
+		    padding: 10px 15px;
+		}
+		
+		#fundShelterTable thead th {
+		    background: #343a40;
+		    color: #fff;
+		    white-space: nowrap;
+		}
+		
+		#fundShelterTable tbody td {
+		    vertical-align: middle;
+		    white-space: nowrap;
+		}
+		
+		#fundShelterTable {
+		    width: 100% !important;
+		}
+	
+
+	</style>
+
+<body>
+	<div class="wrapper">
+		<header th:replace="~{fragments/modules/base/header :: header}"></header>
+
+		<div class="page-wrap">
+			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
+			<div class="main-content">
+				<div class="container-fluid">
+					<div class="page-header">
+						<div class="row align-items-center mb-4">
+
+							<div class="col-lg-6">
+
+								<div class="page-header-title">
+									<i class="ik ik-thumbs-up bg-blue"></i>
+									<div class="d-inline">
+
+										<h3 class="mb-0">
+											Dashboard
+										</h3>
+
+									</div>
+								</div>
+
+							</div>
+
+							<div class="col-lg-6 text-right">
+
+								<nav class="breadcrumb-container" aria-label="breadcrumb">
+									<ol class="breadcrumb justify-content-end">
+										<li class="breadcrumb-item">
+											<a href="/index">
+												<i class="ik ik-home"></i>
+											</a>
+										</li>
+
+										<li class="breadcrumb-item active">
+											Dashboard
+										</li>
+									</ol>
+								</nav>
+
+							</div>
+
+						</div>
+						
+						<div class="row mb-4 align-items-center">
+
+						    <div class="col-md-8">
+						
+						        <div class="btn-group" role="group">
+						
+						            <button class="btn btn-primary filterBtn active"
+						                    data-type="day">
+						                Daily
+						            </button>
+						
+						            <button class="btn btn-outline-primary filterBtn"
+						                    data-type="month">
+						                Monthly
+						            </button>
+						
+						            <button class="btn btn-outline-primary filterBtn"
+						                    data-type="year">
+						                Yearly
+						            </button>
+						
+						        </div>
+						
+						    </div>
+						
+						    <div class="col-md-4 text-right">
+						
+						        <input type="date" id="filterDate" 
+						        	   class="form-control d-inline-block" style="width:180px;">
+						
+						        <input type="month" id="filterMonth"
+						               class="form-control d-none d-inline-block" style="width:180px;">
+						               
+				               <select id="filterYear"
+								        class="form-control d-none d-inline-block"
+								        style="width:180px;">
+								</select>
+						               
+						    </div>
+						
+						</div>
+						
+						<div class="row">
+	
+
+							
+							<div class="col mb-4 d-flex">
+								<div class="card dashboard-card text-center w-100">
+									<div class="card-body">
+									
+									 <div class="dashboard-icon shelter-bg">
+						                <i class="fas fa-home"></i>
+						             </div>
+						
+						            <div class="dashboard-details">
+						                <h2 id="totalshelter">0</h2>
+						                <h6>Total Shelters</h6>
+						                <!-- <small>All Shelters</small> -->
+						            </div>
+									
+										
+									</div>
+								</div>
+							</div>
+
+							<div class="col mb-4 d-flex">
+								<div class="card dashboard-card text-center w-100">
+									<div class="card-body">
+									
+									 <div class="dashboard-icon resident-bg">
+						                <i class="fas fa-users"></i>
+						             </div>
+						
+						            <div class="dashboard-details">
+						                <h2 id="totalResidents">0</h2>
+						                <h6>Total Resident</h6>
+						                <!-- <small>All Shelters</small> -->
+						            </div>
+									
+										
+									</div>
+								</div>
+							</div>
+
+							<div class="col mb-4 d-flex">
+								<div class="card dashboard-card text-center w-100">
+									<div class="card-body">
+									
+									 <div class="dashboard-icon visit-bg">
+						                <i class="fas fa-eye"></i>
+						             </div>
+						
+						            <div class="dashboard-details">
+						                <h2 id="numberOfVisits">0</h2>
+						                <h6>Number of Visits</h6>
+						                <!-- <small>All Shelters</small> -->
+						            </div>
+									
+									</div>
+								</div>
+							</div>
+
+					<!-- 		<div class="col mb-4 d-flex">
+								<div class="card dashboard-card text-center w-100">
+									<div class="card-body">
+									
+									<div class="dashboard-icon rescue-bg">
+						                <i class="fas fa-user-shield"></i>
+						             </div>
+						
+						            <div class="dashboard-details">
+						                <h2 id="numberOfVisits">0</h2>
+						                <h6>Rescue</h6>
+						                <small>All Shelters</small>
+						            </div>
+									
+									</div>
+								</div>
+							</div> -->
+
+							
+
+						</div>
+
+
+						<div class="row">
+						
+						    <div class="col-lg-2 col-md-4 col-sm-6">
+						        <div class="card dashboard-card dashboard-second-card text-center">
+						            <div class="card-body">
+						            
+						            	<div class="dashboard-icon rehab-bg">
+							                <i class="fas fa-handshake"></i>
+							             </div>
+							
+							            <div class="dashboard-details">
+							                <h2 id="rehabilitation">0</h2> 
+							                <h6>Rehabilitation</h6>
+							                <!-- <small>All Shelters</small> -->
+							            </div>
+						            
+						               
+						            </div>
+						        </div>
+						    </div>
+						
+						    <div class="col-lg-2 col-md-4 col-sm-6 mb-4 p-1">
+						        <div class="card dashboard-card dashboard-second-card text-center">
+						            <div class="card-body">
+						            
+						            	<div class="dashboard-icon reintegration-bg">
+							                <i class="fas fa-handshake"></i>
+							             </div>
+							
+							            <div class="dashboard-details">
+							                <h2 id="reintegration">0</h2> 
+							                <h6>Reintegration</h6>
+							                <!-- <small>All Shelters</small> -->
+							            </div>
+						            
+						          
+						            </div>
+						        </div>
+						    </div>
+						
+						    <div class="col-lg-2 col-md-4 col-sm-6 mb-4">
+						        <div class="card dashboard-card dashboard-second-card text-center">
+						            <div class="card-body">
+						            
+						            	<div class="dashboard-icon entitlement-bg">
+							                <i class="fas fa-id-card"></i>
+							             </div>
+							
+							            <div class="dashboard-details">
+							                <h2 id="entitlementAccess">0</h2> 
+							                <h6>Entitlement</h6>
+							                <!-- <small>All Shelters</small> -->
+							            </div>
+						            
+						           <!--  <h6 class="card-title">Entitlement</h6>
+						                <h6 class="card-title">Entitlement Access</h6>
+						                <h1 id="entitlementAccess" class="dashboard-count">0</h1> -->
+						            </div>
+						        </div>
+						    </div>
+						
+						    <div class="col-lg-2 col-md-4 col-sm-6 mb-4">
+						        <div class="card dashboard-card dashboard-second-card text-center">
+						            <div class="card-body">
+						            
+						            	<div class="dashboard-icon info-bg">
+							                <i class="fas fa-arrow-right"></i>
+							             </div>
+							
+							            <div class="dashboard-details">
+							                <h2 id="leftWithInfo">0</h2> 
+							                <h6>Left with Info</h6>
+							                <!-- <small>All Shelters</small> -->
+							            </div>
+						            
+						           
+						            </div>
+						        </div>
+						    </div>
+						
+						    <div class="col-lg-2 col-md-4 col-sm-6 mb-4">
+						        <div class="card dashboard-card dashboard-second-card text-center">
+						            <div class="card-body">
+						            
+						            	<div class="dashboard-icon left-bg">
+							                <i class="fas fa-arrow-left"></i>
+							             </div>
+							
+							            <div class="dashboard-details">
+							                <h2 id="leftWithoutInfo">0</h2> 
+							                <h6>Left without Info</h6>
+							                <!-- <small>All Shelters</small> -->
+							            </div>
+							            
+						               
+						            </div>
+						        </div>
+						    </div>
+						
+						    <div class="col-lg-2 col-md-4 col-sm-6 mb-4">
+						        <div class="card dashboard-card dashboard-second-card text-center">
+						            <div class="card-body">
+						            
+						            	<div class="dashboard-icon death-bg">
+							                <i class="fas fa-skull-crossbones"></i>
+							             </div>
+							
+							            <div class="dashboard-details">
+							                <h2 id="deathCount">0</h2> 
+							                <h6>Death Count</h6>
+							                <!-- <small>All Shelters</small> -->
+							            </div>
+						            
+						            
+						            </div>
+						        </div>
+						    </div>
+						
+						</div>
+						
+					</div>
+					
+					<div class="row mt-3 align-items-stretch">
+						<!-- Shelters -->
+						<div class="col-md-8 mb-4">
+							<div class="card h-80" style="height:550px;">
+								<div class="card-body">
+								
+								<div class="d-flex justify-content-between align-items-center mb-3">
+							        <h5 class="section-title mb-0 font-weight-bold">Shelters</h5>
+							
+							        <!-- <span class="text-muted">
+							            <span id="totalSheltersList">0</span> Total
+							        </span> -->
+							    </div>
+							
+							    <div class="table-responsive">
+							
+							        <table class="table shelter-table align-middle mb-0">
+							
+							            <thead>
+							                <tr>
+							                    <th>SHELTER</th>
+							                    <th>ZONE</th>
+							                    <th>CATEGORY</th>
+							                    <th>RESIDENTS</th>
+							                    <th>STATUS</th>
+							                </tr>
+							            </thead>
+							
+							            <tbody id="shelterTableBody">
+							
+							            </tbody>
+							
+							        </table>
+							
+							    </div>
+							
+							    <div class="text-center mt-3">
+							    
+							    <button type="button" class="btn btn-view-all text-primary" 
+								        onclick="window.location.href='/gcc/shelterinspection/shelterlist'">
+								    View All Shelters
+								    <i class="fas fa-chevron-right ms-1"></i>
+								</button>
+							
+							    </div>	
+							
+								</div>
+							</div>
+						</div>
+						
+						<!-- Religion WISE -->
+						<div class="col-md-4 mb-4">
+
+						    <!-- Region-wise Summary -->
+						    <div class="card mb-3">
+						        <div class="card-body">
+						
+						            <h5 class="section-title mb-0 font-weight-bold">
+						                Region-wise Summary
+						            </h5>
+						
+						            <div id="regionWiseDiv"
+						                 style="margin-top:20px;">
+						            </div>
+						
+						        </div>
+						    </div>
+						
+						    <!-- Fund Received Summary -->
+						    <div class="card">
+						        <div class="card-body">
+						
+						            <h5 class="section-title mb-0 font-weight-bold">
+						                Fund Received Summary
+						            </h5>
+						
+						            <div id="fundSummaryDiv"
+						                 style="margin-top:20px;">
+						            </div>
+						
+						        </div>
+						    </div>
+						
+
+						</div>
+					</div>
+					
+					<div class="row mt-3 align-items-stretch">
+						<!-- Monthly Trends -->
+	<!-- 					<div class="col-md-6 mb-4">
+							<div class="card h-80" style="height:400px;">
+								<div class="card-body">
+								
+								<div class="d-flex justify-content-between align-items-center mb-3">
+							        <h5 class="section-title mb-0 font-weight-bold">Monthly Trends</h5>
+							    </div>
+							
+					            <div id="monthlyTrendChart"
+						             style="height:320px;">
+						        </div>
+								
+								</div>
+							</div>
+						</div> -->
+						
+						<!-- Daily CDO Visits -->
+						<div class="col-md-6 mb-4">
+						
+						    <!-- Daily CDO Visits  -->
+							<div class="card h-80 " style="height:400px;">
+							    <div class="card-body">
+							
+							        <div class="d-flex justify-content-between mb-3">
+							            <h5 class="font-weight-bold">
+							                Daily CDO Visits (This Week)
+							            </h5>
+
+							        </div>
+							
+							        <div id="weeklyVisitChart"
+							             style="height:320px;">
+							        </div>
+							
+							    </div>
+							</div>
+						
+						</div>
+						
+						
+							<!-- Latest CDO Visit -->
+						<div class="col-md-6 mb-4">
+						
+						    <!-- Latest CDO Visit  -->
+							<div class="card h-80 " style="height:400px;">
+							    <div class="card-body">
+							
+							        <div class="d-flex justify-content-between mb-3">
+							            <h5 class="font-weight-bold">
+							                Recent Visits 
+							            </h5>
+							
+							            <a onclick="window.location.href='/gcc/shelterinspection/visitlist'" class="text-primary" style="cursor: pointer;">
+							                View all
+							            </a>
+							        </div>
+							
+							        <div id="recentVisitDiv" style="height:320px;">
+							        </div>
+							
+							    </div>
+							</div>
+						
+						</div>
+						
+						
+					</div>
+					
+					
+					<div class="row mt-3 align-items-stretch">
+						 <!-- Complaint List -->
+					<!--	<div class="col-md-6 mb-4">
+							<div class="card h-80" style="height:400px;">
+								<div class="card-body">
+								
+								</div>
+							</div>
+						</div> -->
+						
+						<!-- Latest CDO Visit -->
+						<!-- <div class="col-md-6 mb-4">
+						
+						    Latest CDO Visit 
+							<div class="card h-80 " style="height:400px;">
+							    <div class="card-body">
+							
+							        <div class="d-flex justify-content-between mb-3">
+							            <h5 class="font-weight-bold">
+							                Recent Visits 
+							            </h5>
+							
+							            <a onclick="window.location.href='/gcc/shelterinspection/visitlist'" class="text-primary" style="cursor: pointer;">
+							                View all
+							            </a>
+							        </div>
+							
+							        <div id="recentVisitDiv" style="height:320px;">
+							        </div>
+							
+							    </div>
+							</div>
+						
+						</div> -->
+						
+						
+					</div>
+
+
+				</div>
+
+
+			</div>
+			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
+		</div>
+	</div>
+
+	
+	<!-- Fund Shelter Details Modal -->
+	<!-- Fund Shelter Details Modal -->
+	<div class="modal fade" id="fundShelterModal" tabindex="-1" data-backdrop="static" data-keyboard="false">
+	    <div class="modal-dialog modal-xl" role="document" style="max-width:95%;">
+	        <div class="modal-content">
+	
+	            <!-- Header -->
+	            <div class="modal-header">
+	
+	                <h5 class="modal-title">
+	                    Fund Shelter Details
+	                </h5>
+	
+	                <button type="button" class="close" onclick="$('#fundShelterModal').modal('hide')">
+	                    &times;
+	                </button>
+	
+	            </div>
+	
+	
+	            <!-- Body -->
+	            <div class="modal-body">
+	
+	                <!-- Fund Information -->
+	                <div class="mb-3">
+	
+	                    <strong>Fund Type:</strong>
+	                    <span id="modalFundType" class="text-primary">
+	                    </span>
+	
+	                    &nbsp;&nbsp;&nbsp;&nbsp;
+	
+	                    <strong>Total:</strong>
+	                    <span id="modalFundTotal" class="font-weight-bold">
+	                    </span>
+	                </div>
+	
+	
+	                <!-- Table -->
+	                <div class="table-responsive">
+	
+	                    <table id="fundShelterTable" class="table table-bordered table-striped">
+	                        <thead class="thead-dark">
+	                            <tr>
+	                                <th>S.No</th>
+	                                <th>Survey ID</th>
+	                                <th>Shelter Name</th>
+	                                <th>Zone</th>
+	                                <th>Division</th>
+	                                <th>Shelter Type</th>
+	                                <th>Category</th>
+	                            </tr>
+	                        </thead>
+	
+	                        <tbody>
+	                        </tbody>
+	                    </table>
+	
+	                </div>
+	
+	            </div>
+	
+	
+	            <!-- Footer -->
+	            <div class="modal-footer">
+	                <button type="button" class="btn btn-secondary" onclick="$('#fundShelterModal').modal('hide')">
+	                    Close
+	                </button>
+	            </div>
+	
+	        </div>
+	    </div>
+	</div>
+	
+	<!-- Full Page Loader -->
+	<div id="pageLoader" class="page-loader">
+	
+	    <div class="page-loader-content">
+	
+	        <div class="spinner-border text-primary"
+	             role="status"
+	             style="width:3rem;height:3rem;">
+	        </div>
+	
+	        <div class="mt-3">
+	            Loading shelter details...
+	        </div>
+	
+	    </div>
+	
+	</div>
+	
+	
+
+	<div th:replace="~{fragments/modules/base/script :: script}"></div>
+	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
+
+
+	<script src="https://cdn.datatables.net/1.13.8/js/jquery.dataTables.min.js"></script>
+	<script src="https://cdn.datatables.net/1.13.8/js/dataTables.bootstrap5.min.js"></script>
+	<script src="https://cdn.datatables.net/responsive/2.5.0/js/dataTables.responsive.min.js"></script>
+
+	<!-- DataTable Buttons -->
+	<script src="https://cdn.datatables.net/buttons/2.4.2/js/dataTables.buttons.min.js"></script>
+	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.bootstrap5.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
+	<script src="https://cdn.datatables.net/buttons/2.4.2/js/buttons.html5.min.js"></script>
+	
+	<script src="https://cdn.amcharts.com/lib/5/index.js"></script>
+	<script src="https://cdn.amcharts.com/lib/5/xy.js"></script>
+	<script src="https://cdn.amcharts.com/lib/5/themes/Animated.js"></script>
+
+	<script th:inline="javascript">
+	
+	let filterType = "day";
+	
+	function showFilter() {
+
+	    $("#filterDate")
+	        .removeClass("d-inline-block")
+	        .addClass("d-none");
+
+	    $("#filterMonth")
+	        .removeClass("d-inline-block")
+	        .addClass("d-none");
+
+	    $("#filterYear")
+	        .removeClass("d-inline-block")
+	        .addClass("d-none");
+
+	    if (filterType === "day") {
+	        $("#filterDate")
+	            .removeClass("d-none")
+	            .addClass("d-inline-block");
+	    }
+
+	    if (filterType === "month") {
+	        $("#filterMonth")
+	            .removeClass("d-none")
+	            .addClass("d-inline-block");
+	    }
+
+	    if (filterType === "year") {
+	        $("#filterYear")
+	            .removeClass("d-none")
+	            .addClass("d-inline-block");
+	    }
+	}
+	
+
+	// Filter button click
+	$(".filterBtn").click(function () {
+
+	    $(".filterBtn")
+	        .removeClass("active btn-primary")
+	        .addClass("btn-outline-primary");
+
+	    $(this)
+	        .removeClass("btn-outline-primary")
+	        .addClass("active btn-primary");
+
+	    filterType = $(this).data("type");
+
+	    // Clear all filter values
+	    $("#filterDate").val("");
+	    $("#filterMonth").val("");
+	    $("#filterYear").val("");
+	    
+	 	// Set default value for selected filter
+	    if (filterType === "day") {
+
+	        $("#filterDate").val(
+	            new Date().toISOString().split("T")[0]
+	        );
+
+	    }
+	    else if (filterType === "month") {
+
+	        $("#filterMonth").val(
+	            new Date().toISOString().slice(0, 7)
+	        );
+
+	    }
+	    else if (filterType === "year") {
+
+	        // Select latest year from DB
+	        $("#filterYear").val($("#filterYear option:first").val());
+
+	    }
+	    
+	    showFilter();
+
+	    loadDashboardData();
+	});
+	
+	$("#filterDate").change(loadDashboardData);
+	$("#filterMonth").change(loadDashboardData);
+	$("#filterYear").change(loadDashboardData);
+	
+ 	
+ 	function loadYears() {
+
+ 	    $.ajax({
+ 	        url: "/gcc/api/shelterinspection/years",
+ 	        type: "GET",
+ 	        success: function(data) {
+
+ 	            let html = "";
+
+ 	            $.each(data, function(i, year) {
+ 	                html += `<option value="${year}">${year}</option>`;
+ 	            });
+
+ 	            $("#filterYear").html(html);
+
+ 	            // Select the first (latest) year by default
+ 	            $("#filterYear").val(data[0]);
+ 	            
+ 	        	// Call dashboard after years loaded
+ 	            loadDashboardData();
+
+ 	        }
+ 	    });
+ 	}
+	
+ 	function getFilterValue(){
+
+ 	    if(filterType=="day"){
+ 	        return $("#filterDate").val();
+ 	    }
+
+ 	    if(filterType=="month"){
+ 	        return $("#filterMonth").val();
+ 	    }
+
+ 	    if(filterType=="year"){
+ 	        return $("#filterYear").val();
+ 	    }
+
+ 	    return "";
+ 	}
+ 	
+ 	$(document).ready(function () {
+
+ 	    
+
+ 	    $("#filterDate").val(new Date().toISOString().split("T")[0]);
+ 	    $("#filterMonth").val(new Date().toISOString().slice(0,7));
+
+ 	    filterType = "day";
+
+ 	    showFilter();
+
+ 	    loadTotalSHelterDashboard();
+ 	    
+ 	    loadYears();
+ 	    
+ 	   // loadDashboardData();
+
+ 	});
+ 	
+ 	function loadDashboardData(){
+
+ 	    let value="";
+
+ 	    if(filterType=="day"){
+ 	        value=$("#filterDate").val();
+ 	    }
+
+ 	    if(filterType=="month"){
+ 	        value=$("#filterMonth").val();
+ 	    }
+
+ 	    if(filterType=="year"){
+ 	        value=$("#filterYear").val();
+ 	    }
+
+ 	   loadTotalSHelterDashboard()
+ 	    loadDashboard(filterType,value);
+ 	    loadTopShelters(filterType,value);
+ 	    loadRegionSummary(filterType,value);
+ 	    loadFundReceivedSummary(filterType,value);
+ 	    //loadMonthlyTrend(filterType,value);
+ 	    loadWeeklyVisits(filterType,value);
+ 	    loadRecentVisits(filterType,value);
+ 	    
+/*  	    setTimeout(function(){
+
+ 	        loadMonthlyTrend(filterType,value);
+ 	        loadWeeklyVisits(filterType,value);
+
+    	},100);
+ */
+ 	}
+
+	function loadTotalSHelterDashboard() {
+
+		$.ajax({
+			url: "/gcc/api/shelterinspection/Sheltercount",
+			type: "GET",
+
+			success: function (data) {
+				$("#totalshelter").text(data.totalShelterCount);
+			}
+		});
+
+	} 
+	
+/* 	 	$(document).ready(function () {
+
+			loadDashboard();
+			loadTopShelters();
+			loadRegionSummary();
+			loadFundReceivedSummary();
+			loadMonthlyTrend();
+			loadWeeklyVisits();
+			loadRecentVisits()
+
+		}); */
+	 	
+	 	function loadDashboard(type, value){
+
+	 	    $.ajax({
+
+	 	        url : "/gcc/api/shelterinspection/dashboard",
+
+	 	        type : "GET",
+
+	 	        data : {
+	 	            type : type,
+	 	            value : value
+	 	        },
+
+	 	        success : function(data){
+
+	 	            $("#totalResidents").text(data.totalResidents);
+	 	            $("#numberOfVisits").text(data.numberOfVisits);
+	 	            $("#rehabilitation").text(data.rehabilitation);
+	 	            $("#reintegration").text(data.reintegration);
+	 	            $("#entitlementAccess").text(data.entitlementAccess);
+	 	            $("#leftWithInfo").text(data.leftWithInfo);
+	 	            $("#leftWithoutInfo").text(data.leftWithoutInfo);
+	 	            $("#deathCount").text(data.deathCount);
+
+	 	        }
+
+	 	    });
+
+	 	}
+
+	
+		
+		/* 	Top 5 Shelters List	 */
+		function loadTopShelters(type, value){
+		
+		    $.ajax({
+		
+		        url: "/gcc/api/shelterinspection/top5Shelters",
+		
+		        type: "GET",
+		
+		        data: {
+		            type: type,
+		            value: value
+		        },
+		
+		        success: function(data){
+		
+		            $("#totalSheltersList").text(data.length);
+		
+		            let html = "";
+		
+		            $.each(data, function(i, item){
+		
+		                let badge = "badge-men";
+		
+		                if(item.category.toLowerCase().includes("women")){
+		                    badge = "badge-women";
+		                }else if(item.category.toLowerCase().includes("special")){
+		                    badge = "badge-special";
+		                }
+		
+		                let status = "Good";
+		
+		                if(item.totalResidents > 150){
+		                    status = "High";
+		                }else if(item.totalResidents < 20){
+		                    status = "Low";
+		                }
+		
+		                html += `
+		                <tr>
+		                    <td class="shelter-name">${item.shelterName}</td>
+		                    <td class="zone-text">${item.zone}</td>
+		                    <td>
+		                        <span class="badge-category ${badge}">
+		                            ${item.category}
+		                        </span>
+		                    </td>
+		                    <td class="resident-count">${item.totalResidents}</td>
+		                    <td class="status-good">${status}</td>
+		                </tr>`;
+		            });
+		
+		            $("#shelterTableBody").html(html);
+		
+		        }
+		
+		    });
+		
+		}
+		
+		
+		/* 	Region Wise Summary List	 */
+		
+		function loadRegionSummary(type, value) {
+
+		    $.ajax({
+		
+		        url: "/gcc/api/shelterinspection/regionSummary",
+		        type: "GET",
+		        data: {
+		            type: type,
+		            value: value
+		        },
+		
+		        success: function (data) {
+		            let maxResidents = 0;
+		            
+		            $.each(data, function (i, row) {
+		                if (row.totalResidents > maxResidents) {
+		                    maxResidents = row.totalResidents;
+		                }
+		            });
+		
+		            let html = "";
+		
+		            $.each(data, function (i, row) {
+		
+		                let width = 0;
+		
+		                if (maxResidents > 0) {
+		                    width = (row.totalResidents / maxResidents) * 100;
+		                }
+		
+		                html += `
+		
+		                <div class="report-row mb-3">
+		                    <div class="d-flex justify-content-between align-items-center">
+		                        <div>
+		
+		                            <strong>${row.region}</strong>
+		
+		                            <span class="text-primary ml-2">
+		                                ${row.totalShelters} Shelters
+		                            </span>
+		
+		                        </div>
+		
+		                        <span class="text-muted">
+		                            ${row.totalVisits} Visits
+		                        </span>
+		
+		                    </div>
+		
+		                    <div class="progress mt-2"
+		                         style="height:6px;border-radius:10px;">
+		
+		                        <div class="progress-bar bg-info"
+		                             style="width:${width}%">
+		                        </div>
+		
+		                    </div>
+		
+		                    <div class="d-flex justify-content-between mt-2">
+		
+		                        <small class="text-muted">
+		                            ${row.totalResidents} Residents
+		                        </small>
+		
+		                        <small class="text-muted">
+		                            ${row.totalVisits} Visits
+		                        </small>
+		
+		                    </div>
+		                </div>
+		
+		                `;
+		
+		            });
+		
+		            $("#regionWiseDiv").html(html);
+		
+		        },
+		
+		        error: function () {
+		
+		            Swal.fire({
+		                icon: "error",
+		                title: "Error",
+		                text: "Unable to load Region Summary.",
+		                allowOutsideClick: false
+		            });
+		
+		        }
+		
+		    });
+		
+		}
+		
+		
+
+		
+		
+		/* 	Fund Received Summary List	 */
+		
+		function loadFundReceivedSummary(type, value) {
+
+		    $.ajax({
+		
+		        url: "/gcc/api/shelterinspection/fundReceivedSummary",
+		        type: "GET",
+		
+		        data: {
+		            type: type,
+		            value: value
+		        },
+		
+		        success: function(data){
+		
+		            let max = 0;
+		
+		            $.each(data,function(i,row){
+		                if(parseInt(row.total) > max){
+		                    max = parseInt(row.total);
+		                }
+		            });
+		
+		            const colors = [
+		
+		                "#156082",
+		                "#E91E63",
+		                "#4CAF50",
+		                "#9C27B0"
+		
+		            ];
+		
+		            let html = "";
+		
+		            $.each(data,function(i,row){
+		
+		                let width = max == 0 ? 0 : (row.total / max) * 100;
+		                let fundType = row.fund_type;
+		
+		                if(fundType){
+		                    fundType = fundType.trim();
+		                    if(fundType === "Not received: Latest monthly bills submitted"){
+		                        fundType = "NR Latest Monthly Bills";
+		                    }
+		                    else if(fundType === "Not received: Latest quarterly bill submitted"){
+		                        fundType = "NR Latest Quarterly Bills";
+		                    }
+		                    else if(fundType === "Not received either"){
+		                        fundType = "Not Received Either";
+		                    }
+		                    else if(fundType === "Received all submitted bills"){
+		                        fundType = "Received All Bills";
+		                    }
+		                }
+		
+		                html += `
+		
+		                <div class="fund-row mb-3">
+		                    <div class="d-flex justify-content-between align-items-center">
+		                    
+		                        <div class="fund-left">
+		                            <span class="fund-dot" style="background:${colors[i % colors.length]}"></span>
+		                            <span class="fund-text">
+		                                ${fundType}
+		                            </span>
+		                        </div>
+		                        
+		                	<span class="font-weight-bold ${parseInt(row.total) > 0 ? 'text-primary' : 'text-muted'}"
+				                    style="${parseInt(row.total) > 0
+				                            ? 'cursor:pointer; text-decoration:underline;'
+				                            : 'cursor:default;'}"
+				                    ${parseInt(row.total) > 0
+				                        ? `onclick='openFundShelterDetails("${type}", "${value}", "${row.fund_type}", ${row.total})'`
+				                        : ''}>
+		
+				                  ${row.total}
+		
+				              </span>
+		                        
+		                     
+		
+		                     
+		
+		                    </div>
+		
+		                    <div class="progress mt-2" style="height:7px; border-radius:20px;">
+		                        <div class="progress-bar"
+		                            style="width:${width}%; background:${colors[i % colors.length]};">
+		                        </div>
+		                    </div>
+		
+		                </div>
+		                
+		                `;
+		            });
+		
+		            $("#fundSummaryDiv").html(html);
+		        },
+		
+		        error:function(){
+		            Swal.fire({
+		                icon:"error",
+		                title:"Error",
+		                text:"Unable to load Fund Summary.",
+		                allowOutsideClick: false
+		            });
+		        }
+		
+		    });
+		
+		}
+		
+		/* Fund Shelter Details List */
+		
+		function openFundShelterDetails(type, value, fundType, total) {
+
+    // Show full page loader immediately
+    $("#pageLoader").css("display", "flex");
+
+
+    $.ajax({
+
+        url: "/gcc/api/shelterinspection/fundReceivedShelterDetails",
+
+        type: "GET",
+
+        data: {
+            type: type,
+            value: value
+        },
+
+
+        success: function(data) {
+
+            console.log("Fund Shelter Details:", data);
+
+
+            // Find selected fund type
+            let fundRow = data.find(function(row) {
+
+                return row.fund_type &&
+                       row.fund_type.trim() === fundType.trim();
+
+            });
+
+
+            if (!fundRow) {
+
+                // Hide loader
+                $("#pageLoader").hide();
+
+                Swal.fire({
+                    icon: "info",
+                    title: "No Details",
+                    text: "No shelter details found.",
+                    allowOutsideClick: false
+                });
+
+                return;
+            }
+
+
+            // -----------------------------
+            // Fund Type
+            // -----------------------------
+
+            $("#modalFundType").text(
+                fundRow.fund_type
+                    ? fundRow.fund_type.trim()
+                    : "-"
+            );
+
+
+            // -----------------------------
+            // Total
+            // -----------------------------
+
+            $("#modalFundTotal").text(
+                fundRow.total || 0
+            );
+
+
+            // -----------------------------
+            // Destroy existing DataTable
+            // -----------------------------
+
+            if ($.fn.DataTable.isDataTable("#fundShelterTable")) {
+
+                $("#fundShelterTable")
+                    .DataTable()
+                    .clear()
+                    .destroy();
+
+            }
+
+
+            // -----------------------------
+            // Clear old rows
+            // -----------------------------
+
+            $("#fundShelterTable tbody").empty();
+
+
+            // -----------------------------
+            // Shelter list
+            // -----------------------------
+
+            let shelters = fundRow.shelters || [];
+
+            let tbody = "";
+
+
+            $.each(shelters, function(i, shelter) {
+
+                tbody += `
+
+                    <tr>
+
+                        <td>
+                            ${i + 1}
+                        </td>
+
+                        <td>
+                            ${shelter.survey_id || "-"}
+                        </td>
+
+                        <td>
+                            ${shelter.shelter_name || "-"}
+                        </td>
+
+                        <td>
+                            ${shelter.zone || "-"}
+                        </td>
+
+                        <td>
+                            ${shelter.division || "-"}
+                        </td>
+
+                        <td>
+                            ${shelter.shelter_type || "-"}
+                        </td>
+
+                        <td>
+                            ${shelter.category || "-"}
+                        </td>
+
+                    </tr>
+
+                `;
+
+            });
+
+
+            // Insert rows
+            $("#fundShelterTable tbody").html(tbody);
+
+
+            // -----------------------------
+            // Initialize DataTable
+            // -----------------------------
+
+            $("#fundShelterTable").DataTable({
+
+                dom: "Bfrtip",
+
+                buttons: [
+
+                    {
+                        extend: "pageLength",
+                        className: "btn btn-warning"
+                    },
+
+                    {
+                        extend: "excelHtml5",
+                        text: "Excel",
+                        className: "btn btn-success"
+                    },
+
+                    {
+                        extend: "pdfHtml5",
+                        text: "PDF",
+                        className: "btn btn-secondary",
+                        orientation: "landscape",
+                        pageSize: "A4"
+                    }
+
+                ],
+
+                responsive: true,
+
+                pageLength: 10,
+
+                lengthMenu: [
+                    [10, 25, 50, -1],
+                    [10, 25, 50, "All"]
+                ],
+
+                searching: true,
+
+                ordering: true,
+
+                autoWidth: false,
+
+                language: {
+                    emptyTable: "No shelter details found",
+                    search: "Search:"
+                }
+
+            });
+
+
+            // -----------------------------
+            // Hide full page loader
+            // -----------------------------
+
+            $("#pageLoader").hide();
+
+
+            // -----------------------------
+            // Show Fund Shelter Modal
+            // -----------------------------
+
+            $("#fundShelterModal").modal({
+                backdrop: "static",
+                keyboard: false
+            });
+
+            $("#fundShelterModal").modal("show");
+
+        },
+
+
+        error: function(xhr, status, error) {
+
+            console.error(
+                "Fund Shelter Details Error:",
+                error
+            );
+
+
+            // Hide full page loader
+            $("#pageLoader").hide();
+
+
+            Swal.fire({
+
+                icon: "error",
+
+                title: "Error",
+
+                text: "Unable to load shelter details.",
+
+                allowOutsideClick: false
+
+            });
+
+        }
+
+    });
+
+}
+
+		/* function openFundShelterDetails(type, value, fundType, total) {
+
+    /*
+     * If total is ZERO
+     * show modal directly
+     *
+    if (parseInt(total) === 0) {
+
+        $("#modalFundType").text(
+            fundType ? fundType.trim() : "-"
+        );
+
+        $("#modalFundTotal").text("0");
+
+        /*  Destroy existing DataTable *
+        if (
+            $.fn.DataTable.isDataTable("#fundShelterTable")
+        ) {
+
+            $("#fundShelterTable")
+                .DataTable()
+                .clear()
+                .destroy();
+
+        }
+
+        /*  Clear table *
+        $("#fundShelterTable tbody").empty();
+
+        /* Initialize empty DataTable *
+        $("#fundShelterTable").DataTable({
+
+            dom: "Bfrtip",
+
+            buttons: [
+                {
+                    extend: "pageLength",
+                    className: "btn btn-warning"
+                },
+                {
+                    extend: "excelHtml5",
+                    text: "Excel",
+                    className: "btn btn-success"
+                },
+                {
+                    extend: "pdfHtml5",
+                    text: "PDF",
+                    className: "btn btn-secondary",
+                    orientation: "landscape",
+                    pageSize: "A4"
+                }
+            ],
+
+            responsive: true,
+            pageLength: 10,
+            searching: true,
+            ordering: true,
+            autoWidth: false,
+            language: {
+                emptyTable: "No shelter details found"
+            }
+        });
+
+        /* Show modal *
+        $("#fundShelterModal").modal({
+            backdrop: "static",
+            keyboard: false
+        });
+
+        $("#fundShelterModal").modal("show");
+
+        return;
+    }
+
+
+    /*
+     * For total > 0
+     * call details API
+     *
+    $.ajax({
+        url: "/gcc/api/shelterinspection/fundReceivedShelterDetails",
+        type: "GET",
+        data: {
+            type: type,
+            value: value
+        },
+
+        success: function(data) {
+        	
+            console.log("Fund Shelter Details:", data);
+
+            /* Find fund type instead of using index *
+            let fundRow = data.find(function(row) {
+
+                return row.fund_type &&
+                       row.fund_type.trim() ===
+                       fundType.trim();
+
+            });
+
+
+            /* No details *
+            if (!fundRow) {
+
+                $("#modalFundType").text(
+                    fundType ? fundType.trim() : "-"
+                );
+
+                $("#modalFundTotal").text(total);
+
+
+                /* Destroy existing DataTable  *
+                if (
+                    $.fn.DataTable.isDataTable("#fundShelterTable")
+                ) {
+
+                    $("#fundShelterTable").DataTable().clear().destroy();
+                }
+
+
+                $("#fundShelterTable tbody").empty();
+
+
+                /* Initialize empty table *
+                $("#fundShelterTable").DataTable({
+                    dom: "Bfrtip",
+                    buttons: [
+                        {
+                            extend: "pageLength",
+                            className: "btn btn-warning"
+                        },
+                        {
+                            extend: "excelHtml5",
+                            text: "Excel",
+                            className: "btn btn-success"
+                        },
+                        {
+                            extend: "pdfHtml5",
+                            text: "PDF",
+                            className: "btn btn-secondary",
+                            orientation: "landscape",
+                            pageSize: "A4"
+                        }
+                    ],
+
+                    responsive: true,
+                    pageLength: 10,
+                    searching: true,
+                    ordering: true,
+                    autoWidth: false,
+
+                    language: {
+                        emptyTable:"No shelter details found"
+                    }
+
+                });
+
+
+                /* Show modal *
+                $("#fundShelterModal").modal({
+                    backdrop: "static",
+                    keyboard: false
+                });
+
+                $("#fundShelterModal").modal("show");
+
+                return;
+            }
+
+
+            /* Set Fund Type*
+            $("#modalFundType").text(fundRow.fund_type ? fundRow.fund_type.trim(): "-");
+
+
+            /* Set Total *
+            $("#modalFundTotal").text(fundRow.total || 0);
+
+            /* Destroy existing DataTable *
+            if (
+                $.fn.DataTable.isDataTable("#fundShelterTable")
+            ) {
+                $("#fundShelterTable").DataTable().clear().destroy();
+            }
+
+
+            /*  Clear old rows *
+            $("#fundShelterTable tbody").empty();
+
+
+            /* Get shelters *
+            let shelters = fundRow.shelters || [];
+
+
+            /*  Build table rows *
+            let tbody = "";
+
+
+            $.each(
+                shelters,
+                function(i, shelter) {
+
+                    tbody += `
+
+                        <tr>
+                            <td>
+                                ${i + 1}
+                            </td>
+                            <td>
+                                ${shelter.survey_id || ""}
+                            </td>
+                            <td>
+                                ${shelter.shelter_name || ""}
+                            </td>
+                            <td>
+                                ${shelter.zone || ""}
+                            </td>
+                            <td>
+                                ${shelter.division || ""}
+                            </td>
+                            <td>
+                                ${shelter.shelter_type || ""}
+                            </td>
+                            <td>
+                                ${shelter.category || ""}
+                            </td>
+                        </tr>
+
+                    `;
+
+                }
+            );
+
+
+            /* Insert rows *
+            $("#fundShelterTable tbody").html(tbody);
+
+
+            /* Initialize DataTable *
+            $("#fundShelterTable").DataTable({
+                dom: "Bfrtip",
+                buttons: [
+                    {
+                        extend: "pageLength",
+                        className: "btn btn-warning"
+                    },
+                    {
+                        extend: "excelHtml5",
+                        text: "Excel",
+                        className: "btn btn-success"
+                    },
+                    {
+                        extend: "pdfHtml5",
+                        text: "PDF",
+                        className: "btn btn-secondary",
+                        orientation: "landscape",
+                        pageSize: "A4"
+                    }
+                ],
+
+                responsive: true,
+                pageLength: 10,
+                
+                lengthMenu: [
+                    [10, 25, 50, -1],
+                    [10, 25, 50, "All"]
+                ],
+
+                searching: true,
+                ordering: true,
+                autoWidth: false,
+
+                language: {
+                    emptyTable: "No shelter details found",
+                    search: "Search:"
+                }
+            });
+
+
+            /*  Show modal *
+            $("#fundShelterModal").modal({
+                backdrop: "static",
+                keyboard: false
+            });
+
+            $("#fundShelterModal").modal("show");
+        },
+
+
+        error: function() {
+            Swal.fire({
+                icon: "error",
+                title: "Error",
+                text: "Unable to load shelter details.",
+                allowOutsideClick: false
+            });
+        }
+
+    });
+
+} */
+		
+		
+	
+				
+		
+	
+		
+		
+		/* 	Monthly Trends	 */
+		
+		/*  function loadMonthlyTrend(type, value){
+
+		    $.ajax({
+		
+		        url : "/gcc/api/shelterinspection/monthlyTrends",
+		        type : "GET",
+		        data : {
+		            type : type,
+		            value : value
+		        },
+		
+		        success : function(data){
+		
+		            console.log(data);
+
+		            const months = [
+		                "Jan","Feb","Mar","Apr","May","Jun",
+		                "Jul","Aug","Sep","Oct","Nov","Dec"
+		            ];
+		
+		            let chartData = [];
+		
+		            if(type === "year" || type === ""){
+		
+		                //Show 12 months
+		
+		                for(let i=1;i<=12;i++){
+		
+		                    let row = data.find(x => x.month_no == i);
+		
+		                    chartData.push({
+		
+		                        month : months[i-1],
+		                        month_no : i,
+		
+		                        residents : row ? row.residents : 0,
+		                        rehabilitated : row ? row.rehabilitated : 0,
+		                        reintegration : row ? row.reintegration : 0,
+		                        death : row ? row.death : 0,
+		                        total_count : row ? row.total_count : 0
+		
+		                    });
+		
+		                }
+		
+		            }else{
+		
+		                //Day / Month filter
+		
+		                $.each(data,function(i,row){
+		
+		                    chartData.push({
+		                        month : row.month,
+		                        month_no : row.month_no,
+		                        residents : row.residents,
+		                        rehabilitated : row.rehabilitated,
+		                        reintegration : row.reintegration,
+		                        death : row.death,
+		                        total_count : row.total_count
+		                    });
+		
+		                });
+		
+		            }
+		
+		            drawMonthlyTrend(chartData);
+		            console.log("Chart Data", chartData);
+		            
+		            //console.log(chartData);
+		
+		        },
+		
+		        error:function(){
+		
+		            Swal.fire({
+		                icon:"error",
+		                title:"Error",
+		                text:"Unable to load Monthly Trends.",
+		                allowOutsideClick: false
+		            });
+		
+		        }
+		
+		    });
+		
+		} 
+		
+	
+		
+		
+		function drawMonthlyTrend(data){
+			
+			am5.array.each(am5.registry.rootElements,function(root){
+
+		        if(root.dom.id==="monthlyTrendChart"){
+		            root.dispose();
+		        }
+
+		    });
+
+		    $("#monthlyTrendChart").empty();
+
+		    var root=am5.Root.new("monthlyTrendChart");
+			
+/* 		    am5.array.each(am5.registry.rootElements, function(root){
+		        if(root.dom.id == "monthlyTrendChart"){
+		            root.dispose();
+		        }
+		    });
+			
+			var root = am5.Root.new("monthlyTrendChart"); *
+			
+			root.setThemes([
+			    am5themes_Animated.new(root)
+			]);
+			
+			var chart = root.container.children.push(
+			    am5xy.XYChart.new(root,{})
+			);
+			
+			chart.set("cursor", am5xy.XYCursor.new(root, {
+			    behavior: "none"
+			}));
+			
+			var xAxis = chart.xAxes.push(
+				    am5xy.CategoryAxis.new(root, {
+				        categoryField: "month",
+				        renderer: am5xy.AxisRendererX.new(root, {
+				            minGridDistance: 30
+				        })
+				    })
+				);
+
+				xAxis.data.setAll(data);
+
+				/* Align month labels with the data points *
+				xAxis.get("renderer").labels.template.setAll({
+				    centerX: am5.p50,
+				    locationX: 0.5,
+				    paddingTop: 10
+				});
+
+				/* Align vertical grid lines with month points *
+				xAxis.get("renderer").grid.template.setAll({
+				    location: 0.5
+				});
+			
+			var yAxis = chart.yAxes.push(
+			    am5xy.ValueAxis.new(root,{
+			        renderer:am5xy.AxisRendererY.new(root,{})
+			    })
+			);
+			
+			var tooltip = am5.Tooltip.new(root, {
+			    getFillFromSprite: false,
+			    getStrokeFromSprite: false,
+			    autoTextColor: false,
+			    pointerOrientation: "vertical"
+			});
+
+			tooltip.get("background").setAll({
+			    fill: am5.color(0xffffff),
+			    stroke: am5.color(0xd9d9d9),
+			    strokeWidth: 1,
+			    cornerRadiusTL: 10,
+			    cornerRadiusTR: 10,
+			    cornerRadiusBL: 10,
+			    cornerRadiusBR: 10,
+			    fillOpacity: 1,
+			    shadowColor: am5.color(0x999999),
+			    shadowBlur: 8,
+			    shadowOffsetX: 2,
+			    shadowOffsetY: 2
+			});
+
+			tooltip.label.adapters.add("html", function (html, target) {
+
+			    let dataItem = series.get("tooltipDataItem");
+
+			    if (!dataItem) return "";
+
+			    let d = dataItem.dataContext;
+
+			    return `
+			    <div style="padding:8px;min-width:180px;font-family:Arial">
+
+			        <div style="font-size:16px;font-weight:bold;margin-bottom:10px">
+			            ${d.month}
+			        </div>
+
+			        <div style="color:#1565C0;margin-bottom:6px">
+			            Residents : <b>${d.residents}</b>
+			        </div>
+
+			        <div style="color:#4CAF50;margin-bottom:6px">
+			            Rehabilitated : <b>${d.rehabilitated}</b>
+			        </div>
+
+			        <div style="color:#F44336;margin-bottom:6px">
+			            Death : <b>${d.death}</b>
+			        </div>
+
+			        <div style="color:#FB8C00;margin-bottom:8px">
+			            Reintegration : <b>${d.reintegration}</b>
+			        </div>
+
+			        <hr>
+
+			        <div style="font-size:15px;font-weight:bold">
+			            Total : ${d.total_count}
+			        </div>
+
+			    </div>
+			    `;
+			});
+			
+			var series = chart.series.push(
+				    am5xy.LineSeries.new(root, {
+				        xAxis: xAxis,
+				        yAxis: yAxis,
+
+				        valueYField: "total_count",
+				        categoryXField: "month",
+
+				        tooltip: tooltip
+				    })
+				);
+			
+			series.strokes.template.setAll({
+			    strokeWidth:3
+			});
+			
+			series.bullets.push(function () {
+
+			    return am5.Bullet.new(root, {
+			    	
+			    	locationX: 0.5,
+
+			        sprite: am5.Circle.new(root, {
+			            radius: 8,
+			            fill: am5.color(0xff9800),
+			            stroke: am5.color(0xffffff),
+			            strokeWidth: 2
+			            
+			        })
+
+			    });
+
+			});
+			
+
+			series.data.setAll(data);
+			
+			xAxis.data.setAll(data);
+			
+			series.appear(1000);
+			chart.appear(1000,100);
+			
+			console.log(series.dataItems);
+			
+			} */
+
+		
+			/* 	CDO Daily visit	 */
+			
+			function loadWeeklyVisits(type, value){
+
+			    $.ajax({
+			
+			        url: "/gcc/api/shelterinspection/weeklyVisits",
+			        type: "GET",
+			
+			        data:{
+			            type:type,
+			            value:value
+			        },
+			
+			        success:function(data){
+			
+			            console.log("Weekly API", data);
+			
+			            const days = [
+			                "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"
+			            ];
+			
+			            let chartData = [];
+			
+			            for(let i=0;i<days.length;i++){
+			
+			                let row = data.find(x => x.day_name === days[i]);
+			
+			                chartData.push({
+			                    day:days[i],
+			                    visits:row ? row.visits : 0
+			                });
+			
+			            }
+			
+			            console.log(chartData);
+			            drawWeeklyVisitChart(chartData);
+			
+			        },
+			
+			        error:function(){
+			
+			            Swal.fire({
+			                icon:"error",
+			                title:"Error",
+			                text:"Unable to load Weekly Visits.",
+			                allowOutsideClick: false
+			            });
+			
+			        }
+			
+			    });
+			
+			}
+			
+
+			
+			function drawWeeklyVisitChart(data){
+
+				    am5.array.each(am5.registry.rootElements,function(root){
+				        if(root.dom.id==="weeklyVisitChart"){
+				            root.dispose();
+				        }
+				    });
+
+				    $("#weeklyVisitChart").empty();
+
+				    var root=am5.Root.new("weeklyVisitChart");
+
+/* 				am5.array.each(am5.registry.rootElements, function(root) {
+				    if (root.dom.id == "weeklyVisitChart") {
+				        root.dispose();
+				    }
+				});
+
+			    var root=am5.Root.new("weeklyVisitChart"); */
+
+			    root.setThemes([
+			        am5themes_Animated.new(root)
+			    ]);
+
+			    var chart=root.container.children.push(
+			        am5xy.XYChart.new(root,{})
+			    );
+
+			 /*    chart.set("cursor",am5xy.XYCursor.new(root,{
+			        behavior:"none"
+			    })); */
+
+			    var cursor = chart.set("cursor",
+			    	    am5xy.XYCursor.new(root,{})
+			    	);
+
+			    	cursor.lineY.set("visible", false);
+			    	cursor.lineX.set("visible", false);
+			    	
+		    	var xAxis = chart.xAxes.push(
+		    		    am5xy.CategoryAxis.new(root, {
+		    		        categoryField: "day",
+		    		        renderer: am5xy.AxisRendererX.new(root, {
+		    		            minGridDistance: 30
+		    		        })
+		    		    })
+		    		);
+
+		    		xAxis.data.setAll(data);
+		    		
+		    		xAxis.get("renderer").labels.template.setAll({
+		    		    centerX: am5.p50,
+		    		    locationX: 0.5,
+		    		    paddingTop: 10
+		    		});
+
+		    		xAxis.get("renderer").grid.template.setAll({
+		    		    location: 0.5
+		    		});
+
+
+			    var yAxis=chart.yAxes.push(
+			        am5xy.ValueAxis.new(root,{
+			            min: 0,
+			            extraMin: 0,
+			            renderer:am5xy.AxisRendererY.new(root,{})
+			        })
+			    );
+			    
+			    var tooltip = am5.Tooltip.new(root, {
+			        getFillFromSprite: false,
+			        getStrokeFromSprite: false,
+			        autoTextColor: false,
+			        pointerOrientation: "vertical"
+			    });
+
+			    tooltip.get("background").setAll({
+			        fill: am5.color(0xffffff),
+			        stroke: am5.color(0xd9d9d9),
+			        strokeWidth: 1,
+			        cornerRadiusTL: 10,
+			        cornerRadiusTR: 10,
+			        cornerRadiusBL: 10,
+			        cornerRadiusBR: 10,
+			        fillOpacity: 1,
+			        shadowColor: am5.color(0x999999),
+			        shadowBlur: 8,
+			        shadowOffsetX: 2,
+			        shadowOffsetY: 2
+			    });
+			    
+			    tooltip.label.adapters.add("html", function(html, target){
+
+			        let dataItem = series.get("tooltipDataItem");
+
+			        if(!dataItem){
+			            return "";
+			        }
+
+			        let d = dataItem.dataContext;
+
+			        return `
+			            <div style="padding:8px;min-width:150px;font-family:Arial">
+
+			                <div style="
+			                    font-size:16px;
+			                    font-weight:bold;
+			                    margin-bottom:10px;">
+			                    ${d.day}
+			                </div>
+
+			                <div style="
+			                    color:#1565C0;
+			                    font-size:14px;">
+			                    Visits : <b>${d.visits}</b>
+			                </div>
+
+			            </div>
+			        `;
+
+			    });
+			    
+			    var series = chart.series.push(
+			    	    am5xy.ColumnSeries.new(root,{
+			    	        xAxis:xAxis,
+			    	        yAxis:yAxis,
+			    	        valueYField:"visits",
+			    	        categoryXField:"day",
+			    	        tooltip:tooltip
+			    	    })
+			    	);
+			    
+			    series.columns.template.setAll({
+			    	
+			    	width: am5.percent(60),
+
+			        //width: am5.percent(70),
+
+			        fill: am5.color(0x1F5E7A),
+			        stroke: am5.color(0x1F5E7A),
+
+			        cornerRadiusTL: 6,
+			        cornerRadiusTR: 6,
+
+			        interactive: true
+
+			    });
+			    
+
+			    series.data.setAll(data);
+			    
+			    series.appear();
+			    chart.appear(1000,100);
+
+			}
+			
+			
+			/* 	CDO Recent visit	 */
+			
+			function loadRecentVisits(type, value){
+
+			    $.ajax({
+			
+			        url: "/gcc/api/shelterinspection/latestVisitShelters",
+			
+			        type: "GET",
+			
+			        data:{
+			            type:type,
+			            value:value
+			        },
+			
+			        success:function(data){
+			
+			            let html="";
+			
+			            $.each(data,function(i,row){
+			
+			                html += `
+			
+			                <div class="recent-visit-item">
+			
+			                    <div class="visit-icon">
+			                        <i class="fa fa-file-text"></i>
+			                    </div>
+			
+			                    <div class="visit-content">
+			
+			                        <div class="visit-title">
+			                            <b>${row.shelterName}</b>
+			                        </div>
+			
+			                        <div class="visit-subtitle">
+			
+			                            <span>
+			                                <i class="fa fa-user"></i>
+			                                ${row.userName}
+			                            </span>
+			
+			                            <span class="ml-2">
+			                                <i class="fa fa-map-marker"></i>
+			                                ${row.zone}
+			                            </span>
+			
+			                        </div>
+			
+		
+			
+			                    </div>
+			
+			                </div>
+			
+			                `;
+			
+			            });
+			
+			            $("#recentVisitDiv").html(html);
+			
+			        },
+			
+			        error:function(){
+			
+			            Swal.fire({
+			
+			                icon:"error",
+			                title:"Error",
+			                text:"Unable to load Recent Visits.",
+			                allowOutsideClick: false
+			
+			            });
+			
+			        }
+			
+			    });
+			
+			}
+			
+		
+
+
+			/* 	Complaint List	 */
+
+
+	</script>
+	
+	
+</body>
+
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/shelterinspection/meetinglist.html b/src/main/resources/templates/modules/shelterinspection/meetinglist.html
new file mode 100644
index 0000000..e1768a4
--- /dev/null
+++ b/src/main/resources/templates/modules/shelterinspection/meetinglist.html
@@ -0,0 +1,1751 @@
+
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+
+<head>
+    <title>Shelter Meeting List</title>
+
+    <!-- Bootstrap 5 CSS -->
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/css/bootstrap.min.css" rel="stylesheet">
+    <!-- FontAwesome CSS for icons -->
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css" rel="stylesheet">
+    <!-- DataTables CSS -->
+    <link href="https://cdn.datatables.net/1.13.4/css/jquery.dataTables.min.css" rel="stylesheet" />
+    <link href="https://cdn.datatables.net/buttons/2.3.6/css/buttons.dataTables.min.css" rel="stylesheet" />
+
+    <style>
+        body {
+            background-color: #f8f9fa;
+        }
+
+        .page-header-title h4 {
+            margin: 20px 0;
+            text-align: center;
+            font-weight: bold;
+            color: #003366;
+            text-transform: uppercase;
+        }
+
+        .filter-section {
+            background: #fff;
+            padding: 15px;
+            border-radius: 8px;
+            box-shadow: 0 4px 6px rgba(0, 0, 0, 0.05);
+            margin-bottom: 20px;
+        }
+
+        thead th {
+            background-color: #003366 !important;
+            color: white !important;
+        }
+
+        .report-container {
+            background: #fff;
+            padding: 15px;
+            border-radius: 8px;
+            box-shadow: 0 4px 6px rgba(0, 0, 0, 0.05);
+        }
+
+
+		/* ==============================
+		   DATATABLE ALIGNMENT
+		   ============================== */
+		
+		#detailDataTable {
+		    width: 100% !important;
+		    table-layout: fixed !important;
+		    border-collapse: collapse !important;
+		}
+		
+		#detailDataTable th,
+		#detailDataTable td {
+		    box-sizing: border-box !important;
+		    text-align: center !important;
+		    vertical-align: middle !important;
+		    border: 1px solid #dee2e6 !important;
+		}
+		
+		#detailDataTable thead th {
+		    background-color: #003366 !important;
+		    color: #ffffff !important;
+		    white-space: normal !important;
+		    word-break: normal !important;
+		    padding: 10px 8px !important;
+		}
+		
+		#detailDataTable tbody td {
+		    white-space: normal !important;
+		    word-break: break-word !important;
+		    overflow-wrap: anywhere !important;
+		    padding: 8px !important;
+		}
+		
+		/* Column widths */
+		#detailDataTable th:nth-child(1),
+		#detailDataTable td:nth-child(1) {
+		    width: 6% !important;
+		}
+		
+		#detailDataTable th:nth-child(2),
+		#detailDataTable td:nth-child(2) {
+		    width: 25% !important;
+		}
+		
+		#detailDataTable th:nth-child(3),
+		#detailDataTable td:nth-child(3) {
+		    width: 9% !important;
+		}
+		
+		#detailDataTable th:nth-child(4),
+		#detailDataTable td:nth-child(4) {
+		    width: 15% !important;
+		}
+		
+		#detailDataTable th:nth-child(5),
+		#detailDataTable td:nth-child(5) {
+		    width: 9% !important;
+		}
+		
+		#detailDataTable th:nth-child(6),
+		#detailDataTable td:nth-child(6) {
+		    width: 13% !important;
+		}
+		
+		#detailDataTable th:nth-child(7),
+		#detailDataTable td:nth-child(7) {
+		    width: 14% !important;
+		}
+		
+		#detailDataTable th:nth-child(8),
+		#detailDataTable td:nth-child(8) {
+		    width: 9% !important;
+		}
+    
+        /* =========================================================
+		   MEETING VIEW PHOTO BADGE
+		   ========================================================= */
+		
+		.meeting-photo-badge {
+		    display: inline-flex;
+		    align-items: center;
+		    justify-content: center;
+		    padding: 0.35em 0.65em;
+		    font-size: 75%;
+		    font-weight: 700;
+		    line-height: 1;
+		    color: #fff !important;
+	        background-color: #0dcaf0;
+		    border: 0;
+		    border-radius: 0.375rem;
+		    text-decoration: none !important;
+		    cursor: pointer;
+		    white-space: nowrap;
+		}
+		
+		.meeting-photo-badge:hover {
+		    color: #fff !important;
+		    background-color: #0aa2c0;
+   		}
+		
+		.meeting-photo-badge i {
+		    color: #fff !important;
+		    margin-right: 4px;
+		}
+        
+    </style>
+</head>
+
+<body>
+
+    <div class="container-fluid py-4">
+	        <div class="page-header-title d-flex justify-content-between align-items-center">
+	            <a href="/commissionerreview/shelterpagereport" class="btn btn-secondary"><i
+	                    class="fa-solid fa-arrow-left"></i> Back to Abstract</a>
+	            <h4 class="mb-0 mx-auto">Shelter Meeting List</h4>
+	            <div style="width: 100px;"></div>
+	        </div>
+	
+	        <!-- Filter Section -->
+	        <div class="filter-section d-flex justify-content-center align-items-end gap-3 flex-wrap mt-3">
+	            
+                <!-- From Date -->
+			    <div>
+			        <label for="fromDate" class="form-label fw-bold">From Date:</label>
+			        <input type="date" id="fromDate" class="form-control">
+			    </div>
+			
+			
+			    <!-- To Date -->
+			    <div>
+			        <label for="toDate" class="form-label fw-bold">To Date:</label>
+			        <input type="date" id="toDate" class="form-control">
+			    </div>
+            
+	            <div>
+	                <label for="zone" class="form-label fw-bold">Zone:</label>
+	                <select id="zone" class="form-select">
+	                    <option value="">All Zone</option>
+	                </select>
+	            </div>
+	            <div>
+	                <label for="category" class="form-label fw-bold">Category:</label>
+	                <select id="category" class="form-select">
+	                    <option value="">All Category</option>
+	                </select>
+	            </div>
+	            <div>
+	                <button id="btnSearch" class="btn btn-primary px-4"><i class="fa-solid fa-search"></i> Search</button>
+	            </div>
+	            <div>
+	                <button class="btn btn-secondary px-4" onclick="resetFilters()"><i class="fa-solid fa-rotate-left"></i> Reset </button>
+	            </div>
+        	</div>
+	        <div class="report-container">
+	            <table id="detailDataTable" class="table table-striped table-bordered display nowrap" style="width:100%;">
+	                <thead>
+	                    <tr>
+	                		<th class="text-center">S.No</th>
+							<th class="text-center">SHELTER</th>
+		                    <!-- <th class="text-center">ZONE</th>
+		                    <th class="text-center">CATEGORY</th>
+		                    <th class="text-center">RESIDENTS</th>
+		                    <th class="text-center">OCCUPANCY STATUS</th>
+		                    <th class="text-center">MAINTENANCE STATUS</th> -->
+							<th class="text-center">No of Meeting</th>
+	                    </tr>
+	                </thead>
+	                <tbody>
+	                    <!-- Populated via JS -->
+	                </tbody>
+	            </table>
+	        </div>
+	     </div>
+	     
+	     
+   <!-- =========================================================
+	     SHELTER MEETING DETAILS MODAL
+	========================================================= -->
+	
+	<div class="modal fade" id="meetingDetailsModal" tabindex="-1" 
+		  data-backdrop="static" data-keyboard="false">
+	
+	    <div class="modal-dialog modal-xl modal-dialog-centered">
+	
+	        <div class="modal-content">
+	
+	            <!-- Modal Header -->
+	            <div class="modal-header bg-primary text-white" style="background-color: #003366 !important;">
+	                
+                    <div>
+	                    <div class="d-flex align-items-center">					
+					        <h5 class="mb-0">Shelter Meeting Details</h5>
+					        <span class="mx-2">-</span>
+					        <h5 class="mb-0" id="meetingModalShelterName"></h5>
+					    </div>
+                    </div>
+	
+	                <button type="button" class="btn-close btn-close-white" 
+	                		data-bs-dismiss="modal" aria-label="Close">
+					</button>
+	
+	            </div>
+	
+	
+	            <!-- Modal Body -->
+	            <div class="modal-body">
+	
+	                <div class="table-responsive">
+	
+	                    <table id="meetingDetailsTable" class="table table-striped table-bordered nowrap" 
+	                    	   style="width:100%;">
+	
+	                        <thead>
+	                            <tr>
+	                                <th class="text-center">S.No</th>
+	                                <th class="text-center">CDO</th>
+	                                <th class="text-center">Date</th>
+	                                <th class="text-center">No of NGO director attendend</th>
+	                                <th class="text-center">No of shelter staff attendend </th>
+	                                <th class="text-center">No of concerns raised in the previous meetings been resolved/ addressed?</th>
+	                                <th class="text-center">Photo</th>
+                            	    <th class="text-center">Remark</th>
+	                                
+	                            </tr>
+	                        </thead>
+	
+	                        <tbody>
+	                        </tbody>
+	
+	                    </table>
+	
+	                </div>
+	
+	            </div>
+	
+	
+	            <!-- Modal Footer -->
+	            <div class="modal-footer">
+	                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
+	                    Close
+	                </button>
+	            </div>
+	
+	        </div>
+	
+	    </div>
+	
+	</div>
+	
+		<!-- =========================================================
+	     Meeting PHOTO MODAL
+		========================================================= -->
+	
+	<div class="modal fade" id="meetingPhotoModal" tabindex="-1" data-backdrop="static" data-keyboard="false">
+	
+	    <div class="modal-dialog modal-lg modal-dialog-centered">
+	
+	        <div class="modal-content">
+	
+	            <!-- Header -->
+	            <div class="modal-header bg-primary text-white"
+	                 style="background-color: #003366 !important;">
+	
+	                <h5 class="modal-title" id="meetingPhotoModalTitle">
+	                    Meeting Photo
+	                </h5>
+	
+	                <button type="button" class="btn-close btn-close-white" 
+	                		data-bs-dismiss="modal" aria-label="Close">
+	                </button>
+	
+	            </div>
+	
+	
+	            <!-- Body -->
+	            <div class="modal-body text-center">
+	
+	                <!-- Photo -->
+	                <div id="meetingPhotoContainer">
+	                    <img id="meetingModalPhoto" src="" class="img-fluid rounded"
+	                         style="max-height: 450px; max-width: 100%;">
+	                </div>
+	
+	            </div>
+	
+	
+	            <!-- Footer -->
+	            <div class="modal-footer">
+	                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
+	                    Close
+	                </button>	
+	            </div>
+	
+	        </div>
+	
+	    </div>
+	
+	</div>
+
+
+
+        <!-- Scripts -->
+        <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.bundle.min.js"></script>
+        
+
+        <!-- DataTables JS -->
+        <script src="https://cdn.datatables.net/1.13.4/js/jquery.dataTables.min.js"></script>
+        <script src="https://cdn.datatables.net/buttons/2.3.6/js/dataTables.buttons.min.js"></script>
+        <script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.html5.min.js"></script>
+        <script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.print.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
+
+        <!-- SweetAlert -->
+        <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+        
+      <script th:inline="javascript">
+
+    var dataTable = null;
+    var meetingDetailsDataTable = null;
+    var meetingPhotoData = [];
+
+    $(document).ready(function () {
+
+        // Load dropdowns
+        loadDropdowns();
+
+        // Initialize DataTable
+        dataTable = $('#detailDataTable').DataTable({
+
+	    autoWidth: false,
+	    
+	    columnDefs: [
+	        { width: "6%",  targets: 0 },
+	        { width: "25%", targets: 1 },
+	        { width: "9%",  targets: 2 }
+	     /*    { width: "15%", targets: 3 },
+	        { width: "9%",  targets: 4 },
+	        { width: "13%", targets: 5 },
+	        { width: "14%", targets: 6 },
+	        { width: "9%",  targets: 7 } */
+	    ],
+	   
+	    
+	    responsive: false,
+	    scrollX: false,
+	    searching: true,
+	    paging: true,
+	    info: true,
+	    ordering: true,
+	    dom: '<"d-flex justify-content-between align-items-center mb-3"lfB>rtip',
+	
+	    lengthMenu: [
+	        [10, 25, 50, 100, -1],
+	        [10, 25, 50, 100, "All"]
+	    ],
+	
+	    buttons: [
+	
+	        {
+	            extend: 'excelHtml5',
+	            text: '<i class="fa-solid fa-file-excel"></i> Excel',
+	            className: 'btn btn-success btn-sm me-2',
+	
+	            title: function () {
+	                return 'Commissioner Review - Shelter Meeting Report';
+	            },
+	
+	            filename: function () {
+	
+	                var zone =
+	                    $('#zone option:selected').text()
+	                        .replace(/[^a-zA-Z0-9]/g, '_');
+	
+	                var category =
+	                    $('#category option:selected').text()
+	                        .replace(/[^a-zA-Z0-9]/g, '_');
+	
+	                return 'Shelter_Meeting_' +
+	                       zone + '_' + category
+	                       + '_Reports';
+	            },
+	
+	            exportOptions: {
+	                stripHtml: true,
+	
+	                format: {
+	                    body: function (data, row, column, node) {
+	                        var div = document.createElement("div");
+	                        div.innerHTML = data;
+	                        return div.textContent || div.innerText || "";
+	                    }
+	                }
+	            }
+	        },
+	
+	        {
+	            extend: 'pdfHtml5',
+	            text: '<i class="fa-solid fa-file-pdf"></i> PDF',
+	            className: 'btn btn-danger btn-sm',
+	            orientation: 'landscape',
+	            pageSize: 'A4',
+	            title: function () {
+	                return 'Commissioner Review - Shelter Meeting Report';
+	            },
+	
+	            filename: function () {
+	
+	                var zone =
+	                    $('#zone option:selected').text()
+	                        .replace(/[^a-zA-Z0-9]/g, '_');
+	
+	                var category =
+	                    $('#category option:selected').text()
+	                        .replace(/[^a-zA-Z0-9]/g, '_');
+	
+	                return 'Shelter_Meeting_' +
+	                       zone + '_' + category
+	                       + '_Reports';
+	            },
+	
+	            exportOptions: {
+	                stripHtml: true,
+	
+	                format: {
+	                    body: function (data, row, column, node) {
+	                        var div = document.createElement("div");
+	                        div.innerHTML = data;
+	                        return div.textContent ||
+	                               div.innerText ||
+	                               "";
+	                    }
+	                }
+	            },
+	            
+	            customize: function (doc) {
+
+	                // =====================================================
+	                // TITLE
+	                // =====================================================
+
+	                doc.styles.title = {
+	                    fontSize: 14,
+	                    bold: true,
+	                    alignment: 'center',
+	                    margin: [0, 0, 0, 10]
+	                };
+
+
+	                // =====================================================
+	                // PAGE MARGINS
+	                // Give maximum width to the table
+	                // =====================================================
+
+	                doc.pageMargins = [15, 30, 15, 30];
+
+
+	                // =====================================================
+	                // DEFAULT FONT
+	                // =====================================================
+
+	                doc.defaultStyle = { fontSize: 8, alignment: 'center' };
+
+	                // =====================================================
+	                // GET TABLE
+	                // =====================================================
+
+	                var table = doc.content[1].table;
+
+
+	                // =====================================================
+	                // FIT TABLE TO FULL A4 WIDTH
+	                // A4 Landscape usable width ≈ 812
+	                // =====================================================
+
+	                table.widths = [
+	                    45,     // S.No
+	                    600,    // Shelter
+	                    130     // No of Rescue
+	                ];
+
+
+	                // =====================================================
+	                // HEADER
+	                // =====================================================
+
+	                if (table.body.length > 0) {
+	                    table.body[0].forEach(function (cell) {
+	                        if (typeof cell === 'object') {
+	                            cell.bold = true;
+	                            cell.fontSize = 9;
+	                            cell.alignment = 'center';
+	                        }
+	                    });
+	                }
+
+
+	                // =====================================================
+	                // BODY ALIGNMENT
+	                // =====================================================
+
+	                table.body.forEach(function (row, rowIndex) {
+	                    row.forEach(function (cell) {
+	                        if (typeof cell === 'object') {
+	                            cell.alignment = 'center';
+	                            cell.margin = [ 3, 4, 3, 4 ];
+	                        }
+	                    });
+	                });
+
+
+	                // =====================================================
+	                // KEEP ROW TOGETHER
+	                // =====================================================
+
+	                table.dontBreakRows = true;
+	                table.headerRows = 1;
+
+
+	                // =====================================================
+	                // TABLE BORDERS
+	                // =====================================================
+
+	                table.layout = {
+	                    hLineWidth: function () { return 0.5; },
+	                    vLineWidth: function () { return 0.5; },
+	                    paddingLeft: function () { return 3; },
+	                    paddingRight: function () { return 3; },
+	                    paddingTop: function () { return 3; },
+	                    paddingBottom: function () { return 3; }
+	                };
+
+	            }
+
+	        }
+	
+	    ]
+	
+	});
+        
+      
+
+
+        // Search button
+        $('#btnSearch').click(function () {
+            loadDetailedReport();
+        });
+
+
+        // Load data initially
+        //loadDetailedReport();
+        
+        // =========================================================
+		// INITIALIZE DEFAULT DATES
+		// =========================================================
+		
+		initializeMeetingDates();
+    });
+
+
+
+    // =========================================================
+    // LOAD DROPDOWNS
+    // =========================================================
+
+    function loadDropdowns() {
+
+        // -------------------------
+        // Zone
+        // -------------------------
+
+        $.ajax({
+            url: "/commissionerreview/api/shelterinspection/zones",
+            type: "GET",
+            success: function (data) {
+                let options =
+                    '<option value="">All Zones</option>';
+
+                data.forEach(function (zone) {
+                    options +=
+                        '<option value="' + zone + '">' +
+                        zone +
+                        '</option>';
+                });
+
+                $("#zone").html(options);
+            },
+
+            error: function () {
+                Swal.fire(
+                    'Error',
+                    'Unable to load zones.',
+                    'error'
+                );
+            }
+
+        });
+
+
+        // -------------------------
+        // Category
+        // -------------------------
+
+        $.ajax({
+            url: "/commissionerreview/api/shelterinspection/categories",
+            type: "GET",
+            success: function (data) {
+                let options =
+                    '<option value="">All Categories</option>';
+
+                data.forEach(function (category) {
+                    let text = formatCategory(category);
+                    options +=
+                        '<option value="' + category + '">' +
+                        text +
+                        '</option>';
+                });
+
+                $("#category").html(options);
+
+            },
+
+            error: function () {
+                Swal.fire(
+                    'Error',
+                    'Unable to load categories.',
+                    'error'
+                );
+            }
+        });
+
+    }
+    
+	 // =========================================================
+	 // INITIALIZE COMPLAINT DATE FILTER
+	 // From Date = Minimum DB cdate
+	 // To Date   = Today
+	 // =========================================================
+	
+	 function initializeMeetingDates() {
+	
+	     $.ajax({
+	         url: "/commissionerreview/api/shelter/shelterMeetingMinDate",
+	         type: "GET",
+	         success: function (minDate) {
+	
+	             console.log("Minimum Meeting cdate:", minDate);
+	
+	             // =================================================
+	             // TODAY
+	             // =================================================
+	
+	             var today = new Date();
+	
+	             var yyyy = today.getFullYear();
+	
+	             var mm = String(today.getMonth() + 1).padStart(2, '0');
+	             var dd = String(today.getDate()).padStart(2, '0');
+	             var todayString = yyyy + '-' + mm + '-' + dd;
+	
+	
+	             // =================================================
+	             // FROM DATE
+	             // =================================================
+	
+	             if (minDate) {
+	                 $('#fromDate').val(minDate);
+	             } else {
+	                 // If no DB date found,
+	                 // use today
+	
+	                 $('#fromDate').val(todayString);
+	             }
+	
+	
+	             // =================================================
+	             // TO DATE = TODAY
+	             // =================================================
+	
+	             $('#toDate').val(todayString);
+	
+	
+	             // =================================================
+	             // LOAD REPORT
+	             // =================================================
+	
+	             loadDetailedReport();
+	
+	         },
+	
+	         error: function (xhr) {
+	
+	             console.error("Unable to get minimum meeting date:",);
+	
+	             // =================================================
+	             // FALLBACK TO TODAY
+	             // =================================================
+	
+	             var today = new Date();
+	
+	             var yyyy = today.getFullYear();
+	
+	             var mm = String(today.getMonth() + 1).padStart(2, '0');
+	             var dd = String(today.getDate()).padStart(2, '0');
+	             var todayString = yyyy + '-' + mm + '-' + dd;
+	
+	
+	             $('#fromDate').val(todayString);
+	             $('#toDate').val(todayString);
+	
+	             loadDetailedReport();
+	
+	         }
+	
+	     });
+	
+	 }
+
+
+
+    // =========================================================
+    // LOAD SHELTER REPORT
+    // =========================================================
+
+    function loadDetailedReport() {
+
+    	
+	    var fromDate = $('#fromDate').val() || '';
+	    var toDate = $('#toDate').val() || '';
+    	
+        var zone =  $('#zone').val() || '';
+        var category = $('#category').val() || '';
+        
+	    // =====================================================
+	    // DATE VALIDATION
+	    // =====================================================
+	
+	    if (fromDate && toDate) {
+	
+	        if (fromDate > toDate) {
+	
+	            Swal.fire({
+	                icon: 'warning',
+	                title: 'Invalid Date Range',
+	                text: 'To Date cannot be earlier than From Date.'
+	            });
+	
+	            return;
+	        }
+	    }
+
+
+	    Swal.fire({
+	        title: 'Loading...',
+	        allowOutsideClick: false,
+	        allowEscapeKey: false,
+	        didOpen: function () {
+	            Swal.showLoading();
+	        }
+	    });
+
+
+	        $.ajax({
+	            url: "/commissionerreview/api/shelter/shelterMeetingList",
+	            type: "GET",
+	            data: {
+            	    fromDate: fromDate,
+	  	            toDate: toDate,
+	                zone: zone,
+	                category: category
+	            },
+	
+	            success: function (response) {
+	                Swal.close();
+	                console.log( "Meeting List Response:", response);
+	                populateTable(response);
+	            },
+	
+	            error: function (xhr) {
+	                Swal.close();
+		            console.error( "Meeting List Error:", xhr );
+	                Swal.fire({
+	                    icon: 'error',
+	                    title: 'Error',
+	                    text: 'Unable to load shelter meeting list.',
+	                    allowOutsideClick: false
+	                });
+	
+	            }
+	
+	        });
+
+    }
+
+
+
+    // =========================================================
+    // POPULATE TABLE
+    // =========================================================
+
+    function populateTable(data) {
+
+        dataTable.clear();
+
+        if (!data || data.length === 0) {
+            dataTable.draw();
+            return;
+        }
+
+
+        data.forEach(function (item, index) {
+            var shelterName =
+                item.shelterName || '-';
+    /*     var zone =
+                item.zone || '-';
+            var category =
+                formatCategory(item.category);
+            var residents =
+                item.totalResidents || 0;
+            var occupancyStatus =
+                getStatusBadge(residents);
+            var maintenanceStatus =
+                getMaintenanceBadge(
+                    item.maintenanceStatus
+                ); */
+            var totalmeetings =
+                item.totalMeetings || '0';
+                
+            var meetingLink;
+
+            if (Number(totalmeetings) > 0) {
+
+                // Meetings available - clickable
+                meetingLink =
+                    '<a href="javascript:void(0);" ' +
+                    'class="meeting-count" ' +
+                    'data-uqid="' + item.uqid + '">' +
+                    totalmeetings +
+                    '</a>';
+
+            } else {
+
+                // Zero meetings - not clickable
+                meetingLink =
+                    '<span class="text-muted">0</span>';
+            }
+
+            dataTable.row.add([
+                index + 1,
+                '<strong>' +
+                    shelterName +
+                '</strong>',
+
+              /*   zone,
+                category,
+                residents,
+                occupancyStatus,
+                maintenanceStatus, 
+                totalmeetings */
+                
+                meetingLink
+            ]);
+        });
+
+
+        dataTable.draw();
+
+    }
+
+
+
+    // =========================================================
+    // CATEGORY FORMAT
+    // =========================================================
+
+    function formatCategory(category) {
+        if (!category) {
+            return "-";
+        }
+
+        return category
+            .replace(/-/g, " ")
+            .replace(/\b\w/g, function (letter) {
+                return letter.toUpperCase();
+            });
+    }
+    
+    
+        $('#detailDataTable tbody').on('click','.meeting-count',function () {
+   	        var uqid = $(this).data('uqid');
+   	        loadMeetingDetails(uqid);
+   	    });
+
+
+
+	 // =========================================================
+	 // MEETING DETAILS DATATABLE
+	 // =========================================================
+	
+	 function initializeMeetingDetailsTable() {
+	
+	     if ($.fn.DataTable.isDataTable( '#meetingDetailsTable')) {
+	         $('#meetingDetailsTable').DataTable().clear().destroy();
+	     }
+	
+	     meetingDetailsDataTable =
+	         $('#meetingDetailsTable').DataTable({
+	             paging: true,
+                 ordering: false,
+                 info: true,
+                 scrollX: true,
+                 scrollY: "60vh",
+                 scrollCollapse: true,
+                 autoWidth: false,
+	             pageLength: 10,
+	             
+	             lengthMenu: [
+	                 [10, 25, 50, 100, -1],
+	                 [10, 25, 50, 100, "All"]
+	             ],
+	             
+	             buttons: [
+	            		
+	            	 {
+	            		    extend: 'excelHtml5',
+	            		    text: '<i class="fa-solid fa-file-excel"></i> Excel',
+	            		    className: 'btn btn-success btn-sm me-2',
+	            		    title: function () {
+	            		        return 'Commissioner Review - Shelter Meeting Detail';
+	            		    },
+
+	            		    filename: function () {
+
+	            		        var zone = $('#zone option:selected').text().replace(/[^a-zA-Z0-9]/g, '_');
+	            		        var category = $('#category option:selected').text().replace(/[^a-zA-Z0-9]/g, '_');
+	            		        return 'Shelter_Meeting_' +
+	            		               zone + '_' + category +
+	            		               '_Details';
+	            		    },
+
+	            		    exportOptions: {
+	            		        stripHtml: true,
+	            		        format: {
+	            		            body: function (data, row, column, node) {
+	            		                var div = document.createElement("div");
+	            		                div.innerHTML = data;
+	            		                return div.textContent || div.innerText || "";
+	            		            }
+	            		        }
+	            		    },
+
+	            		    // =====================================================
+	            		    // EXCEL DATA
+	            		    // =====================================================
+
+	            		    customizeData: function (data) {
+
+	            		        // =================================================
+	            		        // HEADERS
+	            		        // =================================================
+
+	            		        data.header = [
+	            		            'S.No',
+	            		            'CDO',
+	            		            'Date',
+	            		            'NGO Director',
+	            		            'Shelter Staff',
+	            		            'Concerns raised in previous meetings been resolved/ addressed?',
+	            		            'Meeting Photo URL',
+	            		            'Remark'
+	            		        ];
+
+
+	            		        // =================================================
+	            		        // BODY
+	            		        // =================================================
+
+	            		        data.body.forEach(function (row, index) {
+
+	            		            var photo = meetingPhotoData[index] || {};
+	            		            var meetingPhotoUrl = photo.meetingPhoto || '';
+
+	            		            console.log("MEETING EXCEL ROW:", index, photo);
+
+
+	            		            data.body[index] = [
+
+	            		                // =========================================
+	            		                // S.No
+	            		                // =========================================
+
+	            		                row[0],
+
+
+	            		                // =========================================
+	            		                // CDO
+	            		                // =========================================
+
+	            		                row[1],
+
+
+	            		                // =========================================
+	            		                // Date
+	            		                // =========================================
+
+	            		                row[2],
+
+
+	            		                // =========================================
+	            		                // NGO Director
+	            		                // =========================================
+
+	            		                row[3],
+
+
+	            		                // =========================================
+	            		                // Shelter Staff
+	            		                // =========================================
+
+	            		                row[4],
+
+
+	            		                // =========================================
+	            		                // Concerns
+	            		                // =========================================
+
+	            		                row[5],
+
+	            		                // =========================================
+	            		                // Meeting Photo URL
+	            		                // =========================================
+
+	            		                meetingPhotoUrl,
+
+
+	            		                // =========================================
+	            		                // Remark
+	            		                // =========================================
+
+	            		                row[7]
+
+	            		            ];
+
+	            		        });
+
+	            		    }
+
+	            		},
+	            	 
+	     	    
+	     	
+	     	        {
+	     	            extend: 'pdfHtml5',
+	     	            text: '<i class="fa-solid fa-file-pdf"></i> PDF',
+	     	            className: 'btn btn-danger btn-sm',
+	     	            orientation: 'landscape',
+	     	            pageSize: 'A4',
+	     	            title: function () {
+	     	                return 'Commissioner Review - Shelter Meeting Detail';
+	     	            },
+	     	
+	     	            filename: function () {
+	     	                var zone = $('#zone option:selected').text().replace(/[^a-zA-Z0-9]/g, '_');
+	     	                var category = $('#category option:selected').text().replace(/[^a-zA-Z0-9]/g, '_');
+	     	                return 'Shelter_Meeting_' +
+	     	                       zone + '_' + category
+	     	                      + '_Details';
+	     	            },
+	     	
+	     	            exportOptions: {
+	     	                stripHtml: true,
+	     	
+	     	                format: {
+	     	                    body: function (data, row, column, node) {
+	     	                        var div = document.createElement("div");
+	     	                        div.innerHTML = data;
+	     	                        return div.textContent || div.innerText || "";
+	     	                    }
+	     	                }
+	     	            },
+	     	            
+	     	           customize: function (doc) {
+
+	     	        	    // =====================================================
+	     	        	    // PAGE
+	     	        	    // =====================================================
+
+	     	        	    doc.pageOrientation = 'landscape';
+	     	        	    doc.pageSize = 'A4';
+	     	        	    doc.pageMargins = [15, 30, 15, 30];
+
+
+	     	        	    // =====================================================
+	     	        	    // TITLE
+	     	        	    // =====================================================
+
+	     	        	    doc.styles.title = {
+	     	        	        fontSize: 14,
+	     	        	        bold: true,
+	     	        	        alignment: 'center',
+	     	        	        margin: [0, 0, 0, 10]
+	     	        	    };
+
+
+	     	        	    // =====================================================
+	     	        	    // DEFAULT FONT
+	     	        	    // =====================================================
+
+	     	        	    doc.defaultStyle = {
+	     	        	        fontSize: 7
+	     	        	    };
+
+
+	     	        	    // =====================================================
+	     	        	    // GET PDF TABLE
+	     	        	    // =====================================================
+
+	     	        	    var table = doc.content[1].table;
+
+
+	     	        	    // =====================================================
+	     	        	    // COLUMN-WISE ALIGNMENT
+	     	        	    //
+	     	        	    // 0 = S.No
+	     	        	    // 1 = CDO
+	     	        	    // 2 = Date
+	     	        	    // 3 = NGO Director
+	     	        	    // 4 = Shelter Staff
+	     	        	    // 5 = Concerns
+	     	        	    // 6 = Photo
+	     	        	    // 7 = Remark
+	     	        	    // =====================================================
+
+	     	        	    var columnAlignment = [
+	     	        	        'center',   // S.No
+	     	        	        'center',     // CDO
+	     	        	        'center',   // Date
+	     	        	        'center',   // NGO Director
+	     	        	        'center',   // Shelter Staff
+	     	        	        'center',   // Concerns
+	     	        	        'center',   // Photo
+	     	        	        'left'      // Remark
+	     	        	    ];
+
+
+	     	        	    // =====================================================
+	     	        	    // CLEAN TABLE DATA
+	     	        	    // =====================================================
+
+	     	        	    table.body = table.body.map(function (row, rowIndex) {
+	     	        	        return row.map(function (cell, columnIndex) {
+
+	     	        	            var value = '';
+
+	     	        	            if (cell === null || cell === undefined) {
+	     	        	                value = '';
+	     	        	            } else if (typeof cell === 'object') {
+	     	        	                if (cell.text !== undefined) {
+	     	        	                    value = cell.text;
+	     	        	                } else {
+	     	        	                    value = String(cell);
+	     	        	                }
+	     	        	            } else {
+	     	        	                value = String(cell);
+	     	        	            }
+
+
+	     	        	            // =================================================
+	     	        	            // REMOVE HTML
+	     	        	            // =================================================
+
+	     	        	            var temp = document.createElement("div");
+	     	        	            temp.innerHTML = value;
+	     	        	            value = temp.textContent || temp.innerText || "";
+
+
+	     	        	            // =================================================
+	     	        	            // CLEAN SPACES
+	     	        	            // =================================================
+
+	     	        	            value = value.replace(/\s+/g, ' ').trim();
+
+
+	     	        	            // =================================================
+	     	        	            // RETURN PDF CELL
+	     	        	            // =================================================
+
+	     	        	            return {
+	     	        	                text: value,
+	     	        	                alignment: rowIndex === 0 ? 'center' : columnAlignment[columnIndex],
+	     	        	                fontSize: 7,
+	     	        	                margin: [2, 4, 2, 4]
+	     	        	            };
+
+	     	        	        });
+	     	        	    });
+
+
+	     	        	    // =====================================================
+	     	        	    // HEADER BACKGROUND COLOR
+	     	        	    // SAME AS detailDataTable
+	     	        	    // =====================================================
+
+	     	        	    if (table.body.length > 0) {
+	     	        	        table.body[0].forEach(function (cell) {
+	     	        	            cell.fillColor = '#003366';
+	     	        	            cell.color = '#ffffff';
+	     	        	            cell.bold = true;
+	     	        	            cell.fontSize = 10;
+	     	        	            cell.alignment = 'center';
+	     	        	            cell.margin = [2, 4, 2, 4];
+	     	        	        });
+	     	        	    }
+
+
+	     	        	    // =====================================================
+	     	        	    // BODY BACKGROUND COLOR
+	     	        	    // =====================================================
+
+	     	        	    for (var i = 1; i < table.body.length; i++) {
+	     	        	        for (var j = 0; j < table.body[i].length; j++) {
+	     	        	            table.body[i][j].fillColor = (i % 2 === 1) ? '#f2f2f2' : '#ffffff';
+	     	        	            table.body[i][j].color = '#000000';
+	     	        	            table.body[i][j].fontSize = 9 ;
+
+	     	        	            // Column-wise alignment
+	     	        	            table.body[i][j].alignment = columnAlignment[j];
+	     	        	        }
+	     	        	    }
+
+
+	     	        	    // =====================================================
+	     	        	    // COLUMN WIDTH
+	     	        	    // =====================================================
+
+	     	        	    table.widths = [
+	     	        	        30,     // S.No
+	     	        	        60,     // CDO
+	     	        	        60,     // Date
+	     	        	        80,     // NGO Director
+	     	        	        90,     // Shelter Staff
+	     	        	        160,    // Concerns
+	     	        	        50,     // Photo
+	     	        	        210     // Remark
+	     	        	    ];
+
+
+	     	        	    // =====================================================
+	     	        	    // TABLE LAYOUT
+	     	        	    // =====================================================
+
+	     	        	    table.layout = {
+	     	        	        hLineWidth: function () { return 0.5; },
+	     	        	        vLineWidth: function () { return 0.5; },
+	     	        	        paddingLeft: function () { return 2; },
+	     	        	        paddingRight: function () { return 2; },
+	     	        	        paddingTop: function () { return 3; },
+	     	        	        paddingBottom: function () { return 3; }
+	     	        	    };
+
+
+	     	        	    // =====================================================
+	     	        	    // TABLE SETTINGS
+	     	        	    // =====================================================
+
+	     	        	    table.headerRows = 1;
+	     	        	    table.dontBreakRows = true;
+	     	        	}
+	     	            
+	     	        }
+	     	
+	     	    ],
+	
+	             columnDefs: [
+	                 { width: "60px", targets: 0, className: "text-center" },
+	                 { width: "150px", targets: 1, className: "text-center" },
+	                 { width: "120px", targets: 2, className: "text-center" },
+	                 { width: "220px", targets: 3, className: "text-center" },
+	                 { width: "220px",  targets: 4, className: "text-center" },
+	                 { width: "300px", targets: 5, className: "text-center" },
+	                 { width: "150px", targets: 6, className: "text-center" },
+	                 { width: "250px", targets: 7 }
+	             ],
+	             
+	             dom:
+            	    '<"d-flex justify-content-between align-items-center mb-3"lfB>' +
+            	    'rtip'
+
+	         });
+	 }
+
+	 
+	// =========================================================
+	// LOAD MEETING DETAILS
+	// =========================================================
+
+	function loadMeetingDetails(uqid) {
+
+	    // =====================================================
+	    // GET CURRENT FILTER DATES
+	    // =====================================================
+
+	    var fromDate = $('#fromDate').val() || '';
+	    var toDate = $('#toDate').val() || '';
+
+	    console.log("Meeting Details Filter:");
+	    console.log("UQID:", uqid);
+	    console.log("From Date:", fromDate);
+	    console.log("To Date:", toDate);
+
+
+	    // =====================================================
+	    // API CALL
+	    // =====================================================
+
+	    $.ajax({
+	        url:"/commissionerreview/api/shelter/shelterMeetingDetails",
+	        type: "GET",
+	        data: {
+	            uqid: uqid,
+	            fromDate: fromDate,
+	            toDate: toDate
+	        },
+
+	        success: function (data) {
+	            console.log("Meeting Details:", data );
+	            
+	            
+	            var shelterName = "-";
+
+	            if (data && data.length > 0) {
+	                shelterName = data[0].shelterName || "-";
+	            }
+
+	            $("#meetingModalShelterName").text(shelterName);
+
+	            // =================================================
+	            // INITIALIZE DATATABLE
+	            // =================================================
+
+	            initializeMeetingDetailsTable();
+
+
+	            // =================================================
+	            // CLEAR OLD DATA
+	            // =================================================
+
+	            meetingDetailsDataTable.clear();
+	            
+	            meetingPhotoData = [];
+
+
+	            // =================================================
+	            // ADD NEW DATA
+	            // =================================================
+	            	
+	            	if (data && data.length > 0) {
+
+				    data.forEach(function (item) {
+				
+				        // =================================================
+				        // STORE MEETING PHOTO FOR EXCEL
+				        // =================================================
+				
+				        meetingPhotoData.push({
+				            surveyId: item.surveyId || '',
+				            meetingPhoto: item.meetingPhoto || ''
+				        });
+				
+				
+				        // =================================================
+				        // ADD DATA TO DATATABLE
+				        // =================================================
+				
+				        meetingDetailsDataTable.row.add([
+				
+				            item.sno || '-',
+				            item.cdo || '-',
+				
+				            formatMeetingDate(item.date),
+				            formatMeetingAnswer(2, item.qid3),
+				            formatMeetingAnswer(3, item.qid4),
+				            formatMeetingAnswer(4, item.qid5),
+				            formatMeetingPhoto(item.meetingPhoto),
+				            formatMeetingRemark(item.qid6)
+				        ]);
+				
+				    });
+				
+				}
+
+	        
+
+
+	            // =================================================
+	            // DRAW
+	            // =================================================
+
+	            meetingDetailsDataTable.draw();
+
+
+	            // =================================================
+	            // OPEN MEETING MODAL
+	            // =================================================
+
+	            $("#meetingDetailsModal").modal({
+	                backdrop: 'static',
+	                keyboard: false
+	            });
+
+	            $("#meetingDetailsModal").modal("show");
+
+
+	            // =================================================
+	            // FIX DATATABLE WIDTH
+	            // =================================================
+
+	            setTimeout(function () {
+
+	                meetingDetailsDataTable
+	                    .columns
+	                    .adjust();
+	            }, 300);
+
+	        },
+
+
+	        error: function (xhr) {
+
+	            console.error( "Meeting Details Error:", xhr );
+	            Swal.fire({
+	                icon: 'error',
+	                title: 'Error',
+	                text:'Unable to load meeting details.'
+	            });
+
+	        }
+
+	    });
+	}
+
+		
+	// =========================================================
+	// MEETING PHOTO BUTTON
+	// =========================================================
+	$(document).on("click", ".meetingPhotoBtn", function () {
+	
+	    var photoUrl = $(this).attr("data-photo");
+	
+	    // =====================================================
+	    // SET PHOTO
+	    // =====================================================
+	    if (photoUrl && photoUrl.trim() !== "") {
+	
+	        $("#meetingModalPhoto")
+	            .attr("src", photoUrl)
+	            .show();
+	
+	    } else {
+	
+	        $("#meetingModalPhoto").hide();
+	
+	    }
+	
+	    // =====================================================
+	    // OPEN PHOTO MODAL
+	    // =====================================================
+	    $("#meetingPhotoModal").modal({
+	        backdrop: "static",
+	        keyboard: false
+	    });
+	
+	    $("#meetingPhotoModal").modal("show");
+	});
+
+
+	
+	// =========================================================
+	// QUESTION MASTER
+	// =========================================================
+	
+	function loadMeetingQuestionMaster(callback) {
+
+	    $.ajax({
+	        url: "/commissionerreview/api/shelter/meetingquestions",
+	        type: "GET",
+	        data: {
+	            cid: 1
+	        },
+
+	        dataType: "json",
+	        
+	        success: function (res) {
+	            console.log( "Meeting Question Master:", res );
+
+
+	            if (
+	                res &&
+	                res.data &&
+	                Array.isArray(res.data)
+	            ) {
+
+	                meetingQuestionMaster =
+	                    res.data;
+
+	                console.log( "Meeting Questions Loaded:", meetingQuestionMaster.length);
+	            } else {
+	                console.error( "Meeting question master data not found.", res );
+	                meetingQuestionMaster = [];
+	            }
+
+
+	            if (callback) {
+	                callback();
+	            }
+
+	        },
+
+	        error: function ( xhr, status, error) {
+
+	            console.error( "Meeting Question Master API Error:", xhr.status, error );
+	            console.error( "Response:", xhr.responseText );
+
+	            meetingQuestionMaster = [];
+
+	            if (callback) {
+	                callback();
+	            }
+
+	        }
+
+	    });
+	}
+	
+	
+	
+	
+	// =========================================================
+	// FORMAT MEETING ANSWER
+	// =========================================================
+
+	function formatMeetingAnswer(qid, value) {
+
+	    if (
+	        value === null ||
+	        value === undefined ||
+	        value === ''
+	    ) {
+
+	        return '-';
+
+	    }
+
+	    return value;
+	}
+	
+	// =========================================================
+	// FORMAT MEETING PHOTO
+	// =========================================================
+	function formatMeetingPhoto(photo) {
+	
+	    if (!photo || String(photo).trim() === "") {
+	        return '-';
+	    }
+	
+	    return `
+	        <button type="button"
+	                class="meeting-photo-badge meetingPhotoBtn"
+	                data-photo="${escapeHtml(photo)}"
+	                title="View Meeting Photo">
+	
+	            <i class="fa-solid fa-image"></i>
+	            View Photo
+	
+	        </button>
+	    `;
+	}
+		
+	
+	// =========================================================
+	// ESCAPE HTML
+	// =========================================================
+	function escapeHtml(value) {
+
+	    if (value === null || value === undefined) {
+	        return "";
+	    }
+
+	    return String(value)
+	        .replace(/&/g, "&amp;")
+	        .replace(/</g, "&lt;")
+	        .replace(/>/g, "&gt;")
+	        .replace(/"/g, "&quot;")
+	        .replace(/'/g, "&#039;");
+	}
+	
+		
+	// =========================================================
+	// FORMAT MEETING REMARK
+	// =========================================================
+	function formatMeetingRemark(value) {
+	
+	    if (
+	        value === null ||
+	        value === undefined ||
+	        value === ''
+	    ) {
+	        return '-';
+	    }
+	
+	    var text = String(value).trim();
+	
+	    // Split into approximately 3 lines
+	    var maxLength = Math.ceil(text.length / 3);
+	
+	    var words = text.split(/\s+/);
+	    var lines = [];
+	    var currentLine = '';
+	
+	    words.forEach(function(word) {
+	
+	        if (
+	            (currentLine + ' ' + word).trim().length > maxLength &&
+	            currentLine !== ''
+	        ) {
+	            lines.push(currentLine);
+	            currentLine = word;
+	        } else {
+	            currentLine +=
+	                (currentLine ? ' ' : '') + word;
+	        }
+	
+	    });
+	
+	    if (currentLine) {
+	        lines.push(currentLine);
+	    }
+	
+	    return lines.slice(0, 3).join('<br>');
+	}
+
+/* 	function formatMeetingRemark(value) {
+
+	    if (
+	        value === null ||
+	        value === undefined ||
+	        value === ''
+	    ) {
+
+	        return '-';
+
+	    }
+
+	    return value;
+	} */
+	
+	// =========================================================
+	// MEETING DATE FORMAT
+	// =========================================================
+
+	function formatMeetingDate(date) {
+
+	    if (!date) {
+	        return '-';
+	    }
+
+
+	    var parts = String(date).split('-');
+
+	    if (parts.length === 3) {
+
+	        return parts[2] + '/' +
+	               parts[1] + '/' +
+	               parts[0];
+	    }
+
+
+	    return date;
+	}
+
+    // =========================================================
+    // RESET FILTERS
+    // =========================================================
+
+    function resetFilters() {
+	    $('#fromDate').val('');
+	    $('#toDate').val('');
+        $("#zone").val("");
+        $("#category").val("");
+        //loadDetailedReport();
+        
+        initializeMeetingDates();
+    }
+
+</script>
+
+  
+</body>
+
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/shelterinspection/resucelist.html b/src/main/resources/templates/modules/shelterinspection/resucelist.html
new file mode 100644
index 0000000..01649f8
--- /dev/null
+++ b/src/main/resources/templates/modules/shelterinspection/resucelist.html
@@ -0,0 +1,1848 @@
+
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+
+<head>
+    <title>Shelter Resuce List</title>
+
+    <!-- Bootstrap 5 CSS -->
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/css/bootstrap.min.css" rel="stylesheet">
+    <!-- FontAwesome CSS for icons -->
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css" rel="stylesheet">
+    <!-- DataTables CSS -->
+    <link href="https://cdn.datatables.net/1.13.4/css/jquery.dataTables.min.css" rel="stylesheet" />
+    <link href="https://cdn.datatables.net/buttons/2.3.6/css/buttons.dataTables.min.css" rel="stylesheet" />
+
+    <style>
+        body {
+            background-color: #f8f9fa;
+        }
+
+        .page-header-title h4 {
+            margin: 20px 0;
+            text-align: center;
+            font-weight: bold;
+            color: #003366;
+            text-transform: uppercase;
+        }
+
+        .filter-section {
+            background: #fff;
+            padding: 15px;
+            border-radius: 8px;
+            box-shadow: 0 4px 6px rgba(0, 0, 0, 0.05);
+            margin-bottom: 20px;
+        }
+
+        thead th {
+            background-color: #003366 !important;
+            color: white !important;
+        }
+
+        .report-container {
+            background: #fff;
+            padding: 15px;
+            border-radius: 8px;
+            box-shadow: 0 4px 6px rgba(0, 0, 0, 0.05);
+        }
+
+
+		/* ==============================
+		   DATATABLE ALIGNMENT
+		   ============================== */
+		
+		#detailDataTable {
+		    width: 100% !important;
+		    table-layout: fixed !important;
+		    border-collapse: collapse !important;
+		}
+		
+		#detailDataTable th,
+		#detailDataTable td {
+		    box-sizing: border-box !important;
+		    text-align: center !important;
+		    vertical-align: middle !important;
+		    border: 1px solid #dee2e6 !important;
+		}
+		
+		#detailDataTable thead th {
+		    background-color: #003366 !important;
+		    color: #ffffff !important;
+		    white-space: normal !important;
+		    word-break: normal !important;
+		    padding: 10px 8px !important;
+		}
+		
+		#detailDataTable tbody td {
+		    white-space: normal !important;
+		    word-break: break-word !important;
+		    overflow-wrap: anywhere !important;
+		    padding: 8px !important;
+		}
+		
+		/* Column widths */
+		#detailDataTable th:nth-child(1),
+		#detailDataTable td:nth-child(1) {
+		    width: 6% !important;
+		}
+		
+		#detailDataTable th:nth-child(2),
+		#detailDataTable td:nth-child(2) {
+		    width: 25% !important;
+		}
+		
+		#detailDataTable th:nth-child(3),
+		#detailDataTable td:nth-child(3) {
+		    width: 9% !important;
+		}
+		
+		#detailDataTable th:nth-child(4),
+		#detailDataTable td:nth-child(4) {
+		    width: 15% !important;
+		}
+		
+		#detailDataTable th:nth-child(5),
+		#detailDataTable td:nth-child(5) {
+		    width: 9% !important;
+		}
+		
+		#detailDataTable th:nth-child(6),
+		#detailDataTable td:nth-child(6) {
+		    width: 13% !important;
+		}
+		
+		#detailDataTable th:nth-child(7),
+		#detailDataTable td:nth-child(7) {
+		    width: 14% !important;
+		}
+		
+		#detailDataTable th:nth-child(8),
+		#detailDataTable td:nth-child(8) {
+		    width: 9% !important;
+		}
+		
+		
+		/* =========================================================
+		   RESCUED PEOPLE COUNT
+		========================================================= */
+		
+		/* =========================================================
+		   RESCUED PEOPLE COUNT LINK
+		========================================================= */
+		
+		.rescue-people-link {
+		    color: #0d6efd !important;
+		    text-decoration: underline !important;
+		    cursor: pointer;
+		}
+		
+		.rescue-people-link:hover {
+		    color: #0a58ca !important;
+		    text-decoration: underline !important;
+		}
+		
+		/* ZERO VALUE */
+		.rescue-zero {
+		    color: #212529;
+		}
+	    
+    </style>
+</head>
+
+<body>
+
+	    <div class="container-fluid py-4">
+	        <div class="page-header-title d-flex justify-content-between align-items-center">
+	            <a href="/commissionerreview/shelterpagereport" class="btn btn-secondary"><i
+	                    class="fa-solid fa-arrow-left"></i> Back to Abstract</a>
+	            <h4 class="mb-0 mx-auto">Shelter Resuce List</h4>
+	            <div style="width: 100px;"></div>
+	        </div>
+
+	        <!-- Filter Section -->
+	        <div class="filter-section d-flex justify-content-center align-items-end gap-3 flex-wrap mt-3">
+	            
+             <!-- From Date -->
+			    <div>
+			        <label for="fromDate" class="form-label fw-bold">From Date:</label>
+			        <input type="date" id="fromDate" class="form-control">
+			    </div>
+			
+			    <!-- To Date -->
+			    <div>
+			        <label for="toDate" class="form-label fw-bold">To Date:</label>
+			        <input type="date" id="toDate" class="form-control">
+			    </div>
+			    
+	            <div>
+	                <label for="zone" class="form-label fw-bold">Zone:</label>
+	                <select id="zone" class="form-select">
+	                    <option value="">All Zone</option>
+	                </select>
+	            </div>
+	            <div>
+	                <label for="category" class="form-label fw-bold">Category:</label>
+	                <select id="category" class="form-select">
+	                    <option value="">All Category</option>
+	                </select>
+	            </div>
+	            <div>
+	                <button id="btnSearch" class="btn btn-primary px-4"><i class="fa-solid fa-search"></i> Search</button>
+	            </div>
+	            <div>
+	                <button class="btn btn-secondary px-4" onclick="resetFilters()"><i class="fa-solid fa-rotate-left"></i> Reset </button>
+	            </div>
+       	 </div>
+	        <div class="report-container">
+	            <table id="detailDataTable" class="table table-striped table-bordered display nowrap" style="width:100%;">
+	                <thead>
+	                    <tr>
+	                		<th class="text-center">S.No</th>
+							<th class="text-center">SHELTER</th>
+		                    <!-- <th class="text-center">ZONE</th>
+		                    <th class="text-center">CATEGORY</th>
+		                    <th class="text-center">RESIDENTS</th>
+		                    <th class="text-center">OCCUPANCY STATUS</th>
+		                    <th class="text-center">MAINTENANCE STATUS</th> -->
+							<th class="text-center">No of Resuce</th>
+	                    </tr>
+	                </thead>
+	                <tbody>
+	                    <!-- Populated via JS -->
+	                </tbody>
+	            </table>
+	        </div>
+	     </div>
+
+	
+	<!-- =========================================================
+     SHELTER RESCUE DETAILS MODAL
+========================================================= -->
+
+	<div class="modal fade" id="rescueDetailsModal" tabindex="-1" data-backdrop="static" data-keyboard="false">
+	
+	    <div class="modal-dialog modal-xl modal-dialog-centered">
+	
+	        <div class="modal-content">
+	
+	            <!-- Modal Header -->
+	            <div class="modal-header bg-primary text-white"
+	                 style="background-color: #003366 !important;">
+	                
+                    <div>
+	                    <div class="d-flex align-items-center">					
+					        <h5 class="mb-0">Shelter Rescue Details</h5>
+					        <span class="mx-2">-</span>
+					        <h5 class="mb-0" id="resuceModalShelterName"></h5>
+					    </div>
+                    </div>
+	
+	                <button type="button" class="btn-close btn-close-white" 
+	                	    data-bs-dismiss="modal" aria-label="Close">
+	                </button>
+	
+	            </div>
+	
+	
+	            <!-- Modal Body -->
+	            <div class="modal-body">
+	
+	                <div class="table-responsive">
+	
+	                    <table id="rescueDetailsTable" class="table table-striped table-bordered nowrap"
+	                           style="width:100%;">
+	
+	                        <thead>
+	                            <tr>
+	                                <th class="text-center">S.No</th>
+	                                <th class="text-center">CDO</th>
+	                                <th class="text-center">Date</th>
+	                                <th class="text-center">Date</th>
+	                                <th class="text-center">Time</th>
+	                                <th class="text-center">Area of Visit</th>
+	                                <th class="text-center">No of People in homeless person identified</th>
+	                                <th class="text-center">No of People in homeless situation rescued</th>
+	                                <th class="text-center">Remark</th>
+	                            </tr>
+	                        </thead>
+	
+	                        <tbody>
+	                        </tbody>
+	
+	                    </table>
+	
+	                </div>
+	
+	            </div>
+	
+	
+	            <!-- Modal Footer -->
+	            <div class="modal-footer">
+	                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
+	                    Close
+	                </button>
+	            </div>
+	
+	        </div>
+	
+	    </div>
+	
+	</div>
+	
+	
+	
+	<!-- =========================================================
+     	RESCUED PEOPLE DETAILS MODAL
+	========================================================= -->
+	
+	<div class="modal fade" id="rescuedPeopleModal" tabindex="-1" data-backdrop="static" data-keyboard="false">
+	
+	    <div class="modal-dialog modal-lg modal-dialog-centered">
+	
+	        <div class="modal-content">
+	
+	            <!-- =================================================
+	                 HEADER
+	            ================================================== -->
+	
+	            <div class="modal-header bg-primary text-white" style="background-color:#003366 !important;">
+	            
+	                <h5 class="modal-title">
+	                    Rescued People Details
+	                </h5>
+	
+	                <button type="button" class="btn-close btn-close-white"
+	                        data-bs-dismiss="modal" aria-label="Close">
+	                </button>
+	
+	            </div>
+	
+	
+	            <!-- =================================================
+	                 BODY
+	            ================================================== -->
+	
+	            <div class="modal-body">
+	
+	                <div class="table-responsive">
+	
+	                    <table id="rescuedPeopleTable" class="table table-striped table-bordered nowrap"
+	                           style="width:100%;">
+	
+	                        <thead>
+	                            <tr>
+	                                <th class="text-center">Name</th>
+	                                <th class="text-center">Age</th>
+	                                <th class="text-center">Gender</th>
+	                                <th class="text-center">Shelter Assigned</th>
+	                            </tr>
+	                        </thead>
+	
+	                        <tbody>
+	                        </tbody>
+	
+	                    </table>
+	
+	                </div>
+	
+	            </div>
+	
+	
+	            <!-- =================================================
+	                 FOOTER
+	            ================================================== -->
+	
+	            <div class="modal-footer">
+	                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
+	                    Close
+	                </button>
+	            </div>
+	
+	        </div>
+	
+	    </div>
+	
+	</div>
+	
+
+        <!-- Scripts -->
+        <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.bundle.min.js"></script>
+
+        <!-- DataTables JS -->
+        <script src="https://cdn.datatables.net/1.13.4/js/jquery.dataTables.min.js"></script>
+        <script src="https://cdn.datatables.net/buttons/2.3.6/js/dataTables.buttons.min.js"></script>
+        <script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.html5.min.js"></script>
+        <script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.print.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
+
+        <!-- SweetAlert -->
+        <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+        
+      <script th:inline="javascript">
+
+    var dataTable = null;
+    var rescuedPeopleDataTable;
+
+    $(document).ready(function () {
+
+        // Load dropdowns
+        loadDropdowns();
+
+        // Initialize DataTable
+        dataTable = $('#detailDataTable').DataTable({
+
+	    autoWidth: false,
+	    
+	    columnDefs: [
+	        { width: "6%",  targets: 0 },
+	        { width: "25%", targets: 1 },
+	        { width: "9%",  targets: 2 }
+	     /*    { width: "15%", targets: 3 },
+	        { width: "9%",  targets: 4 },
+	        { width: "13%", targets: 5 },
+	        { width: "14%", targets: 6 },
+	        { width: "9%",  targets: 7 } */
+	    ],
+	   
+	    
+	    responsive: false,
+	    scrollX: false,
+	    searching: true,
+	    paging: true,
+	    info: true,
+	    ordering: true,
+	    dom: '<"d-flex justify-content-between align-items-center mb-3"lfB>rtip',
+	
+	    lengthMenu: [
+	        [10, 25, 50, 100, -1],
+	        [10, 25, 50, 100, "All"]
+	    ],
+	
+	    buttons: [
+	
+	        {
+	            extend: 'excelHtml5',
+	            text: '<i class="fa-solid fa-file-excel"></i> Excel',
+	            className: 'btn btn-success btn-sm me-2',
+	
+	            title: function () {
+	                return 'Commissioner Review - Shelter Rescue Report';
+	            },
+	
+	            filename: function () {
+	
+	                var zone =
+	                    $('#zone option:selected').text()
+	                        .replace(/[^a-zA-Z0-9]/g, '_');
+	
+	                var category =
+	                    $('#category option:selected').text()
+	                        .replace(/[^a-zA-Z0-9]/g, '_');
+	
+	                return 'Shelter_Resuce_' +
+	                       zone + '_' + category
+	                       + '_Reports';
+	            },
+	
+	            exportOptions: {
+	                stripHtml: true,
+	
+	                format: {
+	                    body: function (data, row, column, node) {
+	                        var div = document.createElement("div");
+	                        div.innerHTML = data;
+	                        return div.textContent ||
+	                               div.innerText ||
+	                               "";
+	                    }
+	                }
+	            }
+	        },
+	
+	        {
+	            extend: 'pdfHtml5',
+	            text: '<i class="fa-solid fa-file-pdf"></i> PDF',
+	            className: 'btn btn-danger btn-sm',
+	            orientation: 'landscape',
+	            pageSize: 'A4',
+	            title: function () {
+	                return 'Commissioner Review - Shelter Rescue Report';
+	            },
+	
+	            filename: function () {
+	
+	                var zone =
+	                    $('#zone option:selected').text()
+	                        .replace(/[^a-zA-Z0-9]/g, '_');
+	
+	                var category =
+	                    $('#category option:selected').text()
+	                        .replace(/[^a-zA-Z0-9]/g, '_');
+	
+	                return 'Shelter_Resuce_' +
+	                       zone + '_' + category 
+	                       + '_Reports';
+	            },
+	
+	            exportOptions: {
+	                stripHtml: true,
+	
+	                format: {
+	                    body: function (data, row, column, node) {
+	                        var div = document.createElement("div");
+	                        div.innerHTML = data;
+	                        return div.textContent || div.innerText || "";
+	                    }
+	                }
+	            },
+	            
+	            customize: function (doc) {
+
+	                // =====================================================
+	                // TITLE
+	                // =====================================================
+
+	                doc.styles.title = {
+	                    fontSize: 14,
+	                    bold: true,
+	                    alignment: 'center',
+	                    margin: [0, 0, 0, 10]
+	                };
+
+
+	                // =====================================================
+	                // PAGE MARGINS
+	                // Give maximum width to the table
+	                // =====================================================
+
+	                doc.pageMargins = [15, 30, 15, 30];
+
+
+	                // =====================================================
+	                // DEFAULT FONT
+	                // =====================================================
+
+	                doc.defaultStyle = { fontSize: 8, alignment: 'center' };
+
+	                // =====================================================
+	                // GET TABLE
+	                // =====================================================
+
+	                var table = doc.content[1].table;
+
+
+	                // =====================================================
+	                // FIT TABLE TO FULL A4 WIDTH
+	                // A4 Landscape usable width ≈ 812
+	                // =====================================================
+
+	                table.widths = [
+	                    45,     // S.No
+	                    600,    // Shelter
+	                    130     // No of Rescue
+	                ];
+
+
+	                // =====================================================
+	                // HEADER
+	                // =====================================================
+
+	                if (table.body.length > 0) {
+	                    table.body[0].forEach(function (cell) {
+	                        if (typeof cell === 'object') {
+	                            cell.bold = true;
+	                            cell.fontSize = 9;
+	                            cell.alignment = 'center';
+	                        }
+	                    });
+	                }
+
+
+	                // =====================================================
+	                // BODY ALIGNMENT
+	                // =====================================================
+
+	                table.body.forEach(function (row, rowIndex) {
+	                    row.forEach(function (cell) {
+	                        if (typeof cell === 'object') {
+	                            cell.alignment = 'center';
+	                            cell.margin = [ 3, 4, 3, 4 ];
+	                        }
+	                    });
+	                });
+
+
+	                // =====================================================
+	                // KEEP ROW TOGETHER
+	                // =====================================================
+
+	                table.dontBreakRows = true;
+	                table.headerRows = 1;
+
+
+	                // =====================================================
+	                // TABLE BORDERS
+	                // =====================================================
+
+	                table.layout = {
+	                    hLineWidth: function () { return 0.5; },
+	                    vLineWidth: function () { return 0.5; },
+	                    paddingLeft: function () { return 3; },
+	                    paddingRight: function () { return 3; },
+	                    paddingTop: function () { return 3; },
+	                    paddingBottom: function () { return 3; }
+	                };
+
+	            }
+	
+	        }
+	
+	    ]
+	
+	});
+        
+        // Search button
+        $('#btnSearch').click(function () {
+            loadDetailedReport();
+        });
+
+
+        // Load data initially
+        //loadDetailedReport();
+        
+        // =========================================================
+		// INITIALIZE DEFAULT DATES
+		// =========================================================
+		
+		initializeResuceDates();
+    });
+
+
+
+    // =========================================================
+    // LOAD DROPDOWNS
+    // =========================================================
+
+    function loadDropdowns() {
+
+        // -------------------------
+        // Zone
+        // -------------------------
+
+        $.ajax({
+            url: "/commissionerreview/api/shelterinspection/zones",
+            type: "GET",
+            success: function (data) {
+                let options =
+                    '<option value="">All Zones</option>';
+
+                data.forEach(function (zone) {
+                    options +=
+                        '<option value="' + zone + '">' +
+                        zone +
+                        '</option>';
+                });
+
+                $("#zone").html(options);
+            },
+
+            error: function () {
+                Swal.fire(
+                    'Error',
+                    'Unable to load zones.',
+                    'error'
+                );
+            }
+
+        });
+
+
+        // -------------------------
+        // Category
+        // -------------------------
+
+        $.ajax({
+            url: "/commissionerreview/api/shelterinspection/categories",
+            type: "GET",
+            success: function (data) {
+                let options =
+                    '<option value="">All Categories</option>';
+
+                data.forEach(function (category) {
+                    let text = formatCategory(category);
+                    options +=
+                        '<option value="' + category + '">' +
+                        text +
+                        '</option>';
+                });
+
+                $("#category").html(options);
+
+            },
+
+            error: function () {
+                Swal.fire(
+                    'Error',
+                    'Unable to load categories.',
+                    'error'
+                );
+            }
+        });
+
+    }
+    
+	 // =========================================================
+	 // INITIALIZE COMPLAINT DATE FILTER
+	 // From Date = Minimum DB cdate
+	 // To Date   = Today
+	 // =========================================================
+	
+	 function initializeResuceDates() {
+	
+	     $.ajax({
+	         url: "/commissionerreview/api/shelter/shelterResuceMinDate",
+	         type: "GET",
+	         success: function (minDate) {
+	
+	             console.log("Minimum Resuce cdate:", minDate);
+	
+	             // =================================================
+	             // TODAY
+	             // =================================================
+	
+	             var today = new Date();
+	
+	             var yyyy = today.getFullYear();
+	
+	             var mm = String(today.getMonth() + 1).padStart(2, '0');
+	             var dd = String(today.getDate()).padStart(2, '0');
+	             var todayString = yyyy + '-' + mm + '-' + dd;
+	
+	
+	             // =================================================
+	             // FROM DATE
+	             // =================================================
+	
+	             if (minDate) {
+	                 $('#fromDate').val(minDate);
+	             } else {
+	                 // If no DB date found,
+	                 // use today
+	
+	                 $('#fromDate').val(todayString);
+	             }
+	
+	
+	             // =================================================
+	             // TO DATE = TODAY
+	             // =================================================
+	
+	             $('#toDate').val(todayString);
+	
+	
+	             // =================================================
+	             // LOAD REPORT
+	             // =================================================
+	
+	             loadDetailedReport();
+	
+	         },
+	
+	         error: function (xhr) {
+	
+	             console.error("Unable to get minimum resuce date:",);
+	
+	             // =================================================
+	             // FALLBACK TO TODAY
+	             // =================================================
+	
+	             var today = new Date();
+	
+	             var yyyy = today.getFullYear();
+	
+	             var mm = String(today.getMonth() + 1).padStart(2, '0');
+	             var dd = String(today.getDate()).padStart(2, '0');
+	             var todayString = yyyy + '-' + mm + '-' + dd;
+	
+	
+	             $('#fromDate').val(todayString);
+	             $('#toDate').val(todayString);
+	
+	             loadDetailedReport();
+	
+	         }
+	
+	     });
+	
+	 }
+
+
+
+    // =========================================================
+    // LOAD SHELTER REPORT
+    // =========================================================
+
+    function loadDetailedReport() {
+    	
+	    var fromDate = $('#fromDate').val() || '';
+	    var toDate = $('#toDate').val() || '';
+
+        var zone = $('#zone').val() || '';
+        var category = $('#category').val() || '';
+        
+        
+	    // =====================================================
+	    // DATE VALIDATION
+	    // =====================================================
+	
+	    if (fromDate && toDate) {
+	
+	        if (fromDate > toDate) {
+	
+	            Swal.fire({
+	                icon: 'warning',
+	                title: 'Invalid Date Range',
+	                text: 'To Date cannot be earlier than From Date.',
+	    	        allowOutsideClick: false,
+	            });
+	
+	            return;
+	        }
+	    }
+
+	    Swal.fire({
+	        title: 'Loading...',
+	        allowOutsideClick: false,
+	        allowEscapeKey: false,
+	        didOpen: function () {
+	            Swal.showLoading();
+	        }
+	    });
+
+
+        $.ajax({
+            url: "/commissionerreview/api/shelter/shelterResuceList",
+            type: "GET",
+            data: {
+	            fromDate: fromDate,
+	            toDate: toDate,
+                zone: zone,
+                category: category
+            },
+
+            success: function (response) {
+                Swal.close();
+	            console.log( "Resuce List Response:", response);
+                populateTable(response);
+            },
+
+            error: function (xhr) {
+                Swal.close();
+	            console.error( "Resuce List Error:", xhr );
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Error',
+                    text: 'Unable to load shelter Resuce list.',
+                    allowOutsideClick: false
+                });
+
+            }
+
+        });
+
+    }
+
+
+
+    // =========================================================
+    // POPULATE TABLE
+    // =========================================================
+
+    function populateTable(data) {
+
+        dataTable.clear();
+
+        if (!data || data.length === 0) {
+            dataTable.draw();
+            return;
+        }
+
+
+        data.forEach(function (item, index) {
+            var shelterName = item.shelterName || '-';
+    /*     var zone =
+                item.zone || '-';
+            var category =
+                formatCategory(item.category);
+            var residents =
+                item.totalResidents || 0;
+            var occupancyStatus =
+                getStatusBadge(residents);
+            var maintenanceStatus =
+                getMaintenanceBadge(
+                    item.maintenanceStatus
+                ); */
+                
+            var totalresuces = item.totalResuces || '0';
+            var rescueLink;
+
+            if (Number(totalresuces) > 0) {
+
+                // Rescues available - clickable
+                rescueLink =
+                    '<a href="javascript:void(0);" ' +
+                    'class="rescue-count" ' +
+                    'data-uqid="' + item.uqid + '">' +
+                    totalresuces +
+                    '</a>';
+
+            } else {
+
+                // Zero rescues - not clickable
+                rescueLink =
+                    '<span class="text-muted">0</span>';
+            }    
+
+            dataTable.row.add([
+                index + 1,
+                '<strong>' +
+                    shelterName +
+                '</strong>',
+
+              /*   zone,
+                category,
+                residents,
+                occupancyStatus,
+                maintenanceStatus, 
+                totalresuces*/
+                
+                rescueLink
+            ]);
+        });
+
+
+        dataTable.draw();
+
+    }
+
+
+
+    // =========================================================
+    // CATEGORY FORMAT
+    // =========================================================
+
+    function formatCategory(category) {
+        if (!category) {
+            return "-";
+        }
+
+        return category
+            .replace(/-/g, " ")
+            .replace(/\b\w/g, function (letter) {
+                return letter.toUpperCase();
+            });
+    }
+    
+    
+	$('#detailDataTable tbody').on('click','.rescue-count',function () {
+        var uqid = $(this).data('uqid');
+        loadRescueDetails(uqid);
+    });
+
+
+	 // =========================================================
+	 // RESCUE DETAILS DATATABLE
+	 // =========================================================
+	
+	 function initializeRescueDetailsTable() {
+	
+	     if ($.fn.DataTable.isDataTable('#rescueDetailsTable')) {
+	         $('#rescueDetailsTable').DataTable().clear().destroy();
+	     }
+	
+	
+	     rescueDetailsDataTable =
+	         $('#rescueDetailsTable').DataTable({
+	             paging: true,
+	             ordering: false,
+	             info: true,
+	             searching: true,
+	             scrollX: true,
+	             scrollY: "60vh",
+	             scrollCollapse: true,
+	             autoWidth: false,
+	             pageLength: 10,
+	
+	             lengthMenu: [
+	                 [10, 25, 50, 100, -1],
+	                 [10, 25, 50, 100, "All"]
+	             ],
+	
+	
+	             // =================================================
+	             // EXCEL + PDF
+	             // =================================================
+	
+	             buttons: [
+	                 {
+	                     extend: 'excelHtml5',
+	                     text:'<i class="fa-solid fa-file-excel"></i> Excel',
+	                     className:'btn btn-success btn-sm me-2',
+	                     title: function () {
+	                         return 'Commissioner Review - Shelter Rescue Details';
+	                     },
+	
+	                     filename: function () {
+	                         var zone = $('#zone option:selected').text().replace(/[^a-zA-Z0-9]/g,'_');
+	                         var category = $('#category option:selected').text().replace(/[^a-zA-Z0-9]/g,'_');
+	
+	                         return 'Shelter_Rescue_' +
+	                                zone + '_' + category
+	                                + '_Details';
+	                     },
+	
+	                     exportOptions: {
+	                         stripHtml: true,
+	                         format: {
+	
+	                             body:
+	                                 function ( data, row, column, node ) {
+	
+	                                     var div = document.createElement("div");
+	                                     div.innerHTML = data;
+	                                     return div.textContent || div.innerText || "";
+	                                 }
+	                         }
+	                     }
+	                 },
+	
+	
+	                 {
+	                     extend: 'pdfHtml5',
+	                     text:'<i class="fa-solid fa-file-pdf"></i> PDF',
+	                     className:'btn btn-danger btn-sm',
+	                     orientation: 'landscape',
+	                     pageSize: 'A4',
+	                     title: function () {
+	                         return 'Commissioner Review - Shelter Rescue Details';
+	                     },
+	
+	                     filename: function () {
+	                         var zone = $('#zone option:selected').text().replace(/[^a-zA-Z0-9]/g, '_');
+	                         var category = $('#category option:selected').text().replace(/[^a-zA-Z0-9]/g, '_');
+	                         
+	                         return 'Shelter_Rescue_' + zone + '_' + category+ '_Details';
+	                     },
+	
+	                     exportOptions: {
+	                    	    columns: ':visible',
+	                    	    stripHtml: true,
+
+	                    	    format: {
+	                    	    	
+	                    	        body: function (data, row, column, node) {
+	                    	            var div = document.createElement("div");
+	                    	            div.innerHTML = data;
+	                    	            var text = div.textContent || div.innerText || "";
+	                    	            return text.replace(/\s+/g, ' ').trim();
+	                    	        }
+
+	                    	    }
+	                    	},
+	                    	
+	                    	customize: function (doc) {
+
+	                    	    // =====================================================
+	                    	    // PAGE
+	                    	    // =====================================================
+
+	                    	    doc.pageOrientation = 'landscape';
+	                    	    doc.pageSize = 'A4';
+	                    	    doc.pageMargins = [15, 30, 15, 30];
+
+
+	                    	    // =====================================================
+	                    	    // TITLE
+	                    	    // =====================================================
+
+	                    	    doc.styles.title = {
+	                    	        fontSize: 14,
+	                    	        bold: true,
+	                    	        alignment: 'center',
+	                    	        margin: [0, 0, 0, 10]
+	                    	    };
+
+	                    	    // =====================================================
+	                    	    // DEFAULT FONT
+	                    	    // =====================================================
+
+	                    	    doc.defaultStyle = { fontSize: 7 };
+
+
+	                    	    // =====================================================
+	                    	    // GET TABLE
+	                    	    // =====================================================
+
+	                    	    var table = doc.content[1].table;
+
+	                    	    // =====================================================
+	                    	    // CLEAN TABLE DATA
+	                    	    // =====================================================
+
+	                    	    table.body = table.body.map(function (row, rowIndex) {
+
+	                    	        return row.map(function (cell) {
+
+	                    	            var value = '';
+
+	                    	            if (cell === null || cell === undefined) {
+	                    	                value = '';
+	                    	            } else if (typeof cell === 'object') {
+
+	                    	                if (cell.text !== undefined) {
+	                    	                    value = cell.text;
+	                    	                } else {
+	                    	                    value = String(cell);
+	                    	                }
+
+	                    	            } else {
+	                    	                value = String(cell);
+	                    	            }
+
+
+	                    	            // Remove HTML
+	                    	            var temp = document.createElement("div");
+	                    	            temp.innerHTML = value;
+
+	                    	            value = temp.textContent || temp.innerText || "";
+
+	                    	            // Clean spaces
+	                    	            value = value.replace(/\s+/g, ' ').trim();
+
+
+	                    	            return {
+	                    	                text: value,
+	                    	                alignment: 'center',
+	                    	                fontSize: 7,
+	                    	                margin: [2, 4, 2, 4]
+	                    	            };
+
+	                    	        });
+
+	                    	    });
+
+
+	                    	    // =====================================================
+	                    	    // HEADER BACKGROUND COLOR
+	                    	    // SAME AS detailDataTable
+	                    	    // =====================================================
+
+	                    	    if (table.body.length > 0) {
+	                    	        table.body[0].forEach(function (cell) {
+	                    	            cell.fillColor = '#003366';
+	                    	            cell.color = '#ffffff';
+	                    	            cell.bold = true;
+	                    	            cell.fontSize = 10;
+	                    	            cell.alignment = 'center';
+	                    	            cell.margin = [2, 4, 2, 4];
+	                    	        });
+	                    	    }
+
+
+	                    	    // =====================================================
+	                    	    // BODY BACKGROUND COLOR
+	                    	    // =====================================================
+
+	                    	    for (var i = 1; i < table.body.length; i++) {
+	                    	        for (var j = 0; j < table.body[i].length; j++) {
+	                    	            table.body[i][j].fillColor = (i % 2 === 1) ? '#f2f2f2' : '#ffffff';
+	                    	            table.body[i][j].color = '#000000';
+	                    	            table.body[i][j].alignment = 'center';
+	                    	            table.body[i][j].fontSize = 9 ;
+	                    	        }
+	                    	    }
+
+
+	                    	    // =====================================================
+	                    	    // COLUMN WIDTH
+	                    	    // =====================================================
+
+	                    	    table.widths = [
+	                    	        30,     // S.No
+	                    	        60,     // CDO
+	                    	        60,     // Date
+	                    	        60,     // Rescue Date
+	                    	        50,     // Time
+	                    	        70,     // Area of Visit
+	                    	        140,    // People Identified
+	                    	        150,    // People Rescued
+	                    	        90      // Remark
+	                    	    ];
+
+
+	                    	    // =====================================================
+	                    	    // TABLE LAYOUT
+	                    	    // =====================================================
+
+	                    	    table.layout = {
+	                    	        hLineWidth: function () { return 0.5; },
+	                    	        vLineWidth: function () { return 0.5; },
+	                    	        paddingLeft: function () { return 2; },
+	                    	        paddingRight: function () { return 2; },
+	                    	        paddingTop: function () { return 3; },
+	                    	        paddingBottom: function () { return 3; }
+	                    	    };
+
+
+	                    	    // =====================================================
+	                    	    // TABLE SETTINGS
+	                    	    // =====================================================
+
+	                    	    table.headerRows = 1;
+	                    	    table.dontBreakRows = true;
+
+	                    	}
+	                     
+	                 }
+	
+	             ],
+	
+	
+	             // =================================================
+	             // COLUMN WIDTH
+	             // =================================================
+	
+	             columnDefs: [
+	                 { width: "60px", targets: 0, className: "text-center" },
+	                 { width: "130px", targets: 1, className: "text-center" },
+	                 { width: "110px", targets: 2, className: "text-center" },
+	                 { width: "110px", targets: 3, className: "text-center" },
+	                 { width: "100px", targets: 4, className: "text-center" },
+	                 { width: "180px", targets: 5, className: "text-center"  },
+	                 { width: "220px", targets: 6, className: "text-center" },
+	                 { width: "220px", targets: 7, className: "text-center" },	
+	                 { width: "250px", targets: 8, className: "text-center" }
+	             ],
+	
+	
+	             // =================================================
+	             // IMPORTANT: B = BUTTONS
+	             // =================================================
+	
+	             dom:
+	                 '<"d-flex justify-content-between align-items-center mb-3"lfB>' +
+	                 'rtip'
+	
+	         });
+	 }
+	 
+	// =========================================================
+	// LOAD RESCUE DETAILS
+	// =========================================================
+
+	function loadRescueDetails(uqid) {
+
+	    $.ajax({
+	        url:"/commissionerreview/api/shelter/shelterResuceDetails",
+	        type: "GET",
+	        data: {
+	            uqid: uqid,
+	            fromDate: $('#fromDate').val(),
+	            toDate: $('#toDate').val()
+	        },
+
+
+	        success: function (data) {
+	            console.log( "Rescue Details:", data );
+	            
+	            var shelterName = "-";
+
+	            if (data && data.length > 0) {
+	                shelterName = data[0].shelterName || "-";
+	            }
+
+	            $("#resuceModalShelterName").text(shelterName);
+
+	            // =============================================
+	            // INITIALIZE DATATABLE
+	            // =============================================
+
+	            initializeRescueDetailsTable();
+
+
+	            // =============================================
+	            // CLEAR OLD DATA
+	            // =============================================
+
+	            rescueDetailsDataTable.clear();
+
+
+	            // =============================================
+	            // ADD NEW DATA
+	            // =============================================
+
+	            data.forEach(function (item) {
+
+	                rescueDetailsDataTable.row.add([
+
+	                    item.sno || '-',
+	                    item.cdo || '-',
+
+	                    formatRescueDate(item.date),
+	                    formatRescueDate(item.qid1),
+
+	                    item.qid2 || '-',
+	                    item.qid3 || '-',
+	                    item.qid4 || '-',
+	                    
+	                    formatRescuedPeople(item.qid5, item.surveyId),
+	                    item.qid11 || '-'
+
+	                ]);
+
+	            });
+
+
+	            // =============================================
+	            // DRAW
+	            // =============================================
+
+	            rescueDetailsDataTable.draw();
+
+	            // =============================================
+	            // OPEN MODAL
+	            // =============================================
+	            	
+          		$("#rescueDetailsModal").modal({
+	                backdrop: 'static',
+	                keyboard: false
+	            });
+
+	            $("#rescueDetailsModal").modal("show");
+
+	            // =============================================
+	            // FIX DATATABLE WIDTH
+	            // =============================================
+
+	            setTimeout(function () {
+	                rescueDetailsDataTable.columns.adjust();
+	            }, 300);
+
+	        },
+
+
+	        error: function (xhr) {
+	            console.error("Rescue Details Error:", xhr );
+	            Swal.fire({
+	                icon: 'error',
+	                title: 'Error',
+	                text:'Unable to load rescue details.',
+	    	        allowOutsideClick: false,
+	            });
+	        }
+
+	    });
+
+	}
+	
+	// =========================================================
+	// FORMAT RESCUED PEOPLE COUNT
+	// =========================================================
+			
+	function formatRescuedPeople(count, surveyId) {
+	
+	    if (
+	        count === null ||
+	        count === undefined ||
+	        String(count).trim() === ''
+	    ) {
+	        return '-';
+	    }
+	
+	    var numericCount = parseInt(count, 10);
+	
+	    // =====================================================
+	    // ZERO = NORMAL TEXT
+	    // =====================================================
+	
+	    if (isNaN(numericCount) || numericCount === 0) {
+	
+	        return '<span class="rescue-zero">' +
+	               escapeHtml(String(count)) +
+	               '</span>';
+	    }
+	
+	    // =====================================================
+	    // MORE THAN ZERO = CLICKABLE
+	    // =====================================================
+	
+	    return `
+	        <a href="javascript:void(0);"
+	           class="rescue-people-link"
+	           data-survey-id="${escapeHtml(surveyId || '')}">
+	
+	            ${escapeHtml(String(count))}
+	
+	        </a>
+	    `;
+	}
+	
+	function escapeHtml(value) {
+
+	    if (value === null || value === undefined) {
+	        return '';
+	    }
+
+	    return String(value)
+	        .replace(/&/g, '&amp;')
+	        .replace(/</g, '&lt;')
+	        .replace(/>/g, '&gt;')
+	        .replace(/"/g, '&quot;')
+	        .replace(/'/g, '&#039;');
+	}
+	
+    // =========================================================
+    // RESUCE PEOPLE DATATABLES
+    // =========================================================	
+
+	function initializeRescuedPeopleTable() {
+
+	    if ($.fn.DataTable.isDataTable('#rescuedPeopleTable')) {
+	        rescuedPeopleDataTable = $('#rescuedPeopleTable').DataTable();
+	        return;
+	    }
+
+	    rescuedPeopleDataTable = $('#rescuedPeopleTable').DataTable({
+	        	
+	        	 paging: true,
+	             ordering: false,
+	             info: true,
+	             searching: true,
+	             scrollX: true,
+	             scrollY: "60vh",
+	             scrollCollapse: true,
+	             autoWidth: false,
+	             pageLength: 10,
+	
+	             lengthMenu: [
+	                 [10, 25, 50, 100, -1],
+	                 [10, 25, 50, 100, "All"]
+	             ],
+	
+	
+	             // =================================================
+	             // EXCEL + PDF
+	             // =================================================
+	
+	             buttons: [
+	                 {
+	                     extend: 'excelHtml5',
+	                     text:'<i class="fa-solid fa-file-excel"></i> Excel',
+	                     className:'btn btn-success btn-sm me-2',
+	                     title: function () {
+	                         return 'Commissioner Review - Shelter Rescue People Details';
+	                     },
+	
+	                     filename: function () {
+	                         var zone =
+	                             $('#zone option:selected')
+	                                 .text()
+	                                 .replace(/[^a-zA-Z0-9]/g,'_');
+	
+	                         var category =
+	                             $('#category option:selected')
+	                                 .text()
+	                                 .replace(/[^a-zA-Z0-9]/g,'_');
+	
+	                         return 'Shelter_Rescue_People_' +
+	                                zone + '_' + category + '_Details';
+	                     },
+	
+	                     exportOptions: {
+	                         stripHtml: true,
+	                         format: {
+	
+	                             body:
+	                                 function ( data, row, column, node ) {
+	
+	                                     var div = document.createElement("div");
+	                                     div.innerHTML = data;
+	                                     return div.textContent || div.innerText || "";
+	                                 }
+	                         }
+	                     }
+	                 },
+	
+	
+	                 {
+	                     extend: 'pdfHtml5',
+	                     text:'<i class="fa-solid fa-file-pdf"></i> PDF',
+	                     className:'btn btn-danger btn-sm',
+	                     orientation: 'landscape',
+	                     pageSize: 'A4',
+	                     title: function () {
+	                         return 'Commissioner Review - Shelter Rescue People Details';
+	                     },
+	
+	                     filename: function () {
+	                         var zone =
+	                             $('#zone option:selected')
+	                                 .text()
+	                                 .replace(/[^a-zA-Z0-9]/g,'_');
+	
+	                         var category =
+	                             $('#category option:selected')
+	                                 .text()
+	                                 .replace(/[^a-zA-Z0-9]/g,'_');
+	
+	                         return 'Shelter_Rescue_People_' +
+	                                zone + '_' + category + '_Details';
+	                     },
+	
+	                     exportOptions: {
+	
+	                         stripHtml: true,
+	
+	                         format: {
+	                             body:
+	                                 function ( data, row,  column, node ) {
+	                                     var div = document.createElement("div");
+	                                     div.innerHTML = data;
+	                                     return div.textContent || div.innerText || "";
+	                                 }
+	                         }
+	                     },
+	                     
+	                     customize: function (doc) {
+
+	                    	    // =====================================================
+	                    	    // PAGE
+	                    	    // =====================================================
+
+	                    	    doc.pageMargins = [30, 40, 30, 40];
+
+	                    	    // =====================================================
+	                    	    // TITLE
+	                    	    // =====================================================
+
+	                    	    doc.styles.title = {
+	                    	        fontSize: 14,
+	                    	        bold: true,
+	                    	        alignment: 'center',
+	                    	        margin: [0, 0, 0, 15]
+	                    	    };
+
+	                    	    // =====================================================
+	                    	    // DEFAULT STYLE
+	                    	    // =====================================================
+
+	                    	    doc.defaultStyle.fontSize = 9;
+
+	                    	    // =====================================================
+	                    	    // TABLE
+	                    	    // =====================================================
+
+	                    	    var table = doc.content[1].table;
+
+	                    	    table.widths = [ '25%', '15%', '20%', '40%' ];
+
+	                    	    table.body.forEach(function (row) {
+	                    	        row.forEach(function (cell) {
+	                    	            if (typeof cell === 'object') {
+	                    	                cell.alignment = 'center';
+	                    	                cell.margin = [4, 5, 4, 5];
+	                    	            }
+	                    	        });
+	                    	    });
+
+	                    	    // =====================================================
+	                    	    // HEADER
+	                    	    // =====================================================
+
+	                    	    table.body[0].forEach(function (cell) {
+
+	                    	        if (typeof cell === 'object') {
+
+	                    	            cell.bold = true;
+	                    	            cell.alignment = 'center';
+	                    	            cell.fontSize = 9;
+	                    	        }
+
+	                    	    });
+
+	                    	    // =====================================================
+	                    	    // TABLE SETTINGS
+	                    	    // =====================================================
+
+	                    	    table.dontBreakRows = true;
+	                    	}
+
+	                 }
+	
+	             ],
+	             
+	             
+	             // =================================================
+	             // IMPORTANT: B = BUTTONS
+	             // =================================================
+	
+	             dom:
+	                 '<"d-flex justify-content-between align-items-center mb-3"lfB>' +
+	                 'rtip'
+
+
+	        });
+	}
+    
+    
+	// =========================================================
+	// CLICK RESCUED PEOPLE COUNT
+	// =========================================================
+		
+		$(document).on("click", ".rescue-people-link", function () {
+		        var surveyId = $(this).attr("data-survey-id");
+		
+		        if (!surveyId) {
+		            return;
+		        }
+		
+		        loadRescuedPeopleDetails(surveyId);
+		    }
+		);
+	
+	
+		// =========================================================
+		// LOAD RESCUED PEOPLE DETAILS
+		// =========================================================
+
+		function loadRescuedPeopleDetails(surveyId) {
+
+		    $.ajax({
+		        url: "/commissionerreview/api/shelter/shelterRescuedPeopleDetails",
+		        type: "GET",
+
+		        data: {
+		            surveyId: surveyId,
+		            fromDate: $('#fromDate').val(),
+		            toDate: $('#toDate').val()
+		        },
+
+		        success: function(data) {
+
+		            console.log(
+		                "Rescued People Details:",
+		                data
+		            );
+
+		            // =================================================
+		            // INITIALIZE TABLE
+		            // =================================================
+
+		            initializeRescuedPeopleTable();
+
+		            // =================================================
+		            // CLEAR OLD DATA
+		            // =================================================
+
+		            rescuedPeopleDataTable.clear();
+
+		            // =================================================
+		            // ADD ALL PEOPLE
+		            // =================================================
+
+		            if (data && data.length > 0) {
+		                data.forEach(function(item) {
+		                    rescuedPeopleDataTable.row.add([
+		                        item.name || '-',
+		                        item.age || '-',
+		                        item.gender || '-',
+		                        item.shelterAssigned || '-'
+		                    ]);
+		                });
+		            }
+
+		            // =================================================
+		            // DRAW
+		            // =================================================
+
+		            rescuedPeopleDataTable.draw();
+
+		            // =================================================
+		            // OPEN MODAL
+		            // =================================================
+
+		            $("#rescuedPeopleModal").modal({
+		                backdrop: "static",
+		                keyboard: false,
+		    	        allowOutsideClick: false
+		            });
+
+		            $("#rescuedPeopleModal").modal("show");
+
+		            // =================================================
+		            // FIX WIDTH
+		            // =================================================
+
+		            setTimeout(function() {
+		                rescuedPeopleDataTable.columns.adjust();
+		            }, 300);
+
+		        },
+
+		        error: function(xhr) {
+		            console.error("Rescued People Details Error:", xhr);
+		            Swal.fire({
+		                icon: "error",
+		                title: "Error",
+		                text: "Unable to load rescued people details.",
+		    	        allowOutsideClick: false,
+		            });
+		        }
+		        
+		    });
+		}
+		
+	
+
+	
+	
+	// =========================================================
+	// QUESTION MASTER
+	// =========================================================
+	
+	function loadMeetingQuestionMaster(callback) {
+
+	    $.ajax({
+	        url: "/commissionerreview/api/shelter/resucequestions",
+	        type: "GET",
+	        data: {
+	            cid: 1
+	        },
+
+	        dataType: "json",
+	        
+	        success: function (res) {
+	            console.log( "Meeting Question Master:", res );
+
+
+	            if (
+	                res &&
+	                res.data &&
+	                Array.isArray(res.data)
+	            ) {
+
+	                meetingQuestionMaster =
+	                    res.data;
+
+	                console.log( "Meeting Questions Loaded:", meetingQuestionMaster.length);
+	            } else {
+	                console.error( "Meeting question master data not found.", res );
+	                meetingQuestionMaster = [];
+	            }
+
+
+	            if (callback) {
+	                callback();
+	            }
+
+	        },
+
+	        error: function ( xhr, status, error) {
+
+	            console.error( "Meeting Question Master API Error:", xhr.status, error );
+	            console.error( "Response:", xhr.responseText );
+
+	            meetingQuestionMaster = [];
+
+	            if (callback) {
+	                callback();
+	            }
+
+	        }
+
+	    });
+	}
+	
+	// =========================================================
+	// FORMAT MEETING ANSWER
+	// =========================================================
+
+	function formatMeetingAnswer(qid, value) {
+
+	    if (
+	        value === null ||
+	        value === undefined ||
+	        value === ''
+	    ) {
+
+	        return '-';
+
+	    }
+
+	    return value;
+	}
+	
+	// =========================================================
+	// FORMAT MEETING REMARK
+	// =========================================================
+
+	function formatMeetingRemark(value) {
+
+	    if (
+	        value === null ||
+	        value === undefined ||
+	        value === ''
+	    ) {
+
+	        return '-';
+
+	    }
+
+	    return value;
+	}
+	
+	
+	// Date Format
+	function formatRescueDate(value) {
+
+	    if (!value) {
+	        return '-';
+	    }
+	
+	    var date = new Date(value);
+	
+	    if (isNaN(date.getTime())) {
+	        return value;
+	    }
+	
+	    var day = String(date.getDate()).padStart(2, '0');
+	    var month = String(date.getMonth() + 1).padStart(2, '0');
+	    var year = date.getFullYear();
+	
+	    return day + '/' + month + '/' + year;
+	}
+
+
+    // =========================================================
+    // RESET FILTERS
+    // =========================================================
+
+    function resetFilters() {
+	    $('#fromDate').val('');
+	    $('#toDate').val('');
+        $("#zone").val("");
+        $("#category").val("");
+        //loadDetailedReport();
+        
+        initializeResuceDates();
+    }
+
+</script>
+
+  
+</body>
+
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/shelterinspection/shelterlist.html b/src/main/resources/templates/modules/shelterinspection/shelterlist.html
new file mode 100644
index 0000000..dbc7a12
--- /dev/null
+++ b/src/main/resources/templates/modules/shelterinspection/shelterlist.html
@@ -0,0 +1,634 @@
+
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+
+<head>
+    <title>Shelter List</title>
+
+    <!-- Bootstrap 5 CSS -->
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/css/bootstrap.min.css" rel="stylesheet">
+    <!-- FontAwesome CSS for icons -->
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css" rel="stylesheet">
+    <!-- DataTables CSS -->
+    <link href="https://cdn.datatables.net/1.13.4/css/jquery.dataTables.min.css" rel="stylesheet" />
+    <link href="https://cdn.datatables.net/buttons/2.3.6/css/buttons.dataTables.min.css" rel="stylesheet" />
+
+    <style>
+        body {
+            background-color: #f8f9fa;
+        }
+
+        .page-header-title h4 {
+            margin: 20px 0;
+            text-align: center;
+            font-weight: bold;
+            color: #003366;
+            text-transform: uppercase;
+        }
+
+        .filter-section {
+            background: #fff;
+            padding: 15px;
+            border-radius: 8px;
+            box-shadow: 0 4px 6px rgba(0, 0, 0, 0.05);
+            margin-bottom: 20px;
+        }
+
+        thead th {
+            background-color: #003366 !important;
+            color: white !important;
+        }
+
+        .report-container {
+            background: #fff;
+            padding: 15px;
+            border-radius: 8px;
+            box-shadow: 0 4px 6px rgba(0, 0, 0, 0.05);
+        }
+
+		/* ==============================
+		   DATATABLE ALIGNMENT
+		   ============================== */
+		
+		#detailDataTable {
+		    width: 100% !important;
+		    table-layout: fixed !important;
+		    border-collapse: collapse !important;
+		}
+		
+		#detailDataTable th,
+		#detailDataTable td {
+		    box-sizing: border-box !important;
+		    text-align: center !important;
+		    vertical-align: middle !important;
+		    border: 1px solid #dee2e6 !important;
+		}
+		
+		#detailDataTable thead th {
+		    background-color: #003366 !important;
+		    color: #ffffff !important;
+		    white-space: normal !important;
+		    word-break: normal !important;
+		    padding: 10px 8px !important;
+		}
+		
+		#detailDataTable tbody td {
+		    white-space: normal !important;
+		    word-break: break-word !important;
+		    overflow-wrap: anywhere !important;
+		    padding: 8px !important;
+		}
+		
+		/* Column widths */
+		#detailDataTable th:nth-child(1),
+		#detailDataTable td:nth-child(1) {
+		    width: 6% !important;
+		}
+		
+		#detailDataTable th:nth-child(2),
+		#detailDataTable td:nth-child(2) {
+		    width: 25% !important;
+		}
+		
+		#detailDataTable th:nth-child(3),
+		#detailDataTable td:nth-child(3) {
+		    width: 9% !important;
+		}
+		
+		#detailDataTable th:nth-child(4),
+		#detailDataTable td:nth-child(4) {
+		    width: 15% !important;
+		}
+		
+		#detailDataTable th:nth-child(5),
+		#detailDataTable td:nth-child(5) {
+		    width: 9% !important;
+		}
+		
+		#detailDataTable th:nth-child(6),
+		#detailDataTable td:nth-child(6) {
+		    width: 13% !important;
+		}
+		
+		#detailDataTable th:nth-child(7),
+		#detailDataTable td:nth-child(7) {
+		    width: 14% !important;
+		}
+		
+		#detailDataTable th:nth-child(8),
+		#detailDataTable td:nth-child(8) {
+		    width: 9% !important;
+		}
+    
+        
+        
+    </style>
+</head>
+
+<body>
+
+    <div class="container-fluid py-4">
+        <div class="page-header-title d-flex justify-content-between align-items-center">
+            <a href="/commissionerreview/shelterpagereport" class="btn btn-secondary"><i
+                    class="fa-solid fa-arrow-left"></i> Back to Abstract</a>
+            <h4 class="mb-0 mx-auto">Shelter List</h4>
+            <div style="width: 100px;"></div>
+        </div>
+
+        <!-- Filter Section -->
+        <div class="filter-section d-flex justify-content-center align-items-end gap-3 flex-wrap mt-3">
+            <div>
+                <label for="zone" class="form-label fw-bold">Zone:</label>
+                <select id="zone" class="form-select">
+                    <option value="">All Zone</option>
+                </select>
+            </div>
+            <div>
+                <label for="category" class="form-label fw-bold">Category:</label>
+                <select id="category" class="form-select">
+                    <option value="">All Category</option>
+                </select>
+            </div>
+            <div>
+                <button id="btnSearch" class="btn btn-primary px-4"><i class="fa-solid fa-search"></i> Search</button>
+            </div>
+            <div>
+                <button class="btn btn-secondary px-4" onclick="resetFilters()"><i class="fa-solid fa-rotate-left"></i> Reset </button>
+            </div>
+        </div>
+        <div class="report-container">
+            <table id="detailDataTable" class="table table-striped table-bordered display nowrap" style="width:100%;">
+                <thead>
+                    <tr>
+                		<th class="text-center">S.No</th>
+						<th class="text-center">SHELTER</th>
+	                    <th class="text-center">ZONE</th>
+	                    <th class="text-center">CATEGORY</th>
+	                    <th class="text-center">RESIDENTS</th>
+	                    <th class="text-center">OCCUPANCY STATUS</th>
+	                    <th class="text-center">MAINTENANCE STATUS</th>
+						<th class="text-center">Latest Visit</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <!-- Populated via JS -->
+                </tbody>
+            </table>
+        </div>
+     </div>
+
+
+
+        <!-- Scripts -->
+        <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
+
+        <!-- DataTables JS -->
+        <script src="https://cdn.datatables.net/1.13.4/js/jquery.dataTables.min.js"></script>
+        <script src="https://cdn.datatables.net/buttons/2.3.6/js/dataTables.buttons.min.js"></script>
+        <script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.html5.min.js"></script>
+        <script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.print.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
+
+        <!-- SweetAlert -->
+        <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+        
+      <script th:inline="javascript">
+
+    var dataTable = null;
+
+    $(document).ready(function () {
+
+        // Load dropdowns
+        loadDropdowns();
+
+        // Initialize DataTable
+        dataTable = $('#detailDataTable').DataTable({
+
+	    autoWidth: false,
+	    
+	    columnDefs: [
+	        { width: "6%",  targets: 0 },
+	        { width: "25%", targets: 1 },
+	        { width: "9%",  targets: 2 },
+	        { width: "15%", targets: 3 },
+	        { width: "9%",  targets: 4 },
+	        { width: "13%", targets: 5 },
+	        { width: "14%", targets: 6 },
+	        { width: "9%",  targets: 7 }
+	    ],
+	   
+	    
+	    responsive: false,
+	    scrollX: false,
+/* 	    scrollY: "60vh",
+	    scrollCollapse: true, */
+	    searching: true,
+	    paging: true,
+	    info: true,
+	    ordering: true,
+	    dom: '<"d-flex justify-content-between align-items-center mb-3"lfB>rtip',
+	
+	    lengthMenu: [
+	        [10, 25, 50, 100, -1],
+	        [10, 25, 50, 100, "All"]
+	    ],
+	
+	    buttons: [
+	
+	        {
+	            extend: 'excelHtml5',
+	            text: '<i class="fa-solid fa-file-excel"></i> Excel',
+	            className: 'btn btn-success btn-sm me-2',
+	
+	            title: function () {
+	                return 'Commissioner Review - Shelter Inspection';
+	            },
+	
+	            filename: function () {
+	
+	                var zone =
+	                    $('#zone option:selected').text()
+	                        .replace(/[^a-zA-Z0-9]/g, '_');
+	
+	                var category =
+	                    $('#category option:selected').text()
+	                        .replace(/[^a-zA-Z0-9]/g, '_');
+	
+	                return 'Shelter_Inspection_' +
+	                       zone + '_' +
+	                       category;
+	            },
+	
+	            exportOptions: {
+	                stripHtml: true,
+	
+	                format: {
+	                    body: function (data, row, column, node) {
+	                        var div = document.createElement("div");
+	                        div.innerHTML = data;
+	                        return div.textContent ||
+	                               div.innerText ||
+	                               "";
+	                    }
+	                }
+	            }
+	        },
+	
+	        {
+	            extend: 'pdfHtml5',
+	            text: '<i class="fa-solid fa-file-pdf"></i> PDF',
+	            className: 'btn btn-danger btn-sm',
+	            orientation: 'landscape',
+	            pageSize: 'A4',
+	            title: function () {
+	                return 'Commissioner Review - Shelter Inspection';
+	            },
+	
+	            filename: function () {
+	
+	                var zone =
+	                    $('#zone option:selected').text()
+	                        .replace(/[^a-zA-Z0-9]/g, '_');
+	
+	                var category =
+	                    $('#category option:selected').text()
+	                        .replace(/[^a-zA-Z0-9]/g, '_');
+	
+	                return 'Shelter_Inspection_' +
+	                       zone + '_' +
+	                       category;
+	            },
+	
+	            exportOptions: {
+	                stripHtml: true,
+	
+	                format: {
+	                    body: function (data, row, column, node) {
+	                        var div = document.createElement("div");
+	                        div.innerHTML = data;
+	                        return div.textContent ||
+	                               div.innerText ||
+	                               "";
+	                    }
+	                }
+	            },
+	
+	            customize: function (doc) {
+	                doc.styles.title = {
+	                    fontSize: 14,
+	                    bold: true,
+	                    alignment: 'center',
+	                    margin: [0, 0, 0, 10]
+	                };
+	                doc.styles.tableHeader.fontSize = 9;
+	                doc.styles.tableHeader.alignment = 'center';
+	                doc.defaultStyle.fontSize = 8;
+	                doc.content[1].table.dontBreakRows = true;
+	            }
+	        }
+	
+	    ]
+	
+	});
+        
+      
+
+
+        // Search button
+        $('#btnSearch').click(function () {
+            loadDetailedReport();
+        });
+
+
+        // Load data initially
+        loadDetailedReport();
+    });
+
+
+
+    // =========================================================
+    // LOAD DROPDOWNS
+    // =========================================================
+
+    function loadDropdowns() {
+
+        // -------------------------
+        // Zone
+        // -------------------------
+
+        $.ajax({
+            url: "/commissionerreview/api/shelterinspection/zones",
+            type: "GET",
+            success: function (data) {
+                let options =
+                    '<option value="">All Zones</option>';
+
+                data.forEach(function (zone) {
+                    options +=
+                        '<option value="' + zone + '">' +
+                        zone +
+                        '</option>';
+                });
+
+                $("#zone").html(options);
+            },
+
+            error: function () {
+                Swal.fire(
+                    'Error',
+                    'Unable to load zones.',
+                    'error'
+                );
+            }
+
+        });
+
+
+        // -------------------------
+        // Category
+        // -------------------------
+
+        $.ajax({
+            url: "/commissionerreview/api/shelterinspection/categories",
+            type: "GET",
+            success: function (data) {
+                let options =
+                    '<option value="">All Categories</option>';
+
+                data.forEach(function (category) {
+                    let text = formatCategory(category);
+                    options +=
+                        '<option value="' + category + '">' +
+                        text +
+                        '</option>';
+                });
+
+                $("#category").html(options);
+
+            },
+
+            error: function () {
+                Swal.fire(
+                    'Error',
+                    'Unable to load categories.',
+                    'error'
+                );
+            }
+        });
+
+    }
+
+
+
+    // =========================================================
+    // LOAD SHELTER REPORT
+    // =========================================================
+
+    function loadDetailedReport() {
+
+        var zone =
+            $('#zone').val() || '';
+
+        var category =
+            $('#category').val() || '';
+
+
+        Swal.fire({
+            title: 'Loading...',
+            allowOutsideClick: false,
+            didOpen: function () {
+                Swal.showLoading();
+            }
+        });
+
+
+        $.ajax({
+            url: "/commissionerreview/api/shelterinspection/shelterList",
+            type: "GET",
+            data: {
+                zone: zone,
+                category: category
+            },
+
+            success: function (response) {
+                Swal.close();
+                populateTable(response);
+            },
+
+            error: function () {
+                Swal.close();
+
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Error',
+                    text: 'Unable to load shelter list.',
+                    allowOutsideClick: false
+                });
+
+            }
+
+        });
+
+    }
+
+
+
+    // =========================================================
+    // POPULATE TABLE
+    // =========================================================
+
+    function populateTable(data) {
+
+        dataTable.clear();
+
+        if (!data || data.length === 0) {
+            dataTable.draw();
+            return;
+        }
+
+
+        data.forEach(function (item, index) {
+            var shelterName =
+                item.shelterName || '-';
+            var zone =
+                item.zone || '-';
+            var category =
+                formatCategory(item.category);
+            var residents =
+                item.totalResidents || 0;
+            var occupancyStatus =
+                getStatusBadge(residents);
+            var maintenanceStatus =
+                getMaintenanceBadge(
+                    item.maintenanceStatus
+                );
+            var latestVisit =
+                item.latestVisit || '-';
+
+            dataTable.row.add([
+                index + 1,
+                '<strong>' +
+                    shelterName +
+                '</strong>',
+
+                zone,
+                category,
+                residents,
+                occupancyStatus,
+                maintenanceStatus,
+                latestVisit
+            ]);
+        });
+
+
+        dataTable.draw();
+
+    }
+
+
+
+    // =========================================================
+    // CATEGORY FORMAT
+    // =========================================================
+
+    function formatCategory(category) {
+        if (!category) {
+            return "-";
+        }
+
+        return category
+            .replace(/-/g, " ")
+            .replace(/\b\w/g, function (letter) {
+                return letter.toUpperCase();
+            });
+    }
+
+
+
+    // =========================================================
+    // OCCUPANCY STATUS
+    // =========================================================
+    	
+    	function getStatusBadge(residents) {
+
+		    residents = parseInt(residents) || 0;
+		
+		    if (residents >= 100) {
+		        return '<span class="badge bg-success">Good</span>';
+		    } else if (residents >= 25) {
+		        return '<span class="badge bg-warning text-dark">Average</span>';
+		    } else {
+		        return '<span class="badge bg-danger">Poor</span>';
+		    }
+		}
+
+    // =========================================================
+    // MAINTENANCE STATUS
+    // =========================================================
+	
+	function getMaintenanceBadge(status) {
+	
+	    if (!status || status === "Not Available") {
+	
+	        return '<span class="badge bg-secondary">' +
+	               'Not Available' +
+	               '</span>';
+	
+	    }
+	
+	    if (status === "Well maintained") {
+	
+	        return '<span class="badge bg-success">' +
+	               'Well maintained' +
+	               '</span>';
+	
+	    }
+	
+	    if (status === "Averagely maintained") {
+	
+	        return '<span class="badge bg-warning text-dark">' +
+	               'Averagely maintained' +
+	               '</span>';
+	
+	    }
+	
+	    if (status === "Poorly maintained") {
+	
+	        return '<span class="badge bg-danger">' +
+	               'Poorly maintained' +
+	               '</span>';
+	
+	    }
+	
+	    if (status === "Extremely bad condition") {
+	
+	        return '<span class="badge bg-dark">' +
+	               'Extremely bad condition' +
+	               '</span>';
+	
+	    }
+	
+	    return '<span class="badge bg-secondary">' +
+	           'Not Available' +
+	           '</span>';
+	}
+
+
+    // =========================================================
+    // RESET FILTERS
+    // =========================================================
+
+    function resetFilters() {
+        $("#zone").val("");
+        $("#category").val("");
+        loadDetailedReport();
+    }
+
+</script>
+
+  
+</body>
+
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/shelterinspection/visitlist.html b/src/main/resources/templates/modules/shelterinspection/visitlist.html
new file mode 100644
index 0000000..dfcfec9
--- /dev/null
+++ b/src/main/resources/templates/modules/shelterinspection/visitlist.html
@@ -0,0 +1,2147 @@
+
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+
+<head>
+    <title>Shelter Visit List</title>
+
+    <!-- Bootstrap 5 CSS -->
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/css/bootstrap.min.css" rel="stylesheet">
+    <!-- FontAwesome CSS for icons -->
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css" rel="stylesheet">
+    <!-- DataTables CSS -->
+    <link href="https://cdn.datatables.net/1.13.4/css/jquery.dataTables.min.css" rel="stylesheet" />
+    <link href="https://cdn.datatables.net/buttons/2.3.6/css/buttons.dataTables.min.css" rel="stylesheet" />
+
+    <style>
+        body {
+            background-color: #f8f9fa;
+        }
+
+        .page-header-title h4 {
+            margin: 20px 0;
+            text-align: center;
+            font-weight: bold;
+            color: #003366;
+            text-transform: uppercase;
+        }
+
+        .filter-section {
+            background: #fff;
+            padding: 15px;
+            border-radius: 8px;
+            box-shadow: 0 4px 6px rgba(0, 0, 0, 0.05);
+            margin-bottom: 20px;
+        }
+
+
+
+        thead th {
+            background-color: #003366 !important;
+            color: white !important;
+        }
+
+        .report-container {
+            background: #fff;
+            padding: 15px;
+            border-radius: 8px;
+            box-shadow: 0 4px 6px rgba(0, 0, 0, 0.05);
+        }
+        
+        
+		/* =========================================================
+		   DATATABLE ALIGNMENT
+		   ========================================================= */
+		
+		/* Main DataTable */
+		#detailDataTable {
+		    width: 100% !important;
+		    border-collapse: collapse !important;
+		}
+		
+		/* Header + body cells */
+		#detailDataTable th,
+		#detailDataTable td {
+		    box-sizing: border-box !important;
+		    text-align: center !important;
+		    vertical-align: middle !important;
+		    border: 1px solid #dee2e6 !important;
+		}
+		
+		/* Header */
+		#detailDataTable thead th {
+		    background-color: #003366 !important;
+		    color: #ffffff !important;
+		
+		    white-space: normal !important;
+		    word-break: normal !important;
+		
+		    padding: 10px 8px !important;
+		}
+		
+		/* Body */
+		#detailDataTable tbody td {
+		    white-space: normal !important;
+		    word-break: break-word !important;
+		    overflow-wrap: anywhere !important;
+		
+		    padding: 8px !important;
+		}
+		
+		
+		/* =========================================================
+		   IMPORTANT:
+		   DataTables creates a separate scroll header table.
+		   Apply same styling to both header and body tables.
+		   ========================================================= */
+		
+		.dataTables_scrollHead table,
+		.dataTables_scrollBody table {
+		    border-collapse: collapse !important;
+		}
+		
+		.dataTables_scrollHead th,
+		.dataTables_scrollBody td {
+		    box-sizing: border-box !important;
+		    text-align: center !important;
+		    vertical-align: middle !important;
+		}
+		
+		
+		/* Header background */
+		.dataTables_scrollHead th {
+		    background-color: #003366 !important;
+		    color: #ffffff !important;
+		
+		    white-space: normal !important;
+		}
+		
+		
+		/* Body wrapping */
+		.dataTables_scrollBody td {
+		    white-space: normal !important;
+		    word-break: break-word !important;
+		    overflow-wrap: anywhere !important;
+		}
+		
+		
+		/* Remove extra width restrictions */
+		.dataTables_scrollHeadInner {
+		    width: 100% !important;
+		}
+		
+		.dataTables_scrollHeadInner table {
+		    margin: 0 !important;
+		}
+		
+		
+		/* Scroll area */
+		.dataTables_scrollBody {
+		    overflow-x: auto !important;
+		    overflow-y: auto !important;
+		}
+		
+		
+		
+			/*Visit Modal Box*/
+	.modal-content{
+	    height:90vh;
+	}
+	
+	.tab-content{
+	    overflow-y:auto;
+	    flex:1;
+	}
+	
+	.modal-content{
+	    display:flex;
+	    flex-direction:column;
+	}
+	
+	.modal-header,
+	.nav-tabs,
+	.modal-footer{
+	    flex-shrink:0;
+	}
+	
+	
+	/*Tab Color*/
+	.nav-tabs{
+    border-bottom:1px solid #dee2e6;
+	}
+	
+	.nav-tabs .nav-link{
+	    color:#555;
+	    background:#fff;
+	    border:none;
+	    border-radius:0;
+	    transition:.3s;
+	}
+	
+	.nav-tabs .nav-link:hover{
+	    color:#49566f;
+	    background:#f5f5f5;
+	}
+	
+	/* Active Tab */
+	.nav-tabs .nav-link.active{
+	    background:#003366 !important;
+	    color:#fff !important;
+	    border:none;
+	    border-radius:4px 4px 0 0;
+	    font-weight:600;
+	}
+	
+	/* Inactive Tabs */
+	.nav-tabs .nav-link:not(.active){
+	    background:#fff;
+	    color:#666;
+	}
+	
+	/*General Tab*/
+	.general-table td{
+	    padding:12px;
+	    border-bottom:1px solid #f1f1f1;
+	}
+	
+	.general-table .label{
+	    color:#8d8d8d;
+	    width:35%;
+	    font-weight:500;
+	}
+	
+	.general-table .value{
+	    font-weight:600;
+	    color:#263238;
+	}
+	
+	.staff-item{
+	    margin-bottom:8px;
+	    color:#2e7d32;
+	    font-weight:500;
+	}
+	
+	.staff-item i{
+	    color:#4caf50;
+	    margin-right:8px;
+	}
+	
+	#staffCount{
+	    color:#666;
+	    font-size:13px;
+	}
+	
+	.remarks-box{
+	    color:#555;
+	    line-height:1.7;
+	    white-space:pre-wrap;
+	    word-break:break-word;
+	    text-align:left;
+	    padding:5px 0;
+	}
+
+      
+    </style>
+</head>
+
+<body>
+
+    <div class="container-fluid py-4">
+        <div class="page-header-title d-flex justify-content-between align-items-center">
+            <a href="/commissionerreview/shelterpagereport" class="btn btn-secondary"><i
+                    class="fa-solid fa-arrow-left"></i> Back to Abstract</a>
+            <h4 class="mb-0 mx-auto">Shelter Visit List</h4>
+            <div style="width: 100px;"></div>
+        </div>
+	
+	        <!-- Filter Section -->
+	        <!-- Filter Section -->
+			<div class="filter-section d-flex justify-content-center align-items-end gap-3 flex-wrap mt-3">
+			
+			    <!-- From Date -->
+			    <div>
+			        <label for="fromDate" class="form-label fw-bold">From Date:</label>
+			        <input type="date" id="fromDate" class="form-control">
+			    </div>
+			
+			
+			    <!-- To Date -->
+			    <div>
+			        <label for="toDate" class="form-label fw-bold">To Date:</label>
+			        <input type="date" id="toDate" class="form-control">
+			    </div>
+			
+			    <!-- Zone -->
+			    <div>
+			        <label for="zone" class="form-label fw-bold">Zone:</label>
+			        <select id="zone" class="form-select">
+			            <option value="">All Zones</option>
+			        </select>
+			    </div>
+			
+			
+			    <!-- CDO -->
+			    <div>
+			        <label for="cdo" class="form-label fw-bold">CDO:</label>
+			        <select id="cdo" class="form-select">
+			            <option value="">All CDO</option>
+			        </select>
+			    </div>
+			
+			    <!-- Search -->
+			    <div>
+			        <button id="btnSearch" class="btn btn-primary px-4">
+			            <i class="fa-solid fa-search"></i>Search
+			        </button>
+			    </div>
+			
+			
+			    <!-- Reset -->
+			    <div> 
+				    <button type="button" class="btn btn-secondary px-4" onclick="resetFilters()">
+		    			<i class="fa-solid fa-rotate-left"></i>Reset
+					</button>
+			    </div>
+			
+			</div>
+	        
+	    
+	
+	        <div class="report-container">
+	            <table id="detailDataTable" class="table table-striped table-bordered display nowrap" style="width:100%;">
+	                <thead>
+	                   <tr>
+					        <th class="text-center">S.No</th>
+					        <th class="text-center">SHELTER</th>
+					        <th class="text-center">ZONE</th>
+					        <th class="text-center">CDO</th>
+					        <th class="text-center">DATE</th>
+					        <th class="text-center">TIME</th>
+					        <th class="text-center">FOOD</th>
+					        <th class="text-center">MAINTENANCE STATUS</th>
+					        <th class="text-center">STAFF</th>
+					        <th class="text-center">ACTION</th>
+					    </tr>
+	                </thead>
+	                <tbody>
+	                    <!-- Populated via JS -->
+	                </tbody>
+	            </table>
+	        </div>
+
+
+        </div>
+        
+        	<!-- Visit Modal Box -->
+	<div class="modal fade" id="visitDetailsModal" tabindex="-1" data-backdrop="static" data-keyboard="false">
+	    <div class="modal-dialog modal-xl modal-dialog-centered">
+	        <div class="modal-content">
+	
+	            <!-- Header -->
+	
+	            <div class="modal-header bg-dark text-white" style="background-color: #003366 !important;">
+	
+	                <div>
+	                    <div class="d-flex align-items-center">					
+					        <h5 class="mb-0">CDO Daily Inspection</h5>
+					        <span class="mx-2">-</span>
+					        <h5 class="mb-0" id="modalShelterID"></h5>
+					    </div>
+	                    <h4 id="modalShelterName"></h4>
+	                    <h6 id="modalHeaderInfo"></h6>
+	                </div>
+	                
+	                <button type="button" class="btn-close btn-close-white" 
+	                		data-bs-dismiss="modal" aria-label="Close">
+					</button>
+	
+	            </div>
+	
+	
+	            <!-- Tabs -->
+	
+	            <ul class="nav nav-tabs px-3 pt-2">
+	
+	                <li class="nav-item">
+	                    <a class="nav-link active" data-toggle="tab" href="#generalTab">
+	                        General
+	                    </a>
+	                </li>
+	
+	                <li class="nav-item">
+	                    <a class="nav-link" data-toggle="tab"  href="#residentTab">
+	                        Residents
+	                    </a>
+	                </li>
+	
+	                <li class="nav-item">
+	                    <a class="nav-link" data-toggle="tab" href="#foodTab">
+	                        Food
+	                    </a>
+	                </li>
+	
+	                <li class="nav-item">
+	                    <a class="nav-link" data-toggle="tab" href="#billTab">
+	                        Bills
+	                    </a>
+	                </li>
+	
+	                <li class="nav-item">
+	                    <a class="nav-link" data-toggle="tab" href="#documentTab">
+	                        Documents
+	                    </a>
+	                </li>
+	
+	                <li class="nav-item">
+	                    <a class="nav-link" data-toggle="tab" href="#maintenanceTab">
+	                        Maintenance
+	                    </a>
+	                </li>
+	
+	            </ul>
+	
+	
+	            <div class="tab-content">
+	
+	                <!-- GENERAL -->
+	                
+	                <div class="tab-pane fade show active p-3" id="generalTab">
+
+					    <div class="card shadow-sm border-0">
+					
+					        <div class="card-body">
+					
+					            <h5 class="font-weight-bold mb-4">
+					                1. General
+					            </h5>
+					
+					            <table class="table table-borderless">
+					
+					                <tr>
+					                    <td class="label">Geotagged Photo</td>
+					
+					                    <td class="text-right">
+    										<span id="gImage"></span>
+					                    </td>
+					                </tr>
+					                
+					                <tr>
+									    <td class="label">
+									        GPS Coordinates
+									    </td>
+									
+									    <td class="text-right">
+									    <a href="javascript:void(0)"
+										   id="viewGPSLocation"
+										   class="btn btn-primary btn-sm">
+										    <i class="fa-solid fa-location-dot"></i>
+										    View Location
+										</a>
+									    
+									    </td>
+									</tr>
+
+					
+					                <tr>
+					                    <td class="label">
+					                        Zone
+					                    </td>
+					
+					                    <td class="text-right"
+					                        id="gZone">
+					                    </td>
+					                </tr>
+					
+					                <tr>
+					                    <td class="label">
+					                        Division
+					                    </td>
+					
+					                    <td class="text-right"
+					                        id="gDivision">
+					                    </td>
+					                </tr>
+					
+					                <tr>
+					                    <td class="label">
+					                        Shelter Category
+					                    </td>
+					
+					                    <td class="text-right"
+					                        id="gCategory">
+					                    </td>
+					                </tr>
+					
+					                <tr>
+					                    <td class="label">
+					                        Shelter Name
+					                    </td>
+					
+					                    <td class="text-right"
+					                        id="gShelter">
+					                    </td>
+					                </tr>
+					
+					                <tr>
+					                    <td class="label">
+					                        Shelter Type
+					                    </td>
+					
+					                    <td class="text-right"
+					                        id="gType">
+					                    </td>
+					                </tr>
+					
+					            </table>
+					
+					            <hr>
+					
+					            <h6 class="font-weight-bold">
+					                Staff Present
+					                <span id="staffCount"></span>
+					
+					            </h6>
+					
+					            <div id="staffList">
+					
+					            </div>
+					
+					        </div>
+					
+					    </div>
+					
+					</div>
+	
+	   				<!-- Residents Tab -->
+					<div class="tab-pane fade p-4" id="residentTab">
+					
+					    <!-- Summary Cards -->
+					    <div class="row mb-4">
+					
+					        <div class="col-md-4">
+					            <div class="card shadow-sm text-center border-0">
+					                <div class="card-body">
+					                    <h1 class="text-primary font-weight-bold"
+					                        id="rTotalResidents">0</h1>
+					
+					                    <small>Total Residents</small>
+					                </div>
+					            </div>
+					        </div>
+					
+					        <div class="col-md-4">
+					            <div class="card shadow-sm text-center border-0">
+					                <div class="card-body">
+					                    <h1 class="text-success font-weight-bold"
+					                        id="rPresentResidents">0</h1>
+					
+					                    <small>Present Today</small>
+					                </div>
+					            </div>
+					        </div>
+					
+					        <div class="col-md-4">
+					            <div class="card shadow-sm text-center border-0">
+					                <div class="card-body">
+					                    <h1 class="text-warning font-weight-bold"
+					                        id="rNewResidents">0</h1>
+					
+					                    <small>New This Visit</small>
+					                </div>
+					            </div>
+					        </div>
+					
+					    </div>
+					
+					
+					    <!-- Resident Details -->
+					    <div class="card shadow-sm border-0">
+					        <div class="card-body">
+					            
+					            <h4 class="font-weight-bold mb-4">
+					                2. Resident Details
+					            </h4>
+					
+					            <table class="table table-borderless">
+					            
+					            
+						            <tr>
+									    <td>New Residents in Shelter?</td>
+									    <td class="text-right" id="resNewResidents"></td>
+									</tr>
+					
+					                <tr>
+					                    <td>Recorded in Master Register?</td>
+					                    <td class="text-right" id="resQ8"></td>
+					                </tr>
+					
+					                <tr>
+					                    <td>ICP Prepared?</td>
+					                    <td class="text-right" id="resQ9"></td>
+					                </tr>
+					
+					                <tr>
+					                    <td>Deaths This Month</td>
+					                    <td class="text-right" id="resQ10"></td>
+					                </tr>
+					
+					                <tr>
+					                    <td>Residents Left With Information</td>
+					                    <td class="text-right" id="resQ11"></td>
+					                </tr>
+					                
+					                <tr>
+									    <td>Residents Left Without Informing</td>
+									    <td class="text-right" id="resLeftWithoutInforming"></td>
+									</tr>
+					
+					               <!--  <tr>
+					                    <td>FIR Registered</td>
+					                    <td class="text-right" id="resQ14"></td>
+					                </tr> -->
+					
+					                <tr>
+					                    <td>NGO Rehabilitated</td>
+					                    <td class="text-right" id="resQ15"></td>
+					                </tr>
+					
+					                <tr>
+					                    <td>No of Rehabilitated</td>
+					                    <td class="text-right" id="resQ16"></td>
+					                </tr>
+					
+					                <tr>
+					                    <td>No of Reintegrated</td>
+					                    <td class="text-right" id="resQ17"></td>
+					                </tr>
+					
+					               <!--  <tr>
+					                    <td>Post Exit Follow-up</td>
+					                    <td class="text-right" id="resQ18"></td>
+					                </tr> -->
+					
+					                <tr>
+					                    <td>Entitlement Linkages</td>
+					                    <td class="text-right" id="resQ48"></td>
+					                </tr>
+					
+					            </table>
+					
+					        </div>
+					    </div>
+					</div>
+					
+					<!-- Food tabs -->
+					<div class="tab-pane fade p-4" id="foodTab">
+					    <div class="card shadow-sm border-0">
+					        <div class="card-body">
+					
+					            <h4 class="mb-4 font-weight-bold">
+					                3.Food Details
+					            </h4>
+					
+					            <table class="table table-borderless">
+					
+					                <tr>
+					                    <td width="70%">
+					                        Is the food provided as per the menu?
+					                    </td>
+					                    <td class="text-right" id="foodQ19"></td>
+					                </tr>
+					
+					                <tr>
+					                    <td>
+					                        Is food provided on time?
+					                    </td>
+					                    <td class="text-right" id="foodQ20"></td>
+					                </tr>
+					
+					                <tr>
+					                    <td>
+					                        Food Photo
+					                    </td>
+					                    <td class="text-right">
+					                        <a id="foodPhoto"
+					                           target="_blank" class="btn btn-sm btn-outline-primary">
+					                            View Photo
+					                        </a>
+					                    </td>
+					                </tr>
+					
+					            </table>
+					
+					        </div>
+					    </div>
+					</div>
+	   				
+            	     
+
+	                
+	                <!-- Bill tabs -->
+	                
+	                <div class="tab-pane fade p-4" id="billTab">
+					    <div class="card shadow-sm border-0">
+					        <div class="card-body">
+					
+					            <h4 class="font-weight-bold mb-4">
+					                4. Bills
+					            </h4>
+					
+					            <table class="table table-borderless">
+					
+					                <tr>
+					                    <td width="70%">
+					                        Monthly bills submitted?
+					                    </td>
+					
+					                    <td class="text-right" id="billQ49"></td>
+					                </tr>
+					
+					                <tr>
+					                    <td>
+					                        Quarterly bills submitted?
+					                    </td>
+					
+					                    <td class="text-right" id="billQ50"></td>
+					                </tr>
+					
+					                <tr>
+					                    <td>
+					                        Fund receipt status
+					                    </td>
+					
+					                    <td class="text-right" id="billQ51"></td>
+					                </tr>
+					
+					            </table>
+					
+					        </div>
+					    </div>
+					</div>
+	
+	
+					<!-- Document tabs -->
+					<div class="tab-pane fade p-4" id="documentTab">
+					    <div class="card shadow-sm border-0">
+					        <div class="card-body">
+					
+					            <h4 class="font-weight-bold mb-4">
+					                5. Documents
+					            </h4>
+					
+					            <!-- Summary -->
+					
+					            <div class="row text-center mb-4">
+					
+					                <div class="col-md-4">
+					                    <h3 class="text-success mb-0" id="docUpdated">0</h3>
+					                    <small>Updated</small>
+					                </div>
+					
+					                <div class="col-md-4">
+					                    <h3 class="text-warning mb-0" id="docPartial">0</h3>
+					                    <small>Partially Updated</small>
+					                </div>
+					
+					                <div class="col-md-4">
+					                    <h3 class="text-danger mb-0" id="docNotUpdated">0</h3>
+					                    <small>Not Updated</small>
+					                </div>
+					
+					            </div>
+					
+					            <table class="table table-borderless">
+					
+					                <tbody id="documentBody"></tbody>
+					
+					            </table>
+					
+					        </div>
+					    </div>
+					</div>
+					
+	
+					<!-- Maintenance tabs -->
+	
+					<div class="tab-pane fade p-4" id="maintenanceTab">
+					
+					    <div class="card shadow-sm border-0 mb-3">
+					        <div class="card-body">
+					
+					            <h4 class="font-weight-bold mb-4">
+					                6. Shelter Maintenance
+					            </h4>
+					
+					            <table class="table table-borderless">
+					                <tbody id="maintenanceBody">
+					                </tbody>
+					            </table>
+					
+					        </div>
+					    </div>
+					
+					
+					    <div class="card shadow-sm border-0">
+					        <div class="card-body">
+					            <table class="table table-borderless mb-0">
+					
+					                <tr>
+					                    <td width="70%">
+					                        Salary paid to staff?
+					                    </td>
+					
+					                    <td class="text-right" id="maintSalary"></td>
+					                </tr>
+					                
+					                <tr>
+									    <td colspan="2">
+									        <div class="font-weight-bold text-muted mb-2">
+									            Remarks
+									        </div>
+									
+									        <div id="maintRemarks" class="remarks-box"></div>
+									    </td>
+									</tr>
+
+					
+					                <tr>
+					                    <td>
+					                        Complaint Photo
+					                    </td>
+					
+					                  
+					                    
+					                    <td class="text-right">
+					                        <a id="maintPhoto"
+					                           target="_blank"
+					                           class="btn btn-sm btn-outline-primary">
+					                            View Photo
+					                        </a>
+					                    </td>
+					                </tr>
+					
+					            </table>
+					
+					        </div>
+					    </div>
+					</div>
+					
+					
+	
+	            </div>
+	        </div>
+	    </div>
+	</div>
+	
+	<!-- Photo Modal -->
+	<div class="modal fade" id="geoPhotoModal"  tabindex="-1" data-backdrop="static" data-keyboard="false">
+
+	    <div class="modal-dialog modal-lg modal-dialog-centered">
+	        <div class="modal-content">
+	
+	            <div class="modal-header bg-primary text-white" style="background-color: #003366 !important;">
+	                <h5 class="modal-title">Photo</h5>
+	                
+             	    <button type="button" class="btn-close btn-close-white" 
+	                		data-bs-dismiss="modal" aria-label="Close">
+					</button>
+	
+	            </div>
+	
+	            <div class="modal-body text-center">
+	                <img id="geoModalPhoto" src=""  class="img-fluid" style="max-height:500px;">
+	            </div>
+	
+	        </div>
+	    </div>
+	</div>
+	
+	<!-- Map -->
+	<div class="modal fade" id="mapModal" tabindex="-1" data-backdrop="static" data-keyboard="false">
+	    <div class="modal-dialog modal-lg">
+	        <div class="modal-content">
+	
+	            <div class="modal-header bg-primary text-white" style="background-color: #003366 !important;">
+	
+	                <h5 class="modal-title">
+	                    Shelter Location
+	                </h5>
+	                
+              	    <button type="button" class="btn-close btn-close-white" 
+	                		data-bs-dismiss="modal" aria-label="Close">
+					</button>
+	
+	            </div>
+	
+	            <div class="modal-body p-0">
+	
+	                <iframe id="mapFrame" width="100%" height="100%" style="border:0;">
+	                </iframe>
+	
+	            </div>
+	
+	        </div>
+	    </div>
+	</div>
+
+        <!-- Scripts -->
+        <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
+        <!-- <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script> -->
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.bundle.min.js"></script>
+
+        <!-- DataTables JS -->
+        <script src="https://cdn.datatables.net/1.13.4/js/jquery.dataTables.min.js"></script>
+        <script src="https://cdn.datatables.net/buttons/2.3.6/js/dataTables.buttons.min.js"></script>
+        <script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.html5.min.js"></script>
+        <script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.print.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
+
+        <!-- SweetAlert -->
+        <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+        
+        <script th:inline="none">
+
+	var dataTable = null;
+	
+	
+	$(document).ready(function () {
+
+    loadDropdowns();
+    loadQuestionMaster();
+    
+    // Initialize DataTable
+    	
+   	dataTable = $('#detailDataTable').DataTable({
+
+        autoWidth: false,
+        columnDefs: [
+	
+	            { width: "65px",  targets: 0 },  // S.No
+	            { width: "270px", targets: 1 },  // Shelter
+	            { width: "90px",  targets: 2 },  // Zone
+	            { width: "160px", targets: 3 },  // CDO
+	            { width: "110px", targets: 4 },  // Date
+	            { width: "110px", targets: 5 },  // Time
+	            { width: "110px", targets: 6 },  // Food
+	            { width: "210px", targets: 7 },  // Maintenance
+	            { width: "110px", targets: 8 },  // Staff
+	            { width: "90px",  targets: 9 }   // Action
+	
+	        ],
+
+	        responsive: false,
+	        scrollX: false,
+	        searching: true,
+	        paging: true,
+	        info: true,
+	        ordering: true,
+	        
+	        dom: '<"d-flex justify-content-between align-items-center mb-3"lfB>rtip',
+	
+	        lengthMenu: [
+	            [10, 25, 50, 100, -1],
+	            [10, 25, 50, 100, "All"]
+	        ],
+
+	        buttons: [
+	
+	            // Excel
+	            {
+	                extend: 'excelHtml5',
+	                text: '<i class="fa-solid fa-file-excel"></i> Excel',
+	                className: 'btn btn-success btn-sm me-2',
+	                title: function () {
+	                    return 'Shelter Visit List';
+	                },
+	
+	                filename: function () {
+	                    var zone =
+	                        $('#zone option:selected')
+	                            .text()
+	                            .replace(/[^a-zA-Z0-9]/g, '_');
+	                    var cdo =
+	                        $('#cdo option:selected')
+	                            .text()
+	                            .replace(/[^a-zA-Z0-9]/g, '_');
+	                    return 'Shelter_Visit_List_' +
+	                           zone + '_' +
+	                           cdo;
+	                },
+	
+	                exportOptions: {
+	                    stripHtml: true,
+	                    columns: [0,1,2,3,4,5,6,7,8],
+	                    format: {
+	                        body: function ( data, row, column, node) {
+	                            var div =
+	                                document.createElement("div");
+	                            div.innerHTML = data;
+	
+	                            return div.textContent ||
+	                                   div.innerText ||
+	                                   "";
+	
+	                        }
+	                    }
+	                }
+	            },
+	
+	
+	            // PDF
+	            {
+	                extend: 'pdfHtml5',
+	                text: '<i class="fa-solid fa-file-pdf"></i> PDF',
+	                className: 'btn btn-danger btn-sm',
+	                orientation: 'landscape',
+	                pageSize: 'A4',
+	                title: function () {
+	                    return 'Shelter Visit List';
+	                },
+	
+	                filename: function () {
+	                    var zone =
+	                        $('#zone option:selected')
+	                            .text()
+	                            .replace(/[^a-zA-Z0-9]/g, '_');
+	                    var cdo =
+	                        $('#cdo option:selected')
+	                            .text()
+	                            .replace(/[^a-zA-Z0-9]/g, '_');
+	                    return 'Shelter_Visit_List_' +
+	                           zone + '_' +
+	                           cdo;
+	                },
+	
+	                exportOptions: {
+	                    stripHtml: true,
+	                    columns: [0,1,2,3,4,5,6,7,8],
+	                    format: {
+	                        body: function (data, row, column, node ) {
+	                            var div =
+	                                document.createElement("div");
+	
+	                            div.innerHTML = data;
+	
+	                            return div.textContent ||
+	                                   div.innerText ||
+	                                   "";
+	                        }
+	                    }
+	                },
+	
+	                customize: function (doc) {
+	                    doc.styles.title = {
+	                        fontSize: 14,
+	                        bold: true,
+	                        alignment: 'center',
+	                        margin: [0, 0, 0, 10]
+	                    };
+	
+	                    doc.styles.tableHeader.fontSize = 9;
+	                    doc.styles.tableHeader.alignment = 'center';
+	                    doc.defaultStyle.fontSize = 8;
+	                    doc.content[1].table.dontBreakRows = true;
+	                }
+	            }
+	        ]
+	    });
+
+
+	    // Search
+	    $('#btnSearch').click(function () {
+	        loadVisitList();
+	    });
+	
+	    // Initial load
+	    // loadVisitList();
+	    
+        // =========================================================
+		// INITIALIZE DEFAULT DATES
+		// =========================================================
+		
+		initializeVisitDates();
+	
+	});
+	
+	 // =========================================================
+	 // INITIALIZE COMPLAINT DATE FILTER
+	 // From Date = Minimum DB cdate
+	 // To Date   = Today
+	 // =========================================================
+	
+	 function initializeVisitDates() {
+	
+	     $.ajax({
+	         url: "/commissionerreview/api/shelterinspection/shelterVisitMinDate",
+	         type: "GET",
+	         success: function (minDate) {
+	
+	             console.log("Minimum Visit cdate:", minDate);
+	
+	             // =================================================
+	             // TODAY
+	             // =================================================
+	
+	             var today = new Date();
+	
+	             var yyyy = today.getFullYear();
+	
+	             var mm = String(today.getMonth() + 1).padStart(2, '0');
+	             var dd = String(today.getDate()).padStart(2, '0');
+	             var todayString = yyyy + '-' + mm + '-' + dd;
+	
+	
+	             // =================================================
+	             // FROM DATE
+	             // =================================================
+	
+	             if (minDate) {
+	                 $('#fromDate').val(minDate);
+	             } else {
+	                 // If no DB date found,
+	                 // use today
+	
+	                 $('#fromDate').val(todayString);
+	             }
+	
+	
+	             // =================================================
+	             // TO DATE = TODAY
+	             // =================================================
+	
+	             $('#toDate').val(todayString);
+	
+	
+	             // =================================================
+	             // LOAD REPORT
+	             // =================================================
+	
+	             loadVisitList();
+	
+	         },
+	
+	         error: function (xhr) {
+	
+	             console.error("Unable to get minimum visit date:",);
+	
+	             // =================================================
+	             // FALLBACK TO TODAY
+	             // =================================================
+	
+	             var today = new Date();
+	
+	             var yyyy = today.getFullYear();
+	
+	             var mm = String(today.getMonth() + 1).padStart(2, '0');
+	             var dd = String(today.getDate()).padStart(2, '0');
+	             var todayString = yyyy + '-' + mm + '-' + dd;
+	
+	
+	             $('#fromDate').val(todayString);
+	             $('#toDate').val(todayString);
+	
+	             loadVisitList();
+	
+	         }
+	
+	     });
+	
+	 }
+
+	
+	// =========================================================
+	// LOAD VISIT LIST
+	// =========================================================
+	
+	function loadVisitList() {
+	
+	    var fromDate = $('#fromDate').val() || '';
+	    var toDate = $('#toDate').val() || '';
+	    var zone = $('#zone').val() || '';
+	    var cdo = $('#cdo').val() || '';
+	
+	    Swal.fire({
+	        title: 'Loading...',
+	        allowOutsideClick: false,
+	        didOpen: function () {
+	            Swal.showLoading();
+	        }
+	    });
+	
+	
+	    $.ajax({
+	        url: "/commissionerreview/api/shelterinspection/visitList",
+	        type: "GET",
+	        data: {
+	            fromDate: fromDate,
+	            toDate: toDate,
+	            zone: zone,
+	            cdo: cdo
+	        },
+	
+	        success: function (response) {
+	            Swal.close();
+	            populateTable(response);
+	        },
+	
+	        error: function () {
+	            Swal.close();
+	            Swal.fire({
+	                icon: 'error',
+	                title: 'Error',
+	                text: 'Unable to load Visit List.',
+	                allowOutsideClick: false
+	            });
+	
+	        }
+	
+	    });
+	
+	}
+
+
+	// =========================================================
+	// POPULATE TABLE
+	// =========================================================
+	
+	function populateTable(data) {
+	    dataTable.clear();
+	
+	    if (!data || data.length === 0) {
+	        dataTable.draw();
+	        return;
+	    }
+	
+	    data.forEach(function (item, index) {
+	
+	        var food =
+	            getFoodBadge(item.food);
+	
+	        var maintenance =
+	            getMaintenanceBadge(
+	                item.maintenanceStatus
+	            );
+	
+	        var staff =
+	            getStaffBadge(item.staff);
+	
+	        var action = '-';
+	
+	        if (item.surveyId) {
+	
+	            action =
+	                '<button ' +
+	                'class="btn btn-sm btn-primary" ' +
+	                'onclick="viewVisit(\'' +
+	                item.surveyId +
+	                '\')">' +
+	
+	                '<i class="fa fa-eye"></i>' +
+	
+	                '</button>';
+	        }
+	
+	
+	        dataTable.row.add([
+	
+	            index + 1,
+	
+	            '<strong>' +
+	                (item.shelterName || '-') +
+	            '</strong>',
+	
+	            item.zone || '-',
+	            item.userName || '-',
+	            item.date || '-',
+	            item.time || '-',
+	            food,
+	            maintenance,
+	            staff,
+	            action
+	
+	        ]);
+	
+	    });
+	
+	
+	    dataTable.draw();
+	
+	
+	    setTimeout(function () {
+	        dataTable.columns.adjust().draw(false);
+	    }, 100);
+	}
+	
+	$(window).on('resize', function () {
+	    if (dataTable) {
+	        dataTable.columns.adjust();
+	    }
+	
+	});
+
+
+	// =========================================================
+	// FOOD BADGE
+	// =========================================================
+	
+	function getFoodBadge(food) {
+	
+	    if (!food ||
+	        food === "-" ||
+	        food === "null") {
+	        return '<span class="badge bg-secondary">' +
+	               'Not Available' +
+	               '</span>';
+	    }
+	
+	
+	    if (food === "OK") {
+	        return '<span class="badge bg-success">' +
+	               'OK' +
+	               '</span>';
+	    }
+	
+	    return '<span class="badge bg-danger">' +
+	           'Issue' +
+	           '</span>';
+	}
+
+
+	// =========================================================
+	// STAFF BADGE
+	// =========================================================
+	
+	function getStaffBadge(staff) {
+	
+	    if (!staff ||
+	        staff === "-" ||
+	        staff === "null") {
+	        return '<span class="badge bg-secondary">' +
+	               'Not Available' +
+	               '</span>';
+	    }
+	
+	    var count =
+	        parseInt(
+	            String(staff).split("/")[0]
+	        ) || 0;
+	
+	    if (count >= 4) {
+	        return '<span class="badge bg-success">' +
+	               staff +
+	               '</span>';
+	    }
+	
+	    else if (count >= 3) {
+	        return '<span class="badge bg-warning text-dark">' +
+	               staff +
+	               '</span>';
+	    }
+	
+	    else {
+	        return '<span class="badge bg-danger">' +
+	               staff +
+	               '</span>';
+	    }
+	}
+
+
+	// =========================================================
+	// MAINTENANCE BADGE
+	// =========================================================
+	
+	function getMaintenanceBadge(status) {
+	    if (!status ||
+	        status === "Not Available") {
+	        return '<span class="badge bg-secondary">' +
+	               'Not Available' +
+	               '</span>';
+	    }
+	
+	    if (status === "Well maintained") {
+	        return '<span class="badge bg-success">' +
+	               'Well maintained' +
+	               '</span>';
+	    }
+	
+	    if (status === "Averagely maintained") {
+	        return '<span class="badge bg-warning text-dark">' +
+	               'Averagely maintained' +
+	               '</span>';
+	    }
+	
+	    if (status === "Poorly maintained") {
+	        return '<span class="badge bg-danger">' +
+	               'Poorly maintained' +
+	               '</span>';
+	    }
+	
+	    if (status === "Extremely bad condition") {
+	        return '<span class="badge bg-dark">' +
+	               'Extremely bad condition' +
+	               '</span>';
+	    }
+	
+	    return '<span class="badge bg-secondary">' +
+	           'Not Available' +
+	           '</span>';
+	}
+	
+	
+	// =========================================================
+	// Visit Details
+	// =========================================================
+	
+	
+	// Visit Details
+	
+	function viewVisit(surveyId){
+	    $.ajax({
+	        url:"/commissionerreview/api/shelterinspection/visitDetails",
+	        type:"GET",
+	        data:{
+	            surveyId:surveyId
+	        },
+	        
+	        success:function(res){
+	        	
+	        	
+	        	
+	        	$("#modalShelterID").text(res.surveyId);
+	            $("#modalShelterName").text(res.shelterName);
+
+	            $("#modalHeaderInfo").text(
+	                res.userName
+	                +" • "+
+	                res.date
+	                +" • "+
+	                res.time
+	            );
+
+	            $("#gZone").text(res.zone);
+	            $("#gDivision").text(res.division);
+	            $("#gCategory").text(formatCategory(res.category));
+	            $("#gShelter").text(res.shelterName);
+	            $("#gType").text(res.shelterType);
+	            $("#gUqid").text(res.uqid);
+	            
+	            if(res.latitude && res.longitude){
+
+	                $("#viewGPSLocation")
+	                    .show()
+	                    .data("lat", res.latitude)
+	                    .data("lng", res.longitude);
+
+	            }else{
+
+	                $("#viewGPSLocation")
+	                    .replaceWith("<span>NA</span>");
+
+	            }
+	            
+	            
+	            if(res.image){
+
+	                $("#gImage").html(
+	                    '<a href="javascript:void(0);" ' +
+	                    'class="photoBtn text-primary font-weight-bold" ' +
+	                    'data-photo="' + res.image + '">' +
+	                    'View Photo</a>'
+	                );
+
+	            }else{
+
+	                $("#gImage").text("No Photo");
+
+	            }
+	            
+
+	            
+	            buildStaffList(res.answers["3"]);
+
+	            //resident
+	           if (questionMaster.length === 0) {
+				    loadQuestionMaster(function () {
+				        buildResidentTab(res.answers);
+				    });
+				} else {
+				    buildResidentTab(res.answers);
+				}
+	           
+	           //food
+	           buildFoodTab(res.answers);
+	           
+	           //bill
+	           buildBillsTab(res.answers);
+	           
+	           //document
+	           buildDocumentTab(res.answers);
+	           
+	           // Maintence
+	           buildMaintenanceTab(res.answers);
+	           
+	           
+	           
+	           $("#visitDetailsModal").modal({
+	        	    backdrop: 'static',
+	        	    keyboard: false
+	        	});
+	           
+	            $("#visitDetailsModal").modal("show");
+	        }
+	
+	    });
+	
+	}
+	
+	//Photo
+	$(document).on("click", ".photoBtn", function(){
+
+	    let photoUrl = $(this).data("photo");
+
+	    if(!photoUrl){
+	        return;
+	    }
+	    
+
+	    $("#geoPhotoModal").modal({
+	        backdrop: "static",
+	        keyboard: false
+	    });
+
+	    $("#geoModalPhoto").attr("src", photoUrl);
+
+	    $("#geoPhotoModal").modal("show");
+
+	});
+	
+	//GPS Location
+	$(document).on("click", "#viewGPSLocation", function(){
+
+	    let lat = $(this).data("lat");
+	    let lng = $(this).data("lng");
+
+	    let mapUrl =
+	        "https://maps.google.com/maps?q="
+	        + lat + "," + lng +
+	        "&z=18&output=embed";
+	    
+	    $("#mapModal").modal({
+	        backdrop: "static",
+	        keyboard: false
+	    });
+
+	    $("#mapFrame").attr("src", mapUrl);
+
+	    $("#mapModal").modal("show");
+
+	});
+	
+	// formatCategory
+	function formatCategory(category){
+
+	    if(!category)
+	        return "-";
+
+	    return category
+	            .replace(/-/g," ")
+	            .replace(/\b\w/g,function(c){
+
+	                return c.toUpperCase();
+
+	            });
+
+	}
+
+
+	// =========================================================
+	// RESET FILTERS
+	// =========================================================
+	
+	function resetFilters() {
+	    $('#fromDate').val('');
+	    $('#toDate').val('');
+	    $('#zone').val('');
+	    $('#cdo').val('');
+	   // loadVisitList();
+	   
+	    initializeVisitDates();
+	}
+
+	
+	// =========================================================
+	// DROPDOWNS
+	// =========================================================
+	
+	function loadDropdowns() {
+	
+	    // Zone
+	    $.ajax({
+	        url: "/commissionerreview/api/shelterinspection/zones",
+	        type: "GET",
+	        success: function (data) {
+	            var options =
+	                '<option value="">All Zones</option>';
+	
+	            data.forEach(function (zone) {
+	                options +=
+	                    '<option value="' +
+	                    zone +
+	                    '">' +
+	                    zone +
+	                    '</option>';
+	            });
+	
+	            $('#zone').html(options);
+	        }
+	    });
+	
+	
+	    // CDO
+	    $.ajax({
+	        url: "/commissionerreview/api/shelterinspection/cdos",
+	        type: "GET",
+	        success: function (data) {
+	            var options =
+	                '<option value="">All CDO</option>';
+	
+	            data.forEach(function (cdo) {
+	                options +=
+	                    '<option value="' +
+	                    cdo.uid +
+	                    '">' +
+	                    cdo.user_name +
+	                    '</option>';
+	            });
+	
+	            $('#cdo').html(options);
+	        }
+	    });
+	
+	}
+	
+	
+	//Visit tab
+	const tabs = [
+		    "#generalTab",
+		    "#residentTab",
+		    "#foodTab",
+		    "#billTab",
+		    "#documentTab",
+		    "#maintenanceTab"
+		];
+	
+	function activateTab(index){
+	
+	    $('.nav-tabs a[href="' + tabs[index] + '"]').tab("show");
+	
+	    // Scroll current tab to top
+	    $(tabs[index]).scrollTop(0);
+	
+	    // or scroll modal body to top
+	    $(".tab-content").scrollTop(0);
+	
+	}
+	
+	
+	// =========================================================
+	// Question Master
+	// =========================================================
+	
+	let questionMaster = [];
+	
+	function loadQuestionMaster(callback) {
+	
+	    $.ajax({
+	        url: "/commissionerreview/api/shelterinspection/questions",
+	        type: "GET",
+	        data: {
+	            cid: 1
+	        },
+	        dataType: "json",
+	
+	        success: function(res) {
+	
+	            console.log("Question Master Response:", res);
+	
+	            if (res && res.data && Array.isArray(res.data)) {
+	
+	                questionMaster = res.data;
+	
+	                console.log(
+	                    "Question Master Loaded:",
+	                    questionMaster.length
+	                );
+	
+	                if (callback) {
+	                    callback();
+	                }
+	
+	            } else {
+	
+	                console.error(
+	                    "Question master data not found.",
+	                    res
+	                );
+	
+	                questionMaster = [];
+	
+	            }
+	        },
+	
+	        error: function(xhr, status, error) {
+	
+	            console.error(
+	                "Question Master API Error:",
+	                xhr.status,
+	                error
+	            );
+	
+	            console.error(
+	                "Response:",
+	                xhr.responseText
+	            );
+	
+	            questionMaster = [];
+	
+	            let message = "Unable to load question master.";
+	
+	            if (xhr.status === 502) {
+	
+	                message =
+	                    "Question Master service is currently unavailable.";
+	
+	            } else if (xhr.status === 404) {
+	
+	                message =
+	                    "Question Master API was not found.";
+	
+	            } else if (xhr.status === 500) {
+	
+	                message =
+	                    "Internal server error while loading question master.";
+	
+	            } else if (xhr.status === 400) {
+	
+	                message =
+	                    "Invalid request for Question Master.";
+	
+	            }
+	
+	            console.error("Question Master Error:", message);
+	
+	        }
+	    });
+	}
+	
+	
+	// =========================================================
+	// Question Master with Answer  master for Visit Details
+	// =========================================================
+	
+	
+	function buildStaffList(answer){
+	    let html="";
+
+	    if(!answer){
+	        $("#staffList").html("");
+	        return;
+	    }
+
+	    const selected = answer.split(",");
+
+	    const staffQuestion =
+	        questionMaster.find(q => q.qid == 3);
+
+	    if(!staffQuestion){
+	        return;
+	    }
+
+	    $("#staffCount").text(
+	        "("+
+	        selected.length+
+	        "/"+
+	        staffQuestion.options.length+
+	        ")"
+	    );
+
+	    selected.forEach(function(id){
+
+	        let option =
+	            staffQuestion.options.find(
+	                o => o.option_id == id
+	            );
+
+	        if(option){
+	            html += `
+	            <div class="staff-item">
+	                <i class="fa fa-check-circle text-success"></i>
+	                ${option.english_name}
+	            </div>
+	            `;
+	        }
+	    });
+	    
+	    $("#staffList").html(html);
+	}
+	
+	/*Resident Details*/
+	function buildResidentTab(ans){
+
+	    $("#rTotalResidents").text(ans["4"] || 0);
+	    $("#rPresentResidents").text(ans["5"] || 0);
+	    $("#rNewResidents").text(ans["7"] || 0);
+	
+	    $("#resQ4").text(ans["4"] || "-");
+	    $("#resQ5").text(ans["5"] || "-");
+	    
+	    if (ans["6"] == "1") {
+
+	        let count = ans["7"] || "0";
+
+	        $("#resNewResidents").html(
+	            '<span class="text-success font-weight-bold">' +
+	            'Yes – ' + count + ' admitted' +
+	            '</span>'
+	        );
+
+	    } else {
+
+	        $("#resNewResidents").html(
+	            '<span class="text-danger font-weight-bold">No</span>'
+	        );
+
+	    }
+	
+	    $("#resQ8").html(getDropdownText(8,ans["8"]));
+	    $("#resQ9").html(getDropdownText(9,ans["9"]));
+	    
+	
+	    $("#resQ10").text(ans["10"] || "0");
+	    $("#resQ11").text(ans["11"] || "0");
+	    
+	    if (ans["12"] == "9") {
+
+	        let count = ans["13"] || "0";
+
+	        $("#resLeftWithoutInforming").html(
+	            '<span class="text-danger font-weight-bold">' +
+	            'Yes – ' + count + ' Residents' +
+	            '</span>'
+	        );
+
+	    } else {
+
+	        $("#resLeftWithoutInforming").html(
+	            '<span class="text-success font-weight-bold">No</span>'
+	        );
+
+	    }
+	
+	    $("#resQ14").html(getDropdownText(14,ans["14"]));
+	    $("#resQ15").html(getYesNo(ans["15"],14,15));
+	
+	    $("#resQ16").text(ans["16"] || "0");
+	    $("#resQ17").text(ans["17"] || "0");
+	
+	    $("#resQ18").html(getDropdownText(18,ans["18"]));
+	    $("#resQ48").text(ans["48"] || "0");
+	
+	}
+	
+	function getYesNo(value, yesId, noId) {
+
+	    if (value === null || value === undefined || value === "") {
+	        return "-";
+	    }
+
+	    value = String(value).trim();
+	    yesId = String(yesId).trim();
+	    noId = String(noId).trim();
+
+	    if (value === yesId) {
+	        return '<span class="badge bg-success">Yes</span>';
+	    }
+
+	    if (value === noId) {
+	        return '<span class="badge bg-danger">No</span>';
+	    }
+
+	    return "-";
+	}
+	
+	
+	function getDropdownText(qid, answer) {
+
+	    if (!answer) return "-";
+
+	    let question = null;
+
+	    // Search top-level questions
+	    for (let i = 0; i < questionMaster.length; i++) {
+
+	        if (questionMaster[i].qid == qid) {
+	            question = questionMaster[i];
+	            break;
+	        }
+
+	        // Search child questions
+	        if (questionMaster[i].options) {
+
+	            for (let j = 0; j < questionMaster[i].options.length; j++) {
+
+	                let option = questionMaster[i].options[j];
+
+	                if (option.child_questions) {
+
+	                    let child = option.child_questions.find(c => c.qid == qid);
+
+	                    if (child) {
+	                        question = child;
+	                        break;
+	                    }
+	                }
+	            }
+	        }
+
+	        if (question) break;
+	    }
+
+	    if (!question || !question.options) {
+	        return answer;
+	    }
+
+	    let selected = question.options.find(
+	        o => o.option_id == parseInt(answer)
+	    );
+
+	    return selected ? selected.english_name : answer;
+	}
+	
+	
+	//food tab
+	function buildFoodTab(ans){
+
+	    // Q19
+	    $("#foodQ19").html(
+	        getYesNo(ans["19"],19,20)
+	    );
+	
+	    // Q20
+	    $("#foodQ20").html(
+	        getYesNo(ans["20"],21,22)
+	    );
+	
+	    // Q21 Food Photo
+	    
+	 // Q21 Food Photo
+	    if(ans["21"]){
+	        $("#foodPhoto").replaceWith(
+	            '<a href="javascript:void(0);" ' +
+	            'id="foodPhoto" ' +
+	            'class="photoBtn btn btn-sm btn-outline-primary" ' +
+	            'data-photo="' + ans["21"] + '">' +
+	            'View Photo</a>'
+	        );
+	    }else{
+	        $("#foodPhoto")
+	            .removeClass("photoBtn")
+	            .removeAttr("data-photo")
+	            .text("No Photo")
+	            .addClass("disabled");
+	    }
+	    
+	}
+	
+	//bill tab
+	function buildBillsTab(ans){
+
+	    // Monthly Bill Submitted
+	    $("#billQ49").html(
+	        getYesNo(ans["49"],48,49)
+	    );
+	
+	    // Quarterly Bill Submitted
+	    $("#billQ50").html(
+	        getYesNo(ans["50"],50,51)
+	    );
+	
+	    // Fund Receipt Status
+	    $("#billQ51").html(
+	        getDropdownText(51, ans["51"])
+	    );
+	
+	}
+	
+	// Document Tab
+	
+	function buildDocumentTab(ans){
+
+	    let updated = 0;
+	    let partial = 0;
+	    let notUpdated = 0;
+	
+	    let html = "";
+	
+	    for(let qid=22; qid<=43; qid++){
+	
+	        const question = questionMaster.find(q=>q.qid==qid);
+	
+	        if(!question) continue;
+	
+	        const answer = ans[qid];
+	
+	        let status = getDropdownText(qid, answer);
+	
+	        let badge = "";
+	
+	        if(answer=="1"){
+	
+	            updated++;
+	
+	            badge =
+	                '<span class="text-success font-weight-bold">' +
+	                '<i class="fa fa-check-circle"></i> Updated' +
+	                '</span>';
+	
+	        }
+	        else if(answer=="2"){
+	
+	            partial++;
+	
+	            badge =
+	                '<span class="text-warning font-weight-bold">' +
+	                '<i class="fa fa-exclamation-circle"></i> Partially Updated' +
+	                '</span>';
+	
+	        }
+	        else if(answer=="3"){
+	
+	            notUpdated++;
+	
+	            badge =
+	                '<span class="text-danger font-weight-bold">' +
+	                '<i class="fa fa-times-circle"></i> Not Updated' +
+	                '</span>';
+	
+	        }
+	        else{
+	
+	            badge="-";
+	
+	        }
+	
+	        html += `
+	
+	        <tr>
+	
+	            <td width="5%">
+	                ${qid-21}
+	            </td>
+	
+	            <td width="65%">
+	                ${question.q_english}
+	            </td>
+	
+	            <td class="text-right">
+	                ${badge}
+	            </td>
+	
+	        </tr>
+	
+	        `;
+	
+	    }
+	
+	    $("#docUpdated").text(updated);
+	    $("#docPartial").text(partial);
+	    $("#docNotUpdated").text(notUpdated);
+	
+	    $("#documentBody").html(html);
+	
+	}
+	
+	// maintance tab
+	
+	function buildMaintenanceTab(ans){
+
+	    let html="";
+	
+	    for(let qid=53; qid<=58; qid++){
+	
+	        const question=questionMaster.find(q=>q.qid==qid);
+	
+	        if(!question) continue;
+	
+	        const value=getDropdownText(qid,ans[qid]);
+	
+	        let color="text-success";
+	
+	        if(ans[qid]=="2")
+	            color="text-warning";
+	
+	        if(ans[qid]=="3")
+	            color="text-danger";
+	
+	        if(ans[qid]=="4")
+	            color="text-danger";
+	
+	        html+=`
+	
+	        <tr>
+	
+	            <td width="70%">
+	                ${question.q_english}
+	            </td>
+	
+	            <td class="text-right font-weight-bold ${color}">
+	                ${value}
+	            </td>
+	
+	        </tr>
+	
+	        `;
+	
+	    }
+	
+	    $("#maintenanceBody").html(html);
+	
+	    $("#maintSalary").html(getDropdownText(45,ans["45"]));
+	
+	    $("#maintRemarks").text(ans["46"] || "-");
+	    
+	    
+	    // Q47 Main Photo
+	 // Q47 Complaint Photo
+	    if(ans["47"]){
+
+	        $("#maintPhoto").replaceWith(
+	            '<a href="javascript:void(0);" ' +
+	            'id="maintPhoto" ' +
+	            'class="photoBtn btn btn-sm btn-outline-primary" ' +
+	            'data-photo="' + ans["47"] + '">' +
+	            'View Photo</a>'
+	        );
+
+	    }else{
+
+	        $("#maintPhoto")
+	            .removeClass("photoBtn")
+	            .removeAttr("data-photo")
+	            .text("No Photo")
+	            .addClass("disabled");
+
+	    }
+	    
+	
+	
+	}
+
+</script>
+
+     
+</body>
+
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/shelterpagereport.html b/src/main/resources/templates/modules/shelterpagereport.html
new file mode 100644
index 0000000..19078f1
--- /dev/null
+++ b/src/main/resources/templates/modules/shelterpagereport.html
@@ -0,0 +1,389 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+
+<head>
+    <title>Shelter Report</title>
+
+    <!-- Bootstrap 5 CSS -->
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/css/bootstrap.min.css" rel="stylesheet">
+    <!-- FontAwesome CSS for icons -->
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css" rel="stylesheet">
+    <!-- DataTables CSS -->
+    <link href="https://cdn.datatables.net/1.13.4/css/jquery.dataTables.min.css" rel="stylesheet" />
+    <link href="https://cdn.datatables.net/buttons/2.3.6/css/buttons.dataTables.min.css" rel="stylesheet" />
+    <link href="https://cdn.datatables.net/fixedcolumns/4.2.2/css/fixedColumns.dataTables.min.css" rel="stylesheet" />
+
+
+    <style>
+        body {
+            background-color: #f8f9fa;
+        }
+
+        .report-container {
+            overflow-x: auto;
+        }
+
+        /*#hallBookingTable {
+            width: 100% !important;
+        }*/
+
+        .page-header-title h4 {
+            margin: 20px 0;
+            text-align: center;
+            font-weight: bold;
+            color: #003366;
+            text-transform: uppercase;
+        }
+
+        .filter-section {
+            background: #fff;
+            padding: 15px;
+            border-radius: 8px;
+            box-shadow: 0 4px 6px rgba(0, 0, 0, 0.05);
+            margin-bottom: 20px;
+        }
+
+        .report-container {
+            background: #fff;
+            padding: 15px;
+            border-radius: 8px;
+            box-shadow: 0 4px 6px rgba(0, 0, 0, 0.05);
+        }
+
+        .dashboard-card {
+            height: 180px;
+        }
+
+        .dashboard-card .card-body {
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+        }
+
+        .category-card .card-body {
+            display: block;
+            overflow-y: auto;
+            height: 120px;
+        }
+
+        thead th {
+            background-color: #003366 !important;
+            color: white !important;
+        }
+
+        /* Horizontal Scroll */
+        .dataTables_scrollBody {
+            overflow-x: auto !important;
+            overflow-y: auto !important;
+        }
+
+        /* Fixed Column Background */
+        table.dataTable tbody tr td.dtfc-fixed-left {
+            background-color: #fff !important;
+        }
+
+        table.dataTable.table-striped tbody tr:nth-of-type(odd) td.dtfc-fixed-left {
+            background-color: #f9f9f9 !important;
+        }
+
+        .dataTables_scrollBody {
+            overflow-x: auto !important;
+            overflow-y: auto !important;
+        }
+
+        .select2-container {
+            width: 100% !important;
+        }
+
+        .select2-results__options {
+            max-height: 400px !important;
+            /* increase height */
+        }
+
+        .select2-dropdown {
+            z-index: 9999 !important;
+        }
+
+
+        .hall-name-wrap {
+            min-width: 220px !important;
+            max-width: 220px !important;
+            white-space: normal !important;
+            word-break: break-word;
+        }
+
+        .dashboard-card {
+            border: none;
+            border-radius: 12px;
+            min-height: 110px;
+            margin-bottom: 15px;
+        }
+
+        /* Total Buildings */
+        .building-card {
+            background: #E3F2FD;
+            color: #1565C0;
+        }
+
+        /* Total Bookings */
+        .booking-card {
+            background: #E8F5E9;
+            color: #2E7D32;
+        }
+
+        /* Total Revenue */
+        .revenue-card {
+            background: #FFF8E1;
+            color: #EF6C00;
+        }
+
+        .distribute-card {
+            background: #FFF8E1;
+            color: #c9431a;
+        }
+
+        .manage-card {
+            background: #FFF8E1;
+            color: #ac129a;
+        }
+
+        .dashboard-card h6 {
+            font-size: 18px;
+            font-weight: 600;
+            margin-bottom: 15px;
+        }
+
+        .dashboard-card h3 {
+            font-size: 42px;
+            font-weight: 700;
+            margin: 0;
+        }
+
+        #bookingTable th:nth-child(8),
+        #bookingTable td:nth-child(8) {
+            width: 50px !important;
+            min-width: 50px !important;
+            max-width: 50px !important;
+            text-align: center;
+        }
+
+        #bookingTable th:nth-child(9),
+        #bookingTable td:nth-child(9) {
+            width: 50px !important;
+            min-width: 50px !important;
+            max-width: 50px !important;
+            text-align: center;
+        }
+
+
+
+        /* #hallBookingTable th:not(:nth-child(4)),
+        #hallBookingTable td:not(:nth-child(4)) {
+            white-space: nowrap;
+        }*/
+
+        /* Wrap selected columns */
+
+        .wrap {
+            white-space: normal !important;
+            word-break: break-word;
+            line-height: 1.2;
+            text-align: center;
+            vertical-align: middle;
+            min-width: 110px;
+        }
+
+        #performanceTable thead tr:first-child th {
+            text-align: center;
+            vertical-align: middle;
+            background: #003366;
+            color: #fff;
+        }
+
+        #performanceTable thead tr:nth-child(2) th {
+            text-align: center;
+            vertical-align: middle;
+            background: #0d6efd;
+            color: #fff;
+        }
+
+        #performanceTable td {
+            text-align: center;
+        }
+
+        #performanceTable td:nth-child(2) {
+            text-align: left;
+        }
+
+
+
+
+        /* Scrollbar */
+        .dataTables_scrollBody::-webkit-scrollbar {
+            height: 8px;
+        }
+
+        .dataTables_scrollBody::-webkit-scrollbar-thumb {
+            background: #c1c1c1;
+            border-radius: 4px;
+        }
+
+        .dataTables_scrollBody::-webkit-scrollbar-track {
+            background: #f1f1f1;
+        }
+    </style>
+</head>
+
+<body>
+
+    <div class="container-fluid py-4">
+        <div class="page-header-title">
+            <h4>Shelter Report</h4>
+        </div>
+        <div class="row mb-4">
+
+            <!-- Card 1 -->
+            <div class="col-md-4">
+                <div class="card dashboard-card building-card shadow" style="cursor:pointer;"
+                    onclick="window.open('/commissionerreview/shelterlist', '_blank');">
+                    <!-- onclick="window.open('https://gccservices.in/commissionerreview/feedbackreport', '_blank');" -->
+                    <div class="card-body text-center">
+                        <h6>Shelter Report</h6>
+                    </div>
+                </div>
+            </div>
+
+            <!-- Card 2 -->
+            <div class="col-md-4">
+                <div class="card dashboard-card booking-card shadow" style="cursor:pointer;"
+                    onclick="window.open('/commissionerreview/visitlist', '_blank');">
+                    <!-- onclick="window.open('https://gccservices.in/commissionerreview/feedbackreport', '_blank');" -->
+                    <div class="card-body text-center">
+                        <h6>Shelter Visit Report</h6>
+                    </div>
+                </div>
+            </div>
+
+            <!-- Card 3 -->
+            <div class="col-md-4">
+                <div class="card dashboard-card revenue-card shadow" style="cursor:pointer;"
+                    onclick="window.open('/commissionerreview/complaintlist', '_blank');">
+                    <!-- onclick="window.open('https://gccservices.in/commissionerreview/feedbackreport', '_blank');" -->
+                    <div class="card-body text-center">
+                        <h6>Shelter Complaint Report</h6>
+                    </div>
+                </div>
+            </div>
+
+
+            <div class="col-md-4">
+                <div class="card dashboard-card manage-card shadow" style="cursor:pointer;"
+                    onclick="window.open('/commissionerreview/meetinglist', '_blank');">
+<!--                     onclick="window.open('https://gccservices.in/commissionerreview/fooddistributionreport', '_blank');" -->                    
+					<div class="card-body text-center">
+                        <h6>Shelter Meeting Report</h6>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-md-4">
+                <div class="card dashboard-card distribute-card shadow" style="cursor:pointer;"
+                   	onclick="window.open('/commissionerreview/resucelist', '_blank');"
+                    >
+                    <!--                     onclick="window.open('https://gccservices.in/commissionerreview/fooddistributiondetailedreport', '_blank');"  -->
+                    <div class="card-body text-center">
+                        <h6>Shelter Resuce Report</h6>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+
+        <!--<div class="col-md-3">
+                <div class="card bg-primary text-white shadow dashboard-card">
+                    <div class="card-body text-center">
+                        <h6>Total Buildings</h6>
+                        <h3 id="totalBuildings">0</h3>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-md-3">
+                <div class="card bg-success text-white shadow dashboard-card">
+                    <div class="card-body text-center">
+                        <h6>Total Bookings</h6>
+                        <h3 id="totalBookings">0</h3>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-md-3">
+                <div class="card bg-warning text-dark shadow dashboard-card">
+                    <div class="card-body text-center">
+                        <h6>Total Revenue</h6>
+                        <h3 id="totalRevenue">0</h3>
+                    </div>
+                </div>
+            </div>-->
+
+
+
+
+
+
+
+
+        <!-- Media Modal -->
+        <div class="modal fade" id="mediaModal" tabindex="-1" aria-labelledby="mediaModalLabel" aria-hidden="true"
+            style="z-index: 1060;">
+            <div class="modal-dialog modal-lg modal-dialog-centered">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title" id="mediaModalLabel">Media Viewer</h5>
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                    </div>
+                    <div class="modal-body text-center" id="mediaModalBody">
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div id="pageLoader"
+            style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
+            <div style="position: relative; top: 50%; transform: translateY(-50%);">
+                <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
+                    <span class="sr-only"></span>
+                </div>
+                <!-- Add the 'Please wait' text below the spinner -->
+                <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
+            </div>
+        </div>
+
+        <!-- Scripts -->
+
+        <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js"></script>
+        <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
+        <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
+
+
+        <!-- DataTables JS -->
+        <script src="https://cdn.datatables.net/1.13.4/js/jquery.dataTables.min.js"></script>
+        <script src="https://cdn.datatables.net/buttons/2.3.6/js/dataTables.buttons.min.js"></script>
+        <script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.html5.min.js"></script>
+        <script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.print.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/xlsx@0.18.5/dist/xlsx.full.min.js"></script>
+        <script src="https://cdn.datatables.net/fixedcolumns/4.2.2/js/dataTables.fixedColumns.min.js"></script>
+
+        <!-- SweetAlert -->
+        <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+
+        <script th:inline="none">
+
+        </script>
+
+</body>
+
+</html>
\ No newline at end of file