From b948f92d8b8af2a85e869d41bb7d3cc044b961ed Mon Sep 17 00:00:00 2001
From: AJITHKUMAR12 <48044092+AJITHKUMAR12@users.noreply.github.com>
Date: Tue, 26 May 2026 10:25:27 +0530
Subject: [PATCH] Implemented report module for three ie complaint and tenment
 complaint

---
 .../configuration/DataSourceConfig.java       |   20 +-
 .../controller/IeComplaintsApiController.java |   49 +
 .../controller/MainController.java            |    6 +-
 .../controller/TenementController.java        |   98 +
 .../service/IeComplaintsService.java          |  318 +++
 .../service/TenementService.java              |  489 ++++
 .../templates/modules/vendorreport.html       | 2209 +++++++++++++++++
 7 files changed, 3182 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/com/gcc/commissionerreview/controller/TenementController.java
 create mode 100644 src/main/java/com/gcc/commissionerreview/service/TenementService.java
 create mode 100644 src/main/resources/templates/modules/vendorreport.html

diff --git a/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java b/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java
index 30c39fc..38cde82 100644
--- a/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java
+++ b/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java
@@ -17,11 +17,11 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableTransactionManagement
 public class DataSourceConfig {
 
-//	private static String host = "localhost:3306";
-//	private static String dbpassword = "root";
+	// private static String host = "localhost:3306";
+	// private static String dbpassword = "root";
 
-	 private static String host = "gcc-facial-db-instance-1.cf48eqcciziq.ap-south-1.rds.amazonaws.com:3306";
-	 private static String dbpassword = "gcc-facial-password";
+	private static String host = "gcc-facial-db-instance-1.cf48eqcciziq.ap-south-1.rds.amazonaws.com:3306";
+	private static String dbpassword = "gcc-facial-password";
 
 	public static class MyDataSourceConfig {
 		@Primary
@@ -179,7 +179,15 @@ public class DataSourceConfig {
 		return dataSource;
 	}
 
-
-
+	////////// Tenements//////////////////////
+	@Bean(name = "mysqlTenementDataSource")
+	public DataSource mysqlTenementDataSource() {
+		DriverManagerDataSource dataSource = new DriverManagerDataSource();
+		dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+		dataSource.setUrl("jdbc:mysql://" + host + "/gcc_tenements");
+		dataSource.setUsername("root");
+		dataSource.setPassword(dbpassword);
+		return dataSource;
+	}
 
 }
diff --git a/src/main/java/com/gcc/commissionerreview/controller/IeComplaintsApiController.java b/src/main/java/com/gcc/commissionerreview/controller/IeComplaintsApiController.java
index a7c53fc..08cd1ff 100644
--- a/src/main/java/com/gcc/commissionerreview/controller/IeComplaintsApiController.java
+++ b/src/main/java/com/gcc/commissionerreview/controller/IeComplaintsApiController.java
@@ -84,4 +84,53 @@ public class IeComplaintsApiController {
 				iecomplaintservice.getComplaintDetails(zone, ward, complaintId, fromDate, toDate));
 	}
 
+	@GetMapping("/vendorzoneActivity")
+	public ResponseEntity<Map<String, Object>> vendorzoneActivity(
+
+			@RequestParam(required = false) String fromDate,
+			@RequestParam(required = false) String toDate,
+			@RequestParam(required = false) Integer complaintId) {
+
+		return ResponseEntity.ok(
+				iecomplaintservice.getvendorZoneActivity(fromDate, toDate, complaintId));
+
+	}
+
+	@GetMapping("/vendorwardActivity")
+	public ResponseEntity<Map<String, Object>> vendorwardActivity(
+
+			@RequestParam String zone,
+			@RequestParam(required = false) String complaintId,
+			@RequestParam(required = false) String fromDate,
+			@RequestParam(required = false) String toDate) {
+
+		return ResponseEntity.ok(
+				iecomplaintservice.getvendorWardActivity(zone, complaintId, fromDate, toDate));
+
+	}
+
+	@GetMapping("/vendorcomplaintDetails")
+	public ResponseEntity<Map<String, Object>> vendorcomplaintDetails(
+
+			@RequestParam String zone,
+			@RequestParam String ward,
+			@RequestParam(required = false) String complaintId,
+			@RequestParam(required = false) String fromDate,
+			@RequestParam(required = false) String toDate) {
+
+		return ResponseEntity.ok(
+				iecomplaintservice.getvendorComplaintDetails(zone, ward, complaintId, fromDate, toDate));
+	}
+
+	@GetMapping("/vendorcomplaintDashboard")
+	public ResponseEntity<Map<String, Object>> vendorcomplaintDashboard(
+
+			@RequestParam(required = false) String fromDate,
+			@RequestParam(required = false) String toDate) {
+
+		return ResponseEntity.ok(
+				iecomplaintservice.getvendorComplaintDashboard(fromDate, toDate));
+
+	}
+
 }
diff --git a/src/main/java/com/gcc/commissionerreview/controller/MainController.java b/src/main/java/com/gcc/commissionerreview/controller/MainController.java
index 4d8a4a9..0561e6b 100644
--- a/src/main/java/com/gcc/commissionerreview/controller/MainController.java
+++ b/src/main/java/com/gcc/commissionerreview/controller/MainController.java
@@ -311,7 +311,6 @@ public class MainController {
         return "modules/fooddistribution/fooddistributiondetailedreport";
     }
 
-
     @GetMapping("/posterreport")
     public String posterdetailedreport(Model model) {
         return "modules/poster/posterReport";
@@ -322,4 +321,9 @@ public class MainController {
         return "modules/poster/bannerReport";
     }
 
+    @GetMapping("/vendorreport")
+    public String vendorreport(Model model) {
+        return "modules/vendorreport";
+    }
+
 }
diff --git a/src/main/java/com/gcc/commissionerreview/controller/TenementController.java b/src/main/java/com/gcc/commissionerreview/controller/TenementController.java
new file mode 100644
index 0000000..2221723
--- /dev/null
+++ b/src/main/java/com/gcc/commissionerreview/controller/TenementController.java
@@ -0,0 +1,98 @@
+package com.gcc.commissionerreview.controller;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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 com.gcc.commissionerreview.service.IeComplaintsService;
+import com.gcc.commissionerreview.service.TenementService;
+
+@RestController
+@RequestMapping("/commissionerreview/api/tenement")
+
+public class TenementController {
+
+	@Autowired
+	private TenementService tenementService;
+
+	@GetMapping("/tenementDashboard")
+	public ResponseEntity<Map<String, Object>> getTenementDashboard(
+
+			@RequestParam String fromDate,
+			@RequestParam String toDate) {
+
+		return ResponseEntity.ok(
+				tenementService.getTenementDashboard(
+						fromDate,
+						toDate));
+	}
+
+	@GetMapping("/zoneActivity")
+	public ResponseEntity<Map<String, Object>> zoneActivity(
+
+			@RequestParam(required = false) String fromDate,
+			@RequestParam(required = false) String toDate) {
+
+		return ResponseEntity.ok(
+				tenementService.getZoneActivity(fromDate, toDate));
+	}
+
+	@GetMapping("/wardActivity")
+	public ResponseEntity<Map<String, Object>> wardActivity(
+
+			@RequestParam String zone,
+			@RequestParam(required = false) String fromDate,
+			@RequestParam(required = false) String toDate) {
+
+		return ResponseEntity.ok(
+				tenementService.getWardActivity(
+						zone,
+						fromDate,
+						toDate));
+	}
+	// ================= CONTROLLER =================
+
+	@GetMapping("/getSchemeWiseReport")
+	public ResponseEntity<Map<String, Object>> getSchemeWiseReport(
+
+			@RequestParam String ward,
+
+			@RequestParam(required = false) String fromDate,
+
+			@RequestParam(required = false) String toDate) {
+
+		return ResponseEntity.ok(
+
+				tenementService.getSchemeWiseReport(
+						ward,
+						fromDate,
+						toDate));
+	}
+
+	@GetMapping("/getComplaintDetails")
+	public Map<String, Object> getComplaintDetails(
+
+			@RequestParam String ward,
+			@RequestParam String schemeid,
+
+			@RequestParam(required = false) String fromDate,
+			@RequestParam(required = false) String toDate) {
+
+		return tenementService.getComplaintDetails(
+				ward,
+				schemeid,
+
+				fromDate,
+				toDate);
+	}
+
+}
diff --git a/src/main/java/com/gcc/commissionerreview/service/IeComplaintsService.java b/src/main/java/com/gcc/commissionerreview/service/IeComplaintsService.java
index 2dd78b4..c89cd67 100644
--- a/src/main/java/com/gcc/commissionerreview/service/IeComplaintsService.java
+++ b/src/main/java/com/gcc/commissionerreview/service/IeComplaintsService.java
@@ -529,6 +529,324 @@ public class IeComplaintsService {
 		return response;
 	}
 
+	// vendor api
+	public Map<String, Object> getvendorZoneActivity(String fromDate, String toDate, Integer complaintId) {
+
+		Map<String, Object> response = new HashMap<>();
+
+		try {
+
+			StringBuilder sql = new StringBuilder();
+			List<Object> params = new ArrayList<>();
+
+			sql.append("SELECT ");
+			sql.append("zm.zone_name, ");
+
+			sql.append("COUNT(DISTINCT CASE ");
+
+			if (fromDate != null && !fromDate.isEmpty()
+					&& toDate != null && !toDate.isEmpty()) {
+
+				sql.append("WHEN DATE(cd.cdate) BETWEEN ? AND ? ");
+				params.add(fromDate);
+				params.add(toDate);
+
+			} else {
+
+				sql.append("WHEN 1=1 ");
+			}
+
+			sql.append("THEN cd.ref_id END) AS total_count, ");
+
+			sql.append("COUNT(DISTINCT CASE ");
+			sql.append("WHEN comp.ref_id IS NOT NULL ");
+
+			if (fromDate != null && !fromDate.isEmpty() && toDate != null && !toDate.isEmpty()) {
+				sql.append("AND DATE(comp.cdate) BETWEEN ? AND ? ");
+				params.add(fromDate);
+				params.add(toDate);
+			}
+
+			sql.append("THEN comp.ref_id END) AS completed_count, ");
+
+			sql.append("COUNT(DISTINCT CASE ");
+			sql.append("WHEN comp.ref_id IS NULL ");
+
+			if (fromDate != null && !fromDate.isEmpty() && toDate != null && !toDate.isEmpty()) {
+				sql.append("AND DATE(cd.cdate) BETWEEN ? AND ? ");
+				params.add(fromDate);
+				params.add(toDate);
+			}
+
+			sql.append("THEN cd.ref_id END) AS pending_count ");
+
+			sql.append("FROM gcc_street_vendor.zone_master zm ");
+
+			sql.append("LEFT JOIN complaint_details cd ");
+			sql.append("ON zm.zone_name = cd.zone ");
+			sql.append("AND cd.is_delete = 0 ");
+			sql.append("AND cd.is_active = 1 ");
+			sql.append("AND cd.complaint_id IN (4,6,12)");
+
+			if (complaintId != null) {
+				sql.append("AND cd.complaint_id = ? ");
+				params.add(complaintId);
+			}
+
+			sql.append("LEFT JOIN completion comp ");
+			sql.append("ON comp.ref_id = cd.ref_id ");
+
+			sql.append("GROUP BY zm.zone_name ");
+			sql.append("ORDER BY zm.zone_name ");
+
+			List<Map<String, Object>> result = jdbcTemplate.queryForList(sql.toString(), params.toArray());
+
+			response.put("status", "Success");
+			response.put("data", result);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			response.put("status", "Error");
+		}
+
+		return response;
+	}
+
+	public Map<String, Object> getvendorWardActivity(String zone, String complaintId,
+			String fromDate, String toDate) {
+
+		Map<String, Object> response = new HashMap<>();
+
+		try {
+
+			StringBuilder sql = new StringBuilder();
+			List<Object> params = new ArrayList<>();
+
+			sql.append("SELECT ");
+			sql.append("wm.ward_name AS ward, ");
+
+			sql.append("COUNT(DISTINCT cd.ref_id) AS total_count, ");
+
+			sql.append("COUNT(DISTINCT CASE ");
+			sql.append("WHEN comp.ref_id IS NOT NULL ");
+
+			if (fromDate != null && !fromDate.isEmpty() && toDate != null && !toDate.isEmpty()) {
+				sql.append("AND DATE(comp.cdate) BETWEEN ? AND ? ");
+				params.add(fromDate);
+				params.add(toDate);
+			}
+
+			sql.append("THEN comp.ref_id END) AS completed_count, ");
+
+			sql.append("COUNT(DISTINCT CASE ");
+			sql.append("WHEN comp.ref_id IS NULL ");
+
+			if (fromDate != null && !fromDate.isEmpty() && toDate != null && !toDate.isEmpty()) {
+				sql.append("AND DATE(cd.cdate) BETWEEN ? AND ? ");
+				params.add(fromDate);
+				params.add(toDate);
+			}
+
+			sql.append("THEN cd.ref_id END) AS pending_count ");
+
+			sql.append("FROM gcc_street_vendor.ward_master wm ");
+
+			// Complaint details join
+			sql.append("LEFT JOIN complaint_details cd ");
+			sql.append("ON wm.ward_name = cd.ward ");
+			// this below condition is here because if to get all the ward if no data for
+			// that ward also
+			sql.append("AND cd.zone = ? ");
+			params.add(zone);
+
+			sql.append("AND cd.is_delete = 0 ");
+			sql.append("AND cd.is_active = 1 ");
+			sql.append("AND cd.complaint_id IN (4,6,12)");
+
+			if (complaintId != null && !complaintId.isEmpty()) {
+				sql.append("AND cd.complaint_id = ? ");
+				params.add(complaintId);
+			}
+
+			// Completion join
+			sql.append("LEFT JOIN completion comp ");
+			sql.append("ON comp.ref_id = cd.ref_id ");
+
+			// Zone filter
+			sql.append("WHERE wm.zone_id = ? ");
+			params.add(zone);
+
+			sql.append("GROUP BY wm.ward_name ");
+			sql.append("ORDER BY wm.ward_name ");
+
+			List<Map<String, Object>> result = jdbcTemplate.queryForList(sql.toString(), params.toArray());
+
+			response.put("status", "Success");
+			response.put("data", result);
+
+		} catch (Exception e) {
+
+			e.printStackTrace();
+			response.put("status", "Error");
+			response.put("message", "Something went wrong");
+		}
+
+		return response;
+	}
+
+	public Map<String, Object> getvendorComplaintDetails(String zone, String ward,
+			String complaintId, String fromDate, String toDate) {
+
+		Map<String, Object> response = new HashMap<>();
+
+		try {
+
+			StringBuilder sql = new StringBuilder();
+			List<Object> params = new ArrayList<>();
+
+			String beforeImageColumn = "cd.image_path";
+			String afterImageColumn = "comp.image_path";
+
+			sql.append("SELECT ");
+			sql.append("cm.complaint_name, ");
+			sql.append("cd.street_name, ");
+			sql.append("cd.status, ");
+			sql.append("cd.street_name AS complaint_street_name, ");
+			sql.append("comp.street_name AS completion_street_name, ");
+
+			sql.append("DATE_FORMAT(cd.cdate,'%d-%m-%Y') AS complaint_created_date, ");
+			sql.append("IFNULL(DATE_FORMAT(comp.cdate,'%d-%m-%Y'),'Pending') AS completion_date, ");
+			/*
+			 * sql.append("DATE(cd.cdate) AS complaint_created_date, ");
+			 * sql.append("IFNULL(DATE(comp.cdate),'Pending') AS completion_date, ");
+			 */
+
+			sql.append(
+					"CONCAT('" + fileBaseUrl + "/gccofficialapp/files'," + beforeImageColumn + ") AS before_image, ");
+			sql.append("CONCAT('" + fileBaseUrl + "/gccofficialapp/files'," + afterImageColumn + ") AS after_image ");
+
+			sql.append("FROM complaint_details cd ");
+
+			sql.append("LEFT JOIN complaint_master cm ");
+			sql.append("ON cm.complaint_id = cd.complaint_id ");
+
+			sql.append("LEFT JOIN completion comp ");
+			sql.append("ON comp.ref_id = cd.ref_id ");
+
+			sql.append("WHERE cd.zone = ? ");
+			params.add(zone);
+
+			sql.append("AND cd.ward = ? ");
+			params.add(ward);
+
+			sql.append("AND cd.is_delete = 0 ");
+			sql.append("AND cd.is_active = 1 ");
+			sql.append("AND cd.complaint_id IN (4,6,12)");
+
+			if (complaintId != null && !complaintId.isEmpty()) {
+				sql.append("AND cd.complaint_id = ? ");
+				params.add(complaintId);
+			}
+
+			if (fromDate != null && !fromDate.isEmpty() && toDate != null && !toDate.isEmpty()) {
+
+				sql.append("AND ( ");
+
+				sql.append("(comp.ref_id IS NOT NULL AND DATE(comp.cdate) BETWEEN ? AND ?) ");
+
+				sql.append("OR ");
+
+				sql.append("(comp.ref_id IS NULL AND DATE(cd.cdate) BETWEEN ? AND ?) ");
+
+				sql.append(") ");
+
+				params.add(fromDate);
+				params.add(toDate);
+				params.add(fromDate);
+				params.add(toDate);
+			}
+
+			List<Map<String, Object>> result = jdbcTemplate.queryForList(sql.toString(), params.toArray());
+
+			response.put("status", "Success");
+			response.put("data", result);
+
+		} catch (Exception e) {
+
+			e.printStackTrace();
+			response.put("status", "Error");
+		}
+
+		return response;
+	}
+
+	public Map<String, Object> getvendorComplaintDashboard(String fromDate, String toDate) {
+
+		Map<String, Object> response = new HashMap<>();
+
+		try {
+
+			StringBuilder sql = new StringBuilder();
+
+			List<Object> params = new ArrayList<>();
+
+			sql.append("SELECT ");
+			sql.append("cm.complaint_id, cm.complaint_name, ");
+
+			sql.append("COUNT(DISTINCT cd.ref_id) AS total_count, ");
+
+			sql.append("COUNT(DISTINCT CASE ");
+			sql.append("WHEN comp.ref_id IS NOT NULL ");
+			sql.append("AND cd.complaint_id IN (4,6,12) ");
+
+			if (fromDate != null && !fromDate.isEmpty() && toDate != null && !toDate.isEmpty()) {
+				sql.append("AND DATE(comp.cdate) BETWEEN ? AND ? ");
+				params.add(fromDate);
+				params.add(toDate);
+			}
+
+			sql.append("THEN comp.ref_id END) AS completed_count, ");
+
+			sql.append("COUNT(DISTINCT CASE ");
+			sql.append("WHEN comp.ref_id IS NULL ");
+			sql.append("AND cd.complaint_id IN (4,6,12) ");
+
+			if (fromDate != null && !fromDate.isEmpty() && toDate != null && !toDate.isEmpty()) {
+				sql.append("AND DATE(cd.cdate)  BETWEEN ? AND ? ");
+				params.add(fromDate);
+				params.add(toDate);
+			}
+
+			sql.append("THEN cd.ref_id END) AS pending_count ");
+
+			sql.append("FROM complaint_master cm ");
+
+			sql.append("LEFT JOIN complaint_details cd ");
+			sql.append("ON cm.complaint_id = cd.complaint_id ");
+
+			sql.append("LEFT JOIN completion comp ");
+			sql.append("ON comp.ref_id = cd.ref_id ");
+			sql.append("WHERE cm.complaint_id IN (4,6,12) ");
+
+			sql.append("GROUP BY cm.complaint_id, cm.complaint_name ");
+			sql.append("ORDER BY cm.complaint_id");
+
+			List<Map<String, Object>> result = jdbcTemplate.queryForList(sql.toString(), params.toArray());
+
+			response.put("status", "Success");
+			response.put("data", result);
+
+		} catch (Exception e) {
+
+			e.printStackTrace();
+
+			response.put("status", "Error");
+			response.put("message", "Something went wrong");
+		}
+
+		return response;
+	}
+
 	/*
 	 * public Map<String, Object> getComplaintDetails(String zone, String ward,
 	 * String complaintId, String fromDate, String toDate) {
diff --git a/src/main/java/com/gcc/commissionerreview/service/TenementService.java b/src/main/java/com/gcc/commissionerreview/service/TenementService.java
new file mode 100644
index 0000000..feddca9
--- /dev/null
+++ b/src/main/java/com/gcc/commissionerreview/service/TenementService.java
@@ -0,0 +1,489 @@
+package com.gcc.commissionerreview.service;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+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 javax.sql.DataSource;
+
+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.env.Environment;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+
+public class TenementService {
+
+	@Autowired
+	@Value("${fileBaseUrl}")
+
+	private String fileBaseUrl;
+	@Autowired
+	private JdbcTemplate jdbcTemplate;
+	@Autowired
+	private Environment environment;
+
+	@Autowired
+	public void setDataSource(@Qualifier("mysqlTenementDataSource") DataSource tenementDataSource) {
+		this.jdbcTemplate = new JdbcTemplate(tenementDataSource);
+	}
+
+	public TenementService(Environment environment) {
+
+		this.environment = environment;
+
+		this.fileBaseUrl = environment.getProperty("fileBaseUrl");
+	}
+
+	public Map<String, Object> getTenementDashboard(
+
+			String fromDate,
+			String toDate) {
+
+		Map<String, Object> response = new HashMap<>();
+
+		try {
+
+			String sql = "";
+			List<Map<String, Object>> result;
+
+			// ✅ if no date filter
+			if (fromDate == null || fromDate.isBlank()
+					|| toDate == null || toDate.isBlank()) {
+
+				sql = "SELECT " +
+
+						"'Tenement' AS complaint_name, " +
+
+						"COUNT(*) AS total_count, " +
+
+						"COUNT(CASE " +
+						"WHEN final_status IN ('completed','verified') " +
+						"THEN 1 END) AS completed_count, " +
+
+						"COUNT(CASE " +
+						"WHEN final_status = 'created' " +
+						"THEN 1 END) AS pending_count " +
+
+						"FROM issue_list1";
+
+				result = jdbcTemplate.queryForList(sql);
+
+			} else {
+
+				// ✅ with date filter
+				sql = "SELECT " +
+
+						"'Tenement' AS complaint_name, " +
+
+						"COUNT(*) AS total_count, " +
+
+						"COUNT(CASE " +
+						"WHEN final_status IN ('completed','verified') " +
+						"THEN 1 END) AS completed_count, " +
+
+						"COUNT(CASE " +
+						"WHEN final_status = 'created' " +
+						"THEN 1 END) AS pending_count " +
+
+						"FROM issue_list1 " +
+
+						"WHERE DATE(cdate) BETWEEN ? AND ?";
+
+				result = jdbcTemplate.queryForList(
+						sql,
+						fromDate,
+						toDate);
+			}
+
+			response.put("status", "Success");
+			response.put("data", result);
+
+		} catch (Exception e) {
+
+			e.printStackTrace();
+
+			response.put("status", "Error");
+			response.put("message", e.getMessage());
+		}
+
+		return response;
+	}
+
+	public Map<String, Object> getZoneActivity(
+
+			String fromDate,
+			String toDate) {
+
+		Map<String, Object> response = new HashMap<>();
+
+		try {
+
+			String sql = "";
+
+			List<Map<String, Object>> result;
+
+			// ✅ PAGE LOAD -> fetch all data without date filter
+			if (fromDate == null || fromDate.isBlank()
+					|| toDate == null || toDate.isBlank()) {
+
+				sql =
+
+						"SELECT " +
+
+								"am.zone, " +
+
+								// ✅ total complaints
+								"COUNT(DISTINCT il1.id) AS total_complaint_count, " +
+
+								// ✅ completed
+								"COUNT(DISTINCT CASE " +
+								"WHEN il1.final_status IN ('completed','verified') " +
+								"THEN il1.id END) " +
+								"AS total_complaint_closed_count, " +
+
+								// ✅ pending
+								"COUNT(DISTINCT CASE " +
+								"WHEN il1.final_status = 'created' " +
+								"THEN il1.id END) " +
+								"AS total_complaint_pending_count " +
+
+								"FROM asset_master am " +
+
+								"LEFT JOIN asset_list al " +
+								"ON al.am_id = am.id " +
+
+								"LEFT JOIN issue_list1 il1 " +
+								"ON il1.assetlist_id = al.id " +
+
+								"GROUP BY am.zone " +
+
+								"ORDER BY am.zone";
+
+				result = jdbcTemplate.queryForList(sql);
+
+			} else {
+
+				// ✅ SEARCH BUTTON -> apply date filter
+				sql =
+
+						"SELECT " +
+
+								"am.zone, " +
+
+								// ✅ total complaints
+								"COUNT(DISTINCT il1.id) AS total_complaint_count, " +
+
+								// ✅ completed
+								"COUNT(DISTINCT CASE " +
+								"WHEN il1.final_status IN ('completed','verified') " +
+								"THEN il1.id END) " +
+								"AS total_complaint_closed_count, " +
+
+								// ✅ pending
+								"COUNT(DISTINCT CASE " +
+								"WHEN il1.final_status = 'created' " +
+								"THEN il1.id END) " +
+								"AS total_complaint_pending_count " +
+
+								"FROM asset_master am " +
+
+								"LEFT JOIN asset_list al " +
+								"ON al.am_id = am.id " +
+
+								"LEFT JOIN issue_list1 il1 " +
+								"ON il1.assetlist_id = al.id " +
+								"AND DATE(il1.cdate) BETWEEN ? AND ? " +
+
+								"GROUP BY am.zone " +
+
+								"ORDER BY am.zone";
+
+				result = jdbcTemplate.queryForList(
+						sql,
+						fromDate,
+						toDate);
+			}
+
+			response.put("status", "success");
+			response.put("data", result);
+
+		} catch (Exception e) {
+
+			e.printStackTrace();
+
+			response.put("status", "error");
+			response.put("message", e.getMessage());
+		}
+
+		return response;
+	}
+
+	public Map<String, Object> getWardActivity(
+
+			String zone,
+			String fromDate,
+			String toDate) {
+
+		Map<String, Object> response = new HashMap<>();
+
+		try {
+
+			StringBuilder sql = new StringBuilder();
+			List<Object> params = new ArrayList<>();
+
+			sql.append("SELECT ");
+			sql.append("am.ward, ");
+
+			// total
+			sql.append("COUNT(DISTINCT il1.id) ");
+			sql.append("AS total_complaint_count, ");
+
+			// completed
+			sql.append("COUNT(DISTINCT CASE ");
+			sql.append("WHEN il1.final_status IN ('completed','verified') ");
+			sql.append("THEN il1.id END) ");
+			sql.append("AS total_complaint_closed_count, ");
+
+			// pending
+			sql.append("COUNT(DISTINCT CASE ");
+			sql.append("WHEN il1.final_status = 'created' ");
+			sql.append("THEN il1.id END) ");
+			sql.append("AS total_complaint_pending_count ");
+
+			sql.append("FROM asset_master am ");
+
+			sql.append("LEFT JOIN asset_list al ");
+			sql.append("ON al.am_id = am.id ");
+
+			sql.append("LEFT JOIN issue_list1 il1 ");
+			sql.append("ON il1.assetlist_id = al.id ");
+
+			sql.append("WHERE am.zone = ? ");
+			params.add(zone);
+
+			// date filter
+			if (fromDate != null && !fromDate.isBlank()
+					&& toDate != null && !toDate.isBlank()) {
+
+				sql.append("AND DATE(il1.cdate) BETWEEN ? AND ? ");
+				params.add(fromDate);
+				params.add(toDate);
+			}
+
+			sql.append("GROUP BY am.ward ");
+			sql.append("ORDER BY am.ward ");
+
+			List<Map<String, Object>> result = jdbcTemplate.queryForList(
+					sql.toString(),
+					params.toArray());
+
+			response.put("status", "success");
+			response.put("data", result);
+
+		} catch (Exception e) {
+
+			e.printStackTrace();
+
+			response.put("status", "error");
+			response.put("message", e.getMessage());
+		}
+
+		return response;
+	}
+	// ================= SERVICE =================
+
+	public Map<String, Object> getSchemeWiseReport(
+
+			String ward,
+			String fromDate,
+			String toDate) {
+
+		Map<String, Object> response = new HashMap<>();
+
+		try {
+
+			StringBuilder sql = new StringBuilder();
+
+			List<Object> params = new ArrayList<>();
+
+			sql.append("SELECT ");
+
+			sql.append("am.scheme_name, ");
+			sql.append("am.id as schemeid, ");
+
+			// TOTAL
+			sql.append("COUNT(DISTINCT il1.id) ");
+			sql.append("AS total_complaint_count, ");
+
+			// COMPLETED
+			sql.append("COUNT(DISTINCT CASE ");
+			sql.append("WHEN il1.final_status IN ('completed','verified') ");
+			sql.append("THEN il1.id END) ");
+			sql.append("AS total_complaint_closed_count, ");
+
+			// PENDING
+			sql.append("COUNT(DISTINCT CASE ");
+			sql.append("WHEN il1.final_status = 'created' ");
+			sql.append("THEN il1.id END) ");
+			sql.append("AS total_complaint_pending_count ");
+
+			sql.append("FROM asset_master am ");
+
+			sql.append("LEFT JOIN asset_list al ");
+			sql.append("ON al.am_id = am.id ");
+
+			sql.append("LEFT JOIN issue_list1 il1 ");
+			sql.append("ON il1.assetlist_id = al.id ");
+
+			sql.append("WHERE am.ward = ? ");
+			params.add(ward);
+
+			// DATE FILTER
+			if (fromDate != null && !fromDate.isBlank()
+					&& toDate != null && !toDate.isBlank()) {
+
+				sql.append("AND DATE(il1.cdate) BETWEEN ? AND ? ");
+
+				params.add(fromDate);
+				params.add(toDate);
+			}
+
+			sql.append("GROUP BY am.scheme_name, am.id ");
+
+			sql.append("ORDER BY am.scheme_name ");
+
+			List<Map<String, Object>> result = jdbcTemplate.queryForList(
+					sql.toString(),
+					params.toArray());
+
+			response.put("status", "success");
+			response.put("data", result);
+
+		} catch (Exception e) {
+
+			e.printStackTrace();
+
+			response.put("status", "error");
+			response.put("message", e.getMessage());
+		}
+
+		return response;
+	}
+
+	public Map<String, Object> getComplaintDetails(
+
+			String ward,
+			String schemeid,
+			String fromDate,
+			String toDate) {
+
+		Map<String, Object> response = new HashMap<>();
+
+		try {
+
+			StringBuilder sql = new StringBuilder();
+
+			List<Object> params = new ArrayList<>();
+
+			sql.append("SELECT ");
+
+			sql.append("il1.id AS issuelist1_id, ");
+			sql.append("il1.final_status, ");
+			sql.append("DATE_FORMAT(il1.cdate,'%d-%m-%Y') AS created_date,");
+
+			// sql.append(
+			// "IFNULL(DATE_FORMAT(il1.cdate,'%d-%m-%Y %h:%i %p'),'') AS created_date, ");
+
+			sql.append("IFNULL(il1.remarks,'') AS created_remarks, ");
+
+			sql.append(
+					"CASE " +
+							"WHEN il1.before_image IS NOT NULL " +
+							"THEN CONCAT('" + fileBaseUrl + "/gccofficialapp/files', il1.before_image) " +
+							"ELSE '' END AS before_image, ");
+
+			/*
+			 * sql.append(
+			 * "IFNULL(DATE_FORMAT(il2.cdate,'%d-%m-%Y %h:%i %p'),'') AS completed_date, ");
+			 */
+			sql.append("DATE_FORMAT(il2.cdate,'%d-%m-%Y') AS completed_date,");
+
+			sql.append(
+					"IFNULL(il2.remarks,'') AS completed_remarks, ");
+
+			sql.append(
+					"CASE " +
+							"WHEN il2.after_image IS NOT NULL " +
+							"THEN CONCAT('" + fileBaseUrl + "/gccofficialapp/files', il2.after_image) " +
+							"ELSE '' END AS after_image, ");
+
+			sql.append(
+					"IFNULL(DATE_FORMAT(il3.cdate,'%d-%m-%Y %h:%i %p'),'') AS verified_date, ");
+
+			sql.append(
+					"IFNULL(il3.remarks,'') AS verified_remarks, ");
+
+			sql.append(
+					"CASE " +
+							"WHEN il3.Verify_image IS NOT NULL " +
+							"THEN CONCAT('" + fileBaseUrl + "/gccofficialapp/files', il3.Verify_image) " +
+							"ELSE '' END AS verify_image ");
+
+			sql.append("FROM issue_list1 il1 ");
+
+			sql.append("LEFT JOIN asset_list al ");
+			sql.append("ON al.id = il1.assetlist_id ");
+
+			sql.append("LEFT JOIN issue_list2 il2 ");
+			sql.append("ON il2.issuelist1_id = il1.id ");
+
+			sql.append("LEFT JOIN issue_list3 il3 ");
+			sql.append("ON il3.issuelist1_id = il1.id ");
+
+			sql.append("WHERE il1.ward = ? ");
+			params.add(ward);
+
+			sql.append("AND al.am_id = ? ");
+			params.add(schemeid);
+
+			// ✅ only if dates available
+			if (fromDate != null && !fromDate.isBlank()
+					&& toDate != null && !toDate.isBlank()) {
+
+				sql.append("AND DATE(il1.cdate) BETWEEN ? AND ? ");
+
+				params.add(fromDate);
+				params.add(toDate);
+			}
+
+			sql.append("ORDER BY il1.id DESC ");
+
+			List<Map<String, Object>> result = jdbcTemplate.queryForList(
+					sql.toString(),
+					params.toArray());
+
+			response.put("status", "success");
+			response.put("data", result);
+
+		} catch (Exception e) {
+
+			e.printStackTrace();
+
+			response.put("status", "error");
+			response.put("message", e.getMessage());
+		}
+
+		return response;
+	}
+
+}
diff --git a/src/main/resources/templates/modules/vendorreport.html b/src/main/resources/templates/modules/vendorreport.html
new file mode 100644
index 0000000..3ef6ba3
--- /dev/null
+++ b/src/main/resources/templates/modules/vendorreport.html
@@ -0,0 +1,2209 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+
+<head>
+	<title>IE Complaints Report </title>
+
+	<!-- Bootstrap 5 CSS -->
+	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/css/bootstrap.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>
+		#ieSummaryTable {
+			border-collapse: collapse;
+			width: 100%;
+		}
+
+		#ieSummaryTable th,
+		#ieSummaryTable td {
+			border: 1px solid black;
+			text-align: center;
+			vertical-align: middle;
+		}
+
+		#schemeTable thead th,
+		#tenementComplaintTable thead th {
+
+			background-color: #0b3b6e !important;
+			color: white !important;
+
+			text-align: center;
+			vertical-align: middle;
+
+			border: 1px solid #dfe6ee;
+		}
+
+		#schemeTable tbody td,
+		#tenementComplaintTable tbody td {
+
+			text-align: center;
+			vertical-align: middle;
+		}
+
+		.table-header th {
+			background: #0b3c6d;
+			color: white;
+			font-weight: bold;
+		}
+
+		#ieSummaryTable tbody tr {
+			background: #e6e6e6;
+		}
+
+		.summary-card {
+			border-radius: 8px;
+			padding: 15px;
+			border: 1px dashed #999;
+		}
+
+		.complaint-card {
+			border-radius: 8px;
+		}
+
+		.complaint-header {
+			background: #0b3c6d;
+			color: white;
+			text-align: center;
+			font-weight: 600;
+		}
+
+		.summary-box {
+			padding: 12px;
+			border-radius: 6px;
+			border: 1px dashed #ccc;
+		}
+
+		.total {
+			background: #d7e7f1;
+		}
+
+		.completed {
+			background: #cfe8cf;
+		}
+
+		.pending {
+			background: #e7e2ec;
+		}
+
+		.summary-box h4 {
+			font-weight: 700;
+			color: #1e63d5;
+			margin: 0;
+		}
+
+		@media (max-width: 576px) {
+
+			.card-body .row {
+				flex-direction: column;
+			}
+
+			.card-body .col-4 {
+				width: 100%;
+				margin-bottom: 8px;
+			}
+
+		}
+	</style>
+</head>
+
+<body>
+
+	<div class="page-header-title text-center">
+		<h4 class>IE Complaints Report</h4>
+	</div>
+
+	<div class=" container mt-4">
+
+		<!--<table id="ieSummaryTable" class="table table-bordered text-center">
+			<thead class="table-header">
+				<tr>
+					<th>Total Complaints</th>
+					<th>Completed</th>
+					<th>Pending</th>
+				</tr>
+			</thead>
+			<tbody></tbody>
+		</table>-->
+
+
+
+		<div class="card mt-3 mb-4">
+			<div class="card-body">
+
+				<div class="row align-items-end">
+
+					<div class="col-md-4">
+						<label class="form-label">From Date</label>
+						<input type="date" id="fromDate" class="form-control">
+					</div>
+
+					<div class="col-md-4">
+						<label class="form-label">To Date</label>
+						<input type="date" id="toDate" class="form-control">
+					</div>
+
+					<div class="col-md-2">
+						<button class="btn btn-primary w-100 " onclick="loadDashboard(true); loadZoneActivity();">
+							Search
+						</button>
+					</div>
+
+				</div>
+
+			</div>
+		</div>
+
+
+
+		<div class="container mt-4">
+
+			<div id="dashboardCards" class="row"></div>
+
+		</div>
+
+		<div class="container mt-4">
+
+			<!--<div class="row mb-2">
+			<div class="col-md-4">
+				<label class="form-label">Complaint Type</label>
+				<select id="complaintDropdown" class="form-control">
+					<option value="">All Complaints</option>
+				</select>
+			</div>
+		</div>-->
+
+			<!--<table id="zoneTable" class="table table-bordered text-center">
+
+			<thead class="table-header">
+				<tr>
+					<th class="text-center">Zone</th>
+					<th class="text-center">Total</th>
+					<th class="text-center">Completed</th>
+					<th class="text-center">Pending</th>
+				</tr>
+			</thead>
+
+			<tbody id="zoneTableBody"></tbody>
+
+		</table>-->
+			<div class="container mt-4">
+
+				<table id="zoneTable" class="table table-bordered text-center">
+
+					<thead class="table-header">
+
+						<tr>
+
+							<th rowspan="2" class="text-center align-middle">
+								Zone
+							</th>
+
+							<!-- Garbage -->
+							<th colspan="3" class="text-center">
+								Hotspot
+							</th>
+
+							<!-- Hotspot -->
+							<th colspan="3" class="text-center">
+								RC Bin Overflow
+							</th>
+
+							<!-- Transport -->
+							<th colspan="3" class="text-center">
+								Unauthorized garbage dumping
+							</th>
+
+							<!-- Tenement -->
+							<th colspan="3" class="text-center">
+								Tenement
+							</th>
+
+						</tr>
+
+						<tr>
+
+							<!-- Garbage -->
+							<th class="text-center">Complaints</th>
+							<th class="text-center">Completed</th>
+							<th class="text-center">Pending</th>
+
+							<!-- Hotspot -->
+							<th class="text-center">Complaints</th>
+							<th class="text-center">Completed</th>
+							<th class="text-center">Pending</th>
+
+							<!-- Transport -->
+							<th class="text-center">Complaints</th>
+							<th class="text-center">Completed</th>
+							<th class="text-center">Pending</th>
+
+							<!-- Tenement -->
+							<th class="text-center">Complaints</th>
+							<th class="text-center">Completed</th>
+							<th class="text-center">Pending</th>
+
+						</tr>
+
+					</thead>
+
+					<tbody id="zoneTableBody"></tbody>
+
+				</table>
+
+			</div>
+
+		</div>
+		<div class="modal fade" id="wardModal" tabindex="-1">
+			<div class="modal-dialog modal-xl">
+				<div class="modal-content">
+
+					<div class="modal-header">
+						<h5 class="modal-title">Ward Activity - Zone <span id="zoneTitle"></span></h5>
+						<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+					</div>
+
+					<div class="modal-body">
+
+						<table id="wardTable" class="table table-bordered text-center">
+
+							<thead class="table-header">
+								<tr>
+									<th rowspan="2" class="text-center align-middle">Ward</th>
+									<!-- Hotspot -->
+									<th colspan="3" class="text-center">Hotspot</th>
+									<!-- Transport -->
+									<th colspan="3" class="text-center">RC Bin Overflow</th>
+									<!-- Garbage -->
+									<th colspan="3" class="text-center">Unauthorized garbage dumping</th>
+									<!-- Tenement -->
+									<th colspan="3" class="text-center">Tenement</th>
+								</tr>
+								<tr>
+									<!-- Hotspot -->
+									<th class="text-center">Total</th>
+									<th class="text-center">Completed</th>
+									<th class="text-center">Pending</th>
+									<!-- Transport -->
+									<th class="text-center">Total</th>
+									<th class="text-center">Completed</th>
+									<th class="text-center">Pending</th>
+									<!-- Garbage -->
+									<th class="text-center">Total</th>
+									<th class="text-center">Completed</th>
+									<th class="text-center">Pending</th>
+									<!-- Tenement -->
+									<th class="text-center">Total</th>
+									<th class="text-center">Completed</th>
+									<th class="text-center">Pending</th>
+								</tr>
+							</thead>
+
+							<tbody id="wardTableBody"></tbody>
+
+						</table>
+
+					</div>
+
+				</div>
+			</div>
+		</div>
+		<div class="modal fade" id="complaintModal" tabindex="-1">
+			<div class="modal-dialog modal-xl">
+				<div class="modal-content">
+
+					<div class="modal-header">
+						<h5 class="modal-title">Complaint Details - Ward <span id="wardTitle"></span> </h5>
+						<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+					</div>
+
+					<div class="modal-body">
+
+						<table id="complaintTable" class="table table-bordered text-center">
+
+							<thead class="table-header">
+								<tr>
+									<th class="text-center">Complaint Name</th>
+
+									<th class="text-center">Before Image</th>
+									<th class="text-center">Complaint Created Date</th>
+									<th class="text-center">complaint Created Street</th>
+
+									<th class="text-center">After Image</th>
+									<th class="text-center">Completion Date</th>
+									<th class="text-center">Completion Street</th>
+								</tr>
+							</thead>
+
+							<tbody id="complaintDetailsBody"></tbody>
+
+						</table>
+
+					</div>
+
+				</div>
+			</div>
+		</div>
+		<div class="modal fade" id="schemeModal" tabindex="-1">
+
+			<div class="modal-dialog modal-lg modal-dialog-scrollable">
+
+				<div class="modal-content">
+
+					<div class="modal-header">
+
+						<h4 class="modal-title">
+							Tenement Scheme Details
+						</h4>
+
+						<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+
+					</div>
+
+					<div class="modal-body">
+
+						<div class="table-responsive">
+
+							<table class="table table-bordered text-center">
+
+								<thead class="table-header">
+
+									<tr>
+
+										<th>Scheme Name</th>
+										<th>Total</th>
+										<th>Completed</th>
+										<th>Pending</th>
+
+									</tr>
+
+								</thead>
+
+								<tbody id="schemeTableBody">
+
+								</tbody>
+
+							</table>
+
+						</div>
+
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="modal fade" id="tenementComplaintModal" tabindex="-1">
+
+		<div class="modal-dialog modal-xl">
+
+			<div class="modal-content">
+
+				<div class="modal-header">
+
+					<h5 class="modal-title">
+						Tenement Complaint Details
+					</h5>
+
+					<button type="button" class="btn-close" data-bs-dismiss="modal">
+					</button>
+
+				</div>
+
+				<div class="modal-body">
+
+					<div class="table-responsive">
+
+						<table class="table table-bordered text-center">
+
+							<thead class=" table-header">
+
+								<tr>
+
+
+									<th>Created Date</th>
+									<th>Created Remarks</th>
+									<th>Before Image</th>
+									<th>Completed Date</th>
+									<th>Completed Remarks</th>
+									<th>After Image</th>
+									<!--<th>Verified Date</th>
+									<th>Verified Remarks</th>
+									<th>Verify Image</th>-->
+
+								</tr>
+
+							</thead>
+
+							<tbody id="tenementComplaintTableBody">
+
+							</tbody>
+
+						</table>
+
+					</div>
+
+				</div>
+
+			</div>
+
+		</div>
+
+	</div>
+	<div class="modal fade" id="imageModal" tabindex="-1">
+		<div class="modal-dialog modal-dialog-centered modal-lg">
+			<div class="modal-content">
+
+				<div class="modal-header">
+					<h5 class="modal-title">Image Preview</h5>
+					<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+				</div>
+
+				<div class="modal-body text-center">
+					<img id="modalImage" src="" class="img-fluid" style="max-height:80vh;">
+				</div>
+
+			</div>
+		</div>
+	</div>
+
+
+
+	<!-- Image Modal -->
+	<!-- <div class="modal fade" id="imageModal" tabindex="-1" role="dialog" aria-hidden="true">
+				  <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
+				    <div class="modal-content">
+				    
+				      <div class="modal-body text-center p-0">
+				        <img id="modalImage" src="" class="img-fluid" alt="Preview" style="max-height: 80vh;"/>
+				      </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>
+	<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.1.36/pdfmake.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/vfs_fonts.js"></script>
+
+	<!-- SweetAlert -->
+	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+
+	<script>
+
+
+		/* 
+		$(document).on('click', '.preview-img', function() {
+			  const src = $(this).attr('src');
+			  $('#modalImage').attr('src', src);
+			  $('#imageModal').modal('show');
+			}); */
+		$("#fromDate").on("change", function () {
+
+			let fromDate = $(this).val();
+
+			if (fromDate) {
+				$("#toDate").attr("min", fromDate); // restrict past dates
+			}
+
+		});
+
+
+
+		$(document).ready(function () {
+
+			loadDashboard();
+			loadZoneActivity();
+
+		});
+		$("#searchBtn").click(function () {
+
+			loadDashboard();
+			loadZoneActivity();
+
+		});
+
+		function loadComplaintDropdown() {
+
+			$.get("/commissionerreview/api/iecomplaints/complaintTypes", function (res) {
+
+				let html = `<option value="">All Complaints</option>`;
+
+				res.data.forEach(c => {
+
+					html += `<option value="${c.complaint_id}">
+                        ${c.complaint_name}
+                     </option>`;
+
+				});
+
+				$("#complaintDropdown").html(html);
+
+			});
+
+		}
+		$(document).on('click', '.preview-img', function () {
+
+			let src = $(this).attr("src");
+
+			$("#modalImage").attr("src", src);
+
+			$("#imageModal").modal("show");
+
+		});
+		function loadComplaintDetails(zone, ward) {
+			$("#wardTitle").text(ward);
+
+
+			let complaintId = $("#complaintDropdown").val();
+			let fromDate = $("#fromDate").val();
+			let toDate = $("#toDate").val();
+			if ($.fn.DataTable.isDataTable('#complaintTable')) {
+				$('#complaintTable').DataTable().destroy();
+			}
+
+			$.get("/commissionerreview/api/iecomplaints/vendorcomplaintDetails", {
+
+				zone: zone,
+				ward: ward,
+				complaintId: complaintId,
+				fromDate: fromDate,
+				toDate: toDate
+
+			}, function (res) {
+				console.log(res)
+
+				let html = "";
+
+				if (res.status === "Success") {
+
+					res.data.forEach(c => {
+
+						html += `
+<tr>
+<td>${c.complaint_name}</td>
+
+
+<td>
+<img src="${c.before_image}" width="80" class="preview-img" style="cursor:pointer">
+</td>
+
+<td>${c.complaint_created_date}</td>
+<td>${c.complaint_street_name}</td>
+
+<td>
+${c.after_image ? `<img src="${c.after_image}" width="80" class="preview-img" style="cursor:pointer">` : 'Pending'}
+</td>
+
+<td>${c.completion_date} </td>
+<td>${c.completion_street_name ? c.completion_street_name : 'Pending'}</td>
+
+
+</tr>
+`;
+
+					});
+
+				}
+
+				$("#complaintDetailsBody").html(html);
+				$("#complaintTable").DataTable({
+					destroy: true,
+					dom: 'Bfrtip',
+					buttons: [
+						{
+							extend: 'excelHtml5',
+							text: 'Download Excel',
+							title: 'Complaint_Details'
+						},
+						{
+							extend: 'pdfHtml5',
+							text: 'Download PDF',
+							title: 'Complaint_Details',
+							orientation: 'landscape'
+						}
+					]
+				});
+
+				$("#complaintModal").modal("show");
+
+			});
+
+		}
+		function loadWardActivity(zone) {
+			console.log(zone);
+			$("#zoneTitle").text(zone);
+
+			let complaintId = $("#complaintDropdown").val();
+			let fromDate = $("#fromDate").val();
+			let toDate = $("#toDate").val();
+			console.log("complaintId");
+			console.log(complaintId);
+			if ($.fn.DataTable.isDataTable('#wardTable')) {
+				$('#wardTable').DataTable().destroy();
+			}
+
+			$.get("/commissionerreview/api/iecomplaints/vendorwardActivity", {
+
+				zone: zone,
+				complaintId: complaintId,
+				fromDate: fromDate,
+				toDate: toDate
+
+			}, function (res) {
+
+				let html = "";
+
+				if (res.status === "Success") {
+
+					/*res.data.forEach(w => {
+						let wardCell = w.total_count > 0
+							? `<a href="javascript:void(0)" onclick="loadComplaintDetails('${zone}','${w.ward}')">${w.ward}</a>`
+							: `${w.ward}`;
+	
+						html += `
+<tr>
+<td>
+${wardCell}
+	
+</td>
+<td>${w.total_count}</td>
+<td>${w.completed_count}</td>
+<td>${w.pending_count}</td>
+</tr>
+`;*/
+					res.data.forEach(w => {
+
+						let total = Number(w.completed_count) + Number(w.pending_count);
+
+						let wardCell = total > 0
+							? `<a href="javascript:void(0)" onclick="loadComplaintDetails('${zone}','${w.ward}')">${w.ward}</a>`
+							: `${w.ward}`;
+
+						html += `
+<tr>
+<td>${wardCell}</td>
+<td>${total}</td>
+<td>${w.completed_count}</td>
+<td>${w.pending_count}</td>
+</tr>
+`;
+
+
+					});
+
+				}
+
+				$("#wardTableBody").html(html);
+				$("#wardTable").DataTable({
+					destroy: true,
+					dom: 'Bfrtip',
+					pageLength: 15,
+					buttons: [
+						{
+							extend: 'excelHtml5',
+							text: 'Download Excel',
+							title: 'Ward_Activity'
+						},
+						{
+							extend: 'pdfHtml5',
+							text: 'Download PDF',
+							title: 'Ward_Activity',
+							orientation: 'landscape'
+						}
+					]
+				});
+
+				$("#wardModal").modal("show");
+
+			});
+
+		}
+		function loadZoneActivity() {
+
+			let fromDate = $("#fromDate").val();
+			let toDate = $("#toDate").val();
+
+			$.when(
+
+				// HOTSPOT
+				$.get("/commissionerreview/api/iecomplaints/vendorzoneActivity", {
+
+					fromDate: fromDate,
+					toDate: toDate,
+					complaintId: 4
+
+				}),
+
+				// TRANSPORT
+				$.get("/commissionerreview/api/iecomplaints/vendorzoneActivity", {
+
+					fromDate: fromDate,
+					toDate: toDate,
+					complaintId: 6
+
+				}),
+
+				// GARBAGE
+				$.get("/commissionerreview/api/iecomplaints/vendorzoneActivity", {
+
+					fromDate: fromDate,
+					toDate: toDate,
+					complaintId: 12
+
+				}),
+
+				// TENEMENT
+				$.get("/commissionerreview/api/tenement/zoneActivity", {
+
+					fromDate: fromDate,
+					toDate: toDate
+
+				})
+
+			).done(function (
+
+				hotspotRes,
+				transportRes,
+				garbageRes,
+				tenementRes
+
+			) {
+
+				let hotspotData = hotspotRes[0].data || [];
+				let transportData = transportRes[0].data || [];
+				let garbageData = garbageRes[0].data || [];
+				let tenementData = tenementRes[0].data || [];
+
+				// destroy old table
+				if ($.fn.DataTable.isDataTable('#zoneTable')) {
+
+					$('#zoneTable').DataTable().destroy();
+				}
+
+				$("#zoneTable tbody").empty();
+
+				// maps
+				let hotspotMap = {};
+				let transportMap = {};
+				let garbageMap = {};
+				let tenementMap = {};
+
+				hotspotData.forEach(item => {
+
+					hotspotMap[item.zone_name] = item;
+				});
+
+				transportData.forEach(item => {
+
+					transportMap[item.zone_name] = item;
+				});
+
+				garbageData.forEach(item => {
+
+					garbageMap[item.zone_name] = item;
+				});
+
+				tenementData.forEach(item => {
+
+					tenementMap[item.zone] = {
+
+						total: item.total_complaint_count || 0,
+						completed: item.total_complaint_closed_count || 0,
+						pending: item.total_complaint_pending_count || 0
+					};
+				});
+
+				let zones = [
+
+					"01", "02", "03", "04", "05",
+					"06", "07", "08", "09", "10",
+					"11", "12", "13", "14", "15"
+
+				];
+
+				// zone display names
+				let zoneNameMap = {
+
+					"01": "Zone 01 Ramky",
+					"02": "Zone 02 Ramky",
+					"03": "Zone 03 Ramky",
+
+					"04": "Zone 04 GCC",
+
+					"05": "Zone 05 Ramky",
+					"06": "Zone 06 Ramky",
+
+					"07": "Zone 07 GCC",
+					"08": "Zone 08 GCC",
+
+					"09": "Zone 09 urbaser",
+					"10": "Zone 10 urbaser",
+
+					"11": "Zone 11 urbaser",
+					"12": "Zone 12 urbaser",
+					"13": "Zone 13 urbaser",
+					"14": "Zone 14 urbaser",
+
+					"15": "Zone 15 urbaser"
+				};
+
+				let rows = "";
+
+				zones.forEach(zone => {
+
+					let h = hotspotMap[zone] || {};
+					let t = transportMap[zone] || {};
+					let g = garbageMap[zone] || {};
+
+					let ten = tenementMap[zone] || {
+
+						total: 0,
+						completed: 0,
+						pending: 0
+					};
+
+					let displayZone = zoneNameMap[zone] || zone;
+
+					rows += `
+
+<tr>
+
+<td>
+
+${(
+							g.total_count > 0 ||
+							h.total_count > 0 ||
+							t.total_count > 0 ||
+							ten.total > 0
+						)
+
+							?
+
+							`<a href="javascript:void(0)"
+    onclick="openWardModal('${zone}')">
+
+    ${displayZone}
+
+</a>`
+
+							:
+
+							displayZone
+
+						}
+
+</td>
+
+<!-- HOTSPOT -->
+
+<td>${h.total_count || 0}</td>
+<td>${h.completed_count || 0}</td>
+<td>${h.pending_count || 0}</td>
+
+<!-- TRANSPORT -->
+
+<td>${t.total_count || 0}</td>
+<td>${t.completed_count || 0}</td>
+<td>${t.pending_count || 0}</td>
+
+<!-- GARBAGE -->
+
+<td>${g.total_count || 0}</td>
+<td>${g.completed_count || 0}</td>
+<td>${g.pending_count || 0}</td>
+
+<!-- TENEMENT -->
+
+<td>${ten.total || 0}</td>
+<td>${ten.completed || 0}</td>
+<td>${ten.pending || 0}</td>
+
+</tr>
+`;
+				});
+
+				$("#zoneTable tbody").html(rows);
+
+				$('#zoneTable').DataTable({
+
+					destroy: true,
+					paging: false,
+					searching: true,
+					ordering: false,
+					info: false,
+					autoWidth: false,
+					scrollX: true
+				});
+
+			}).fail(function (err) {
+
+				console.log(err);
+
+				alert("Failed to load zone activity");
+			});
+		}
+		/*function loadZoneActivityworking() {
+
+			let fromDate = $("#fromDate").val();
+			let toDate = $("#toDate").val();
+
+			$.when(
+
+				$.get("/commissionerreview/api/iecomplaints/vendorzoneActivity", {
+					fromDate: fromDate,
+					toDate: toDate,
+					complaintId: 4
+				}),
+
+				$.get("/commissionerreview/api/iecomplaints/vendorzoneActivity", {
+					fromDate: fromDate,
+					toDate: toDate,
+					complaintId: 6
+				}),
+
+				$.get("/commissionerreview/api/iecomplaints/vendorzoneActivity", {
+					fromDate: fromDate,
+					toDate: toDate,
+					complaintId: 12
+				}),
+
+				$.get("/commissionerreview/api/tenement/zoneActivity", {
+					fromDate: fromDate,
+					toDate: toDate
+				})
+
+			).done(function (
+
+				garbageRes,
+				hotspotRes,
+				transportRes,
+				tenementRes
+
+			) {
+
+				let garbageData = garbageRes[0].data || [];
+				let hotspotData = hotspotRes[0].data || [];
+				let transportData = transportRes[0].data || [];
+				let tenementData = tenementRes[0].data || [];
+
+				// ✅ destroy old table
+				if ($.fn.DataTable.isDataTable('#zoneTable')) {
+					$('#zoneTable').DataTable().destroy();
+				}
+
+				// ✅ clear old rows
+				$("#zoneTable tbody").empty();
+
+				// ✅ create maps
+				let garbageMap = {};
+				let hotspotMap = {};
+				let transportMap = {};
+				let tenementMap = {};
+
+				garbageData.forEach(item => {
+					garbageMap[item.zone_name] = item;
+				});
+
+				hotspotData.forEach(item => {
+					hotspotMap[item.zone_name] = item;
+				});
+
+				transportData.forEach(item => {
+					transportMap[item.zone_name] = item;
+				});
+
+				tenementData.forEach(item => {
+
+					tenementMap[item.zone] = {
+
+						total: item.total_complaint_count || 0,
+						completed: item.total_complaint_closed_count || 0,
+						pending: item.total_complaint_pending_count || 0
+					};
+				});
+
+				let zones = [
+					"01", "02", "03", "04", "05",
+					"06", "07", "08", "09", "10",
+					"11", "12", "13", "14", "15"
+				];
+				let zoneNameMap = {
+
+					4: "GCC Zone 4",
+					7: "GCC Zone 7",
+					8: "GCC Zone 8"
+
+				};
+
+
+
+
+				let rows = "";
+
+				zones.forEach(zone => {
+
+					let g = garbageMap[zone] || {};
+					let h = hotspotMap[zone] || {};
+					let t = transportMap[zone] || {};
+
+					let ten = tenementMap[zone] || {
+
+						total: 0,
+						completed: 0,
+						pending: 0
+					};
+
+					rows += `
+
+<tr>
+
+<td>
+
+${(
+							g.total_count > 0 ||
+							h.total_count > 0 ||
+							t.total_count > 0 ||
+							ten.total > 0
+						)
+							?
+							`<a href="javascript:void(0)"
+	onclick="openWardModal('${zone}')">
+		${zone}
+ </a>`
+							:
+							zone
+						}
+
+</td>
+
+<!-- Garbage -->
+<td>${g.total_count || 0}</td>
+<td>${g.completed_count || 0}</td>
+<td>${g.pending_count || 0}</td>
+
+<!-- Hotspot -->
+<td>${h.total_count || 0}</td>
+<td>${h.completed_count || 0}</td>
+<td>${h.pending_count || 0}</td>
+
+<!-- Transport -->
+<td>${t.total_count || 0}</td>
+<td>${t.completed_count || 0}</td>
+<td>${t.pending_count || 0}</td>
+
+<!-- Tenement -->
+<td>${ten.total || 0}</td>
+<td>${ten.completed || 0}</td>
+<td>${ten.pending || 0}</td>
+
+</tr>
+`;
+				});
+
+				$("#zoneTable tbody").html(rows);
+
+				$('#zoneTable').DataTable({
+
+					destroy: true,
+					paging: true,
+					pageLength: 15,
+					searching: true,
+					ordering: false,
+					info: true,
+					autoWidth: false
+				});
+
+			}).fail(function (err) {
+
+				console.log(err);
+
+				alert("Failed to load zone activity");
+			});
+		}*/
+		$("#searchBtn").click(function () {
+
+			loadDashboard();
+			loadZoneActivity();
+
+		});
+		function openWardModal(zone) {
+
+			let fromDate = $("#fromDate").val();
+			let toDate = $("#toDate").val();
+
+			$.when(
+
+				// HOTSPOT
+				$.get("/commissionerreview/api/iecomplaints/vendorwardActivity", {
+
+					zone: zone,
+					complaintId: 4,
+					fromDate: fromDate,
+					toDate: toDate
+
+				}),
+
+				// TRANSPORT
+				$.get("/commissionerreview/api/iecomplaints/vendorwardActivity", {
+
+					zone: zone,
+					complaintId: 6,
+					fromDate: fromDate,
+					toDate: toDate
+
+				}),
+
+				// GARBAGE
+				$.get("/commissionerreview/api/iecomplaints/vendorwardActivity", {
+
+					zone: zone,
+					complaintId: 12,
+					fromDate: fromDate,
+					toDate: toDate
+
+				}),
+
+				// TENEMENT
+				$.get("/commissionerreview/api/tenement/wardActivity", {
+
+					zone: zone,
+					fromDate: fromDate,
+					toDate: toDate
+
+				})
+
+			).done(function (
+
+				hotspotRes,
+				transportRes,
+				garbageRes,
+				tenementRes
+
+			) {
+
+				let hotspotData = hotspotRes[0].data || [];
+				let transportData = transportRes[0].data || [];
+				let garbageData = garbageRes[0].data || [];
+				let tenementData = tenementRes[0].data || [];
+
+				let html = "";
+
+				let maxLength = Math.max(
+
+					hotspotData.length,
+					transportData.length,
+					garbageData.length,
+					tenementData.length
+				);
+
+				// ward name map
+				let wardNameMap = {
+
+					"083": "083 Ramky",
+					"082": "082 Ramky",
+					"085": "085 Ramky"
+
+				};
+
+				for (let i = 0; i < maxLength; i++) {
+
+					let h = hotspotData[i] || {};
+					let t = transportData[i] || {};
+					let g = garbageData[i] || {};
+					let ten = tenementData[i] || {};
+
+					let ward =
+						h.ward ||
+						t.ward ||
+						g.ward ||
+						ten.ward ||
+						'';
+
+					// display ward name
+					let displayWard = wardNameMap[ward] || ward;
+
+					html += `
+
+<tr>
+
+<td>${displayWard}</td>
+
+<!-- HOTSPOT -->
+
+<td>
+
+${h.total_count > 0 ?
+
+							`<a href="javascript:void(0)"
+onclick="openComplaintDetails('${zone}','${ward}','4')">
+
+${h.total_count}
+
+</a>`
+
+							: 0}
+
+</td>
+
+<td>${h.completed_count || 0}</td>
+
+<td>${h.pending_count || 0}</td>
+
+
+
+<!-- TRANSPORT -->
+
+<td>
+
+${t.total_count > 0 ?
+
+							`<a href="javascript:void(0)"
+onclick="openComplaintDetails('${zone}','${ward}','6')">
+
+${t.total_count}
+
+</a>`
+
+							: 0}
+
+</td>
+
+<td>${t.completed_count || 0}</td>
+
+<td>${t.pending_count || 0}</td>
+
+
+
+<!-- GARBAGE -->
+
+<td>
+
+${g.total_count > 0 ?
+
+							`<a href="javascript:void(0)"
+onclick="openComplaintDetails('${zone}','${ward}','12')">
+
+${g.total_count}
+
+</a>`
+
+							: 0}
+
+</td>
+
+<td>${g.completed_count || 0}</td>
+
+<td>${g.pending_count || 0}</td>
+
+
+
+<!-- TENEMENT -->
+
+<td>
+
+${ten.total_complaint_count > 0 ?
+
+							`<a href="javascript:void(0)"
+onclick="openSchemeModal('${ward}')">
+
+${ten.total_complaint_count}
+
+</a>`
+
+							: 0}
+
+</td>
+
+<td>${ten.total_complaint_closed_count || 0}</td>
+
+<td>${ten.total_complaint_pending_count || 0}</td>
+
+</tr>
+`;
+				}
+
+				$("#wardTableBody").html(html);
+
+				$("#wardModal").modal("show");
+
+			});
+		}
+		function openWardModalworking(zone) {
+
+			let fromDate = $("#fromDate").val();
+			let toDate = $("#toDate").val();
+
+			$.when(
+
+				// HOTSPOT
+				$.get("/commissionerreview/api/iecomplaints/vendorwardActivity", {
+
+					zone: zone,
+					complaintId: 4,
+					fromDate: fromDate,
+					toDate: toDate
+
+				}),
+
+				// TRANSPORT
+				$.get("/commissionerreview/api/iecomplaints/vendorwardActivity", {
+
+					zone: zone,
+					complaintId: 6,
+					fromDate: fromDate,
+					toDate: toDate
+
+				}),
+
+				// GARBAGE
+				$.get("/commissionerreview/api/iecomplaints/vendorwardActivity", {
+
+					zone: zone,
+					complaintId: 12,
+					fromDate: fromDate,
+					toDate: toDate
+
+				}),
+
+				// TENEMENT
+				$.get("/commissionerreview/api/tenement/wardActivity", {
+
+					zone: zone,
+					fromDate: fromDate,
+					toDate: toDate
+
+				})
+
+			).done(function (
+
+				hotspotRes,
+				transportRes,
+				garbageRes,
+				tenementRes
+
+			) {
+
+				let hotspotData = hotspotRes[0].data || [];
+				let transportData = transportRes[0].data || [];
+				let garbageData = garbageRes[0].data || [];
+				let tenementData = tenementRes[0].data || [];
+
+				let html = "";
+
+				let maxLength = Math.max(
+
+					hotspotData.length,
+					transportData.length,
+					garbageData.length,
+					tenementData.length
+				);
+
+				for (let i = 0; i < maxLength; i++) {
+
+					let h = hotspotData[i] || {};
+					let t = transportData[i] || {};
+					let g = garbageData[i] || {};
+					let ten = tenementData[i] || {};
+
+					let ward =
+						h.ward ||
+						t.ward ||
+						g.ward ||
+						ten.ward ||
+						'';
+
+					html += `
+
+<tr>
+
+<td>${ward}</td>
+
+<!-- HOTSPOT -->
+
+<td>
+
+${h.total_count > 0 ?
+
+							`<a href="javascript:void(0)"
+onclick="openComplaintDetails('${zone}','${ward}','4')">
+
+${h.total_count}
+
+</a>`
+
+							: 0}
+
+</td>
+
+<td>${h.completed_count || 0}</td>
+
+<td>${h.pending_count || 0}</td>
+
+
+
+<!-- TRANSPORT -->
+
+<td>
+
+${t.total_count > 0 ?
+
+							`<a href="javascript:void(0)"
+onclick="openComplaintDetails('${zone}','${ward}','6')">
+
+${t.total_count}
+
+</a>`
+
+							: 0}
+
+</td>
+
+<td>${t.completed_count || 0}</td>
+
+<td>${t.pending_count || 0}</td>
+
+
+
+<!-- GARBAGE -->
+
+<td>
+
+${g.total_count > 0 ?
+
+							`<a href="javascript:void(0)"
+onclick="openComplaintDetails('${zone}','${ward}','12')">
+
+${g.total_count}
+
+</a>`
+
+							: 0}
+
+</td>
+
+<td>${g.completed_count || 0}</td>
+
+<td>${g.pending_count || 0}</td>
+
+
+
+<!-- TENEMENT -->
+
+<td>
+
+${ten.total_complaint_count > 0 ?
+
+							`<a href="javascript:void(0)"
+onclick="openSchemeModal('${ward}')">
+
+${ten.total_complaint_count}
+
+</a>`
+
+							: 0}
+
+</td>
+
+<td>${ten.total_complaint_closed_count || 0}</td>
+
+<td>${ten.total_complaint_pending_count || 0}</td>
+
+</tr>
+`;
+				}
+
+				$("#wardTableBody").html(html);
+
+				$("#wardModal").modal("show");
+
+			});
+		}
+		function openComplaintDetails(zone, ward, complaintId) {
+
+			let fromDate = $("#fromDate").val();
+			let toDate = $("#toDate").val();
+
+			$.get(
+				"/commissionerreview/api/iecomplaints/vendorcomplaintDetails",
+				{
+					zone: zone,
+					ward: ward,
+					complaintId: complaintId,
+					fromDate: fromDate,
+					toDate: toDate
+				},
+
+				function (res) {
+
+					let data = res.data || [];
+
+					let html = "";
+
+					for (let i = 0; i < data.length; i++) {
+
+						let row = data[i];
+
+						html += `
+
+<tr>
+<td>${row.complaint_name || ''}</td>
+<td>
+<img src="${row.before_image}"
+     width="80"
+     height="80">
+</td>
+<td>${row.complaint_created_date || ''}</td>
+<td>${row.complaint_street_name || ''}</td>
+<td>
+${row.after_image ? `<img src="${row.after_image}" width="80" class="preview-img" style="cursor:pointer">` : 'Pending'}
+</td>
+
+
+
+<td>${row.completion_date || ''}</td>
+<td>${row.completion_street_name ? row.completion_street_name : 'Pending'}</td>
+
+
+
+
+</tr>
+`;
+					}
+
+					$("#complaintDetailsBody").html(html);
+
+					const complaintModal = new bootstrap.Modal(
+						document.getElementById('complaintModal')
+					);
+
+					complaintModal.show();
+				}
+			);
+		}
+
+
+
+
+
+		function openComplaintDetails1(zone, ward, complaintId) {
+
+			let fromDate = $("#fromDate").val();
+			let toDate = $("#toDate").val();
+
+			$.get(
+
+				"/commissionerreview/api/iecomplaints/vendorcomplaintDetails",
+
+				{
+
+					zone: zone,
+					ward: ward,
+					complaintId: complaintId,
+					fromDate: fromDate,
+					toDate: toDate
+
+				},
+
+				function (res) {
+
+					let data = res.data || [];
+
+					let html = "";
+
+					for (let i = 0; i < data.length; i++) {
+
+						let row = data[i];
+
+						html += `
+
+<tr>
+
+<td>${row.complaint_name || ''}</td>
+
+<td>${row.street_name || ''}</td>
+
+<td>${row.status || ''}</td>
+
+<td>${row.complaint_created_date || ''}</td>
+
+<td>${row.completion_date || ''}</td>
+
+<td>
+
+${row.before_image ?
+
+								`<img src="${row.before_image}"
+width="80"
+height="80">`
+
+								: ''}
+
+</td>
+
+<td>
+
+${row.after_image ?
+
+								`<img src="${row.after_image}"
+width="80"
+height="80">`
+
+								: ''}
+
+</td>
+
+</tr>
+`;
+					}
+
+					$("#complaintDetailsBody").html(html);
+
+					$("#complaintDetailsModal").modal("show");
+
+				}
+
+			);
+
+		}
+
+
+
+
+
+		function openSchemeModal(ward) {
+
+			console.log("WARD =", ward);
+
+			let fromDate = $("#fromDate").val();
+			let toDate = $("#toDate").val();
+
+			$.get(
+
+				"/commissionerreview/api/tenement/getSchemeWiseReport",
+
+				{
+					ward: ward,
+					fromDate: fromDate,
+					toDate: toDate
+				},
+
+				function (res) {
+
+					console.log("SCHEME RESPONSE =", res);
+
+					let data = res.data || [];
+
+					let html = "";
+
+					for (let i = 0; i < data.length; i++) {
+
+						let row = data[i];
+
+						html += `
+
+<tr>
+
+<td>${row.scheme_name || ''}</td>
+
+<td>
+    ${row.total_complaint_count > 0
+								? `<a href="javascript:void(0)"
+             onclick="openTenementComplaintModal(
+                 '${ward}',
+                 '${row.schemeid}'
+             )">
+             ${row.total_complaint_count}
+           </a>`
+								: 0}
+</td>
+
+<td>${row.total_complaint_closed_count || 0}</td>
+
+<td>${row.total_complaint_pending_count || 0}</td>
+
+</tr>
+`;
+					}
+
+					$("#schemeTableBody").html(html);
+
+					// ATTACH EVENT FIRST
+					$('#wardModal').one('hidden.bs.modal', function () {
+
+						const schemeModal = new bootstrap.Modal(
+							document.getElementById('schemeModal')
+						);
+
+						schemeModal.show();
+
+					});
+
+					// THEN HIDE
+					$("#wardModal").modal("hide");
+
+				}
+
+			);
+		}
+		function openTenementComplaintModal(
+			ward,
+			schemeid
+		) {
+			console.log("WARD", ward);
+			console.log("SCHEMEID", schemeid);
+
+			let fromDate = $("#fromDate").val();
+			let toDate = $("#toDate").val();
+
+			$.get(
+				"/commissionerreview/api/tenement/getComplaintDetails",
+				{
+					ward: ward,
+					schemeid: schemeid,
+
+					fromDate: fromDate,
+					toDate: toDate
+				},
+
+				function (res) {
+					console.log("RES=", res);
+
+					let data = res.data || [];
+
+					let html = "";
+
+					data.forEach(function (row) {
+
+						html += `
+
+<tr>
+
+
+
+
+
+
+
+<td>${row.created_date || ''}</td>
+
+<td>${row.created_remarks || ''}</td>
+<td>
+<img src="${row.before_image || ''}"
+     width="80"
+     height="80">
+</td>
+
+
+
+
+
+<td>${row.completed_date || 'pending'}</td>
+
+<td>${row.completed_remarks || 'pending'}</td>
+<td>
+${row.after_image ? `<img src="${row.after_image}" width="80" class="preview-img" style="cursor:pointer">` : 'Pending'}
+</td>
+
+
+<!--<td>${row.verified_date || ''}</td>
+
+<td>${row.verified_remarks || ''}</td>
+
+<td>
+<img src="${row.verify_image || ''}"
+     width="80"
+     height="80">
+</td>-->
+
+</tr>
+`;
+					});
+
+					$("#tenementComplaintTableBody").html(html);
+
+					$("#tenementComplaintModal").modal("show");
+				}
+			);
+		}
+		function openWardModal1(zone) {
+
+			let fromDate = $("#fromDate").val();
+			let toDate = $("#toDate").val();
+
+			$.when(
+
+				// Garbage
+				$.get("/commissionerreview/api/iecomplaints/vendorwardActivity", {
+					zone: zone,
+					complaintId: 12,
+					fromDate: fromDate,
+					toDate: toDate
+				}),
+
+				// Hotspot
+				$.get("/commissionerreview/api/iecomplaints/vendorwardActivity", {
+					zone: zone,
+					complaintId: 4,
+					fromDate: fromDate,
+					toDate: toDate
+				}),
+
+				// Transport
+				$.get("/commissionerreview/api/iecomplaints/vendorwardActivity", {
+					zone: zone,
+					complaintId: 6,
+					fromDate: fromDate,
+					toDate: toDate
+				}),
+
+				// Tenement
+				$.get("/commissionerreview/api/tenement/wardActivity", {
+					zone: zone,
+					fromDate: fromDate,
+					toDate: toDate
+				})
+
+			).done(function (
+				garbageRes,
+				hotspotRes,
+				transportRes,
+				tenementRes
+			) {
+
+				let garbageData = garbageRes[0].data;
+				let hotspotData = hotspotRes[0].data;
+				let transportData = transportRes[0].data;
+				let tenementData = tenementRes[0].data;
+
+				let html = "";
+
+				for (let i = 0; i < garbageData.length; i++) {
+
+					let g = garbageData[i] || {};
+					let h = hotspotData[i] || {};
+					let t = transportData[i] || {};
+					let ten = tenementData[i] || {};
+
+					html += `
+<tr>
+
+<td>${g.ward || ''}</td>
+
+
+
+<td>${h.total_count || 0}</td>
+<td>${h.completed_count || 0}</td>
+<td>${h.pending_count || 0}</td>
+
+<td>${t.total_count || 0}</td>
+<td>${t.completed_count || 0}</td>
+<td>${t.pending_count || 0}</td>
+<td>${g.total_count || 0}</td>
+<td>${g.completed_count || 0}</td>
+<td>${g.pending_count || 0}</td>
+
+<td>${ten.total_complaint_count || 0}</td>
+<td>${ten.total_complaint_closed_count || 0}</td>
+<td>${ten.total_complaint_pending_count || 0}</td>
+
+</tr>
+`;
+				}
+
+				$("#wardTableBody").html(html);
+
+				$("#wardModal").modal("show");
+			});
+		}
+
+		function loadZoneActivity1() {
+
+			let complaintId = $("#complaintDropdown").val();
+			let fromDate = $("#fromDate").val();
+			let toDate = $("#toDate").val();
+			if ($.fn.DataTable.isDataTable('#zoneTable')) {
+				$('#zoneTable').DataTable().destroy();
+			}
+
+
+			$.get("/commissionerreview/api/iecomplaints/vendorzoneActivity", {
+				complaintId: complaintId,
+				fromDate: fromDate,
+				toDate: toDate
+			}, function (res) {
+
+				let html = "";
+
+				if (res.status === "Success" && res.data) {
+					/*<td>
+<a href="javascript:void(0)" onclick="loadWardActivity('${z.zone}')">
+${z.zone_name}
+</a>
+</td>
+					
+					<td>
+<a href="javascript:void(0)" onclick="loadComplaintDetails('${zone}','${w.ward}')">
+${w.ward}
+</a>
+</td>*/
+
+					res.data.forEach(z => {
+
+						let total = Number(z.completed_count) + Number(z.pending_count);
+
+						let zoneCell = total > 0
+							? `<a href="javascript:void(0)" onclick="loadWardActivity('${z.zone_name}')">${z.zone_name}</a>`
+							: `${z.zone_name}`;
+
+						html += `
+<tr>
+<td>${zoneCell}</td>
+<td>${total}</td>
+<td>${z.completed_count}</td>
+<td>${z.pending_count}</td>
+</tr>
+`;
+					});
+
+				}
+
+				$("#zoneTableBody").html(html);
+				$("#zoneTable").DataTable({
+					destroy: true,
+					dom: 'Bfrtip',
+					pageLength: 15,
+					buttons: [
+						{
+							extend: 'excelHtml5',
+							text: 'Download Excel',
+							title: 'Zone_Activity'
+						},
+						{
+							extend: 'pdfHtml5',
+							text: 'Download PDF',
+							title: 'Zone_Activity',
+							orientation: 'landscape'
+						}
+					]
+				});
+
+			});
+
+		}
+		function loadDashboard(isUserAction = false) {
+
+			let fromDate = $("#fromDate").val();
+			let toDate = $("#toDate").val();
+			if (isUserAction) {
+
+				if (!fromDate || !toDate) {
+					Swal.fire({
+						icon: 'warning',
+						title: 'Missing Date',
+						text: 'Please select From Date and To Date',
+						confirmButtonColor: '#3085d6'
+					});
+					return;
+				}
+			}
+
+			// Check if From Date > To Date
+			if (fromDate > toDate) {
+
+				Swal.fire({
+					icon: 'warning',
+					title: 'Invalid Date Range',
+					text: 'From Date cannot be greater than To Date',
+					confirmButtonColor: '#3085d6'
+				});
+
+				return;
+			}
+
+
+
+
+
+			$.ajax({
+
+				url: '/commissionerreview/api/iecomplaints/vendorcomplaintDashboard',
+				method: 'GET',
+
+				data: {
+					fromDate: fromDate,
+					toDate: toDate
+				},
+
+				success: function (res) {
+
+					if (res.status === "Success") {
+
+
+
+
+						let html = '';
+
+						res.data.forEach(item => {
+							/*<div class="col-md-4 mb-4">*/
+
+							html += `
+  <div class="col-12 col-sm-6 col-md-6 col-lg-4 col-xl-4 mb-4">
+        <div class="card complaint-card">
+			<div class="card-header complaint-header">
+    ${item.complaint_id == 6
+									? 'RC Bin Overflow'
+									: item.complaint_name}
+</div>
+
+            <!--<div class="card-header complaint-header">
+                ${item.complaint_name}
+            </div>-->
+
+            <div class="card-body text-center">
+
+                <div class="row">
+
+                    <div class="col-4">
+                        <div class="summary-box total">
+                            <p>Total</p>
+                            <h4>${Number(item.completed_count) + Number(item.pending_count)}</h4>
+                        </div>
+                    </div>
+
+                    <div class="col-4">
+                        <div class="summary-box completed">
+                            <p>Completed</p>
+                            <h4>${item.completed_count}</h4>
+                        </div>
+                    </div>
+
+                    <div class="col-4">
+                        <div class="summary-box pending">
+                            <p>Pending</p>
+                            <h4>${item.pending_count}</h4>
+                        </div>
+                    </div>
+
+                </div>
+
+            </div>
+
+        </div>
+    </div>
+    `;
+
+						});
+
+
+
+						$("#dashboardCards").html(html);
+						// ✅ load tenement dashboard card
+						$.ajax({
+
+							url: '/commissionerreview/api/tenement/tenementDashboard',
+							method: 'GET',
+
+							data: {
+								fromDate: fromDate,
+								toDate: toDate
+							},
+
+							success: function (res) {
+
+								if (res.status === "Success") {
+
+									res.data.forEach(item => {
+
+										let tenementHtml = `
+
+<div class="col-12 col-sm-6 col-md-6 col-lg-4 col-xl-4 mb-4">
+
+    <div class="card complaint-card">
+
+        <div class="card-header complaint-header">
+            Tenement
+        </div>
+
+        <div class="card-body text-center">
+
+            <div class="row">
+
+                <div class="col-4">
+                    <div class="summary-box total">
+                        <p>Total</p>
+                        <h4>${item.total_count}</h4>
+                    </div>
+                </div>
+
+                <div class="col-4">
+                    <div class="summary-box completed">
+                        <p>Completed</p>
+                        <h4>${item.completed_count}</h4>
+                    </div>
+                </div>
+
+                <div class="col-4">
+                    <div class="summary-box pending">
+                        <p>Pending</p>
+                        <h4>${item.pending_count}</h4>
+                    </div>
+                </div>
+
+            </div>
+
+        </div>
+
+    </div>
+
+</div>
+`;
+
+										$("#dashboardCards").append(tenementHtml);
+
+									});
+
+								}
+
+							}
+
+						});
+
+					}
+
+				}
+
+			});
+
+		}
+
+
+
+
+	</script>
+
+</body>
+
+</html>
\ No newline at end of file