diff --git a/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java b/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java
index 3a9feb8..b9caad9 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
@@ -345,5 +345,16 @@ public class DataSourceConfig {
 		dataSource.setPassword(dbpassword);
 		return dataSource;
 	}
+	
+	////////// DBFOT TOILETS //////////////////////
+	@Bean(name = "mysqlDBFOT_TOILETSDataSource")
+	public DataSource mysqlDBFOT_TOILETSDataSource() {
+		DriverManagerDataSource dataSource = new DriverManagerDataSource();
+		dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+		dataSource.setUrl("jdbc:mysql://" + host + "/dbfot_toilets");
+		dataSource.setUsername("root");
+		dataSource.setPassword(dbpassword);
+		return dataSource;
+	}
 
 }
diff --git a/src/main/java/com/gcc/commissionerreview/controller/DbfotApiController.java b/src/main/java/com/gcc/commissionerreview/controller/DbfotApiController.java
new file mode 100644
index 0000000..4837cc4
--- /dev/null
+++ b/src/main/java/com/gcc/commissionerreview/controller/DbfotApiController.java
@@ -0,0 +1,160 @@
+package com.gcc.commissionerreview.controller;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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.DbfotService;
+
+@RestController
+@RequestMapping("/commissionerreview/api/dbfot")
+public class DbfotApiController {
+
+	@Autowired
+	private DbfotService dbfotService;
+	
+	
+	
+	
+	@GetMapping("/getzones")
+	public Map<String, Object> ViewZoneDropdown() {
+
+	    Map<String, Object> response = new HashMap<>();
+
+	    List<Map<String, Object>> zones = dbfotService.ViewZoneDropdown();
+
+	    if (!zones.isEmpty()) {
+	        response.put("status", true);
+	        response.put("message", "Zone list fetched successfully");
+	        response.put("data", zones);
+	    } else {
+	        response.put("status", false);
+	        response.put("message", "No zones found");
+	        response.put("data", Collections.emptyList());
+	    }
+
+	    return response;
+	}
+	
+	@GetMapping("/getwardbyzone")
+	public Map<String, Object> ViewWardDropdown(@RequestParam String zone) {
+
+	    Map<String, Object> response = new HashMap<>();
+
+	    List<Map<String, Object>> wards = dbfotService.ViewWardDropdown(zone);
+
+	    if (!wards.isEmpty()) {
+	        response.put("status", true);
+	        response.put("message", "Ward list fetched successfully");
+	        response.put("data", wards);
+	    } else {
+	        response.put("status", false);
+	        response.put("message", "No wards found");
+	        response.put("data", Collections.emptyList());
+	    }
+
+	    return response;
+	}
+	
+	@GetMapping("/getpctstatus")
+	public Map<String, Object> ViewPctStatusDropdown() {
+
+	    Map<String, Object> response = new HashMap<>();
+
+	    List<Map<String, Object>> status = dbfotService.ViewPctStatusDropdown();
+
+	    if (!status.isEmpty()) {
+	        response.put("status", true);
+	        response.put("message", "Pct Status fetched successfully");
+	        response.put("data", status);
+	    } else {
+	        response.put("status", false);
+	        response.put("message", "No Pct Status found");
+	        response.put("data", Collections.emptyList());
+	    }
+
+	    return response;
+	}
+	
+	// location overview
+	
+	@GetMapping("/getdashboardsummary")
+	public Map<String, Object> getDashboardSummary(@RequestParam(required = false) String date,
+			@RequestParam(required = false) String zone, @RequestParam(required = false) String ward,
+			@RequestParam(required = false) String status, @RequestParam(required = false) String searchAddress) {
+
+		return dbfotService.getDashboardSummary(date, zone, ward, status, searchAddress);
+	}
+	
+
+	@GetMapping("/getpctcomplaints")
+	public Map<String, Object> getPctComplaints(@RequestParam String pct, @RequestParam(required = false) String date,
+			@RequestParam(required = false) String zone, @RequestParam(required = false) String ward,
+			@RequestParam(required = false) String status, @RequestParam(required = false) String searchAddress,
+			@RequestParam(required = false, defaultValue = "ALL") String complaintStatus) {
+
+		return dbfotService.getPctComplaints(pct, date, zone, ward, status, searchAddress, complaintStatus);
+	}
+
+	@GetMapping("/getcomplainttimeline")
+	public Map<String, Object> getComplaintTimeline(
+	        @RequestParam("complaint_id") String complaintId) {
+
+	    return dbfotService.getComplaintTimeline(complaintId);
+	}
+	
+	@GetMapping("/getmanpowerdetails")
+	public Map<String, Object> getManpowerDetails(@RequestParam("pct") String pct,
+			@RequestParam(required = false) String date, @RequestParam(required = false) String zone,
+			@RequestParam(required = false) String ward, @RequestParam(required = false) String status,
+			@RequestParam(required = false) String searchAddress) {
+
+		return dbfotService.getManpowerDetails(pct, date, zone, ward, status, searchAddress);
+	}
+	
+	// complaints overview
+	
+	@GetMapping("/getlocationsbyward")
+	public Map<String, Object> ViewLocationDropdown(@RequestParam String ward) {
+
+	    Map<String, Object> response = new HashMap<>();
+
+	    List<Map<String, Object>> wards = dbfotService.ViewLocationDropdown(ward);
+
+	    if (!wards.isEmpty()) {
+	        response.put("status", true);
+	        response.put("message", "Location list fetched successfully");
+	        response.put("data", wards);
+	    } else {
+	        response.put("status", false);
+	        response.put("message", "No Location found");
+	        response.put("data", Collections.emptyList());
+	    }
+
+	    return response;
+	}
+	
+	@GetMapping("/getcomplaintsoverview")
+	public Map<String, Object> getComplaintsOverview(@RequestParam String date,
+			@RequestParam(required = false) String zone, @RequestParam(required = false) String ward,
+			@RequestParam(required = false) String location, @RequestParam(required = false) String status,
+			@RequestParam(required = false) String source, @RequestParam(required = false) String searchAddress) {
+
+		if (date == null || date.trim().isEmpty()) {
+			Map<String, Object> response = new HashMap<>();
+			response.put("status", "Failed");
+			response.put("message", "Date is mandatory");
+			return response;
+		}
+
+		return dbfotService.getComplaintsOverview(date, zone, ward, location, status, source, searchAddress);
+	}
+	
+}
diff --git a/src/main/java/com/gcc/commissionerreview/controller/MainController.java b/src/main/java/com/gcc/commissionerreview/controller/MainController.java
index 6e8858a..e8258ee 100644
--- a/src/main/java/com/gcc/commissionerreview/controller/MainController.java
+++ b/src/main/java/com/gcc/commissionerreview/controller/MainController.java
@@ -446,5 +446,15 @@ public class MainController {
     	return "modules/roadwarweb/roadwarregisterdashboard";
     }
     
+    @GetMapping("/dbfot/locDetails")
+    public String locDetails(){
+    	return "modules/dbfot/locDetails";
+    }
+    
+    @GetMapping("/dbfot/CompDetails")
+    public String CompDetails(){
+    	return "modules/dbfot/CompDetails";
+    }
+    
 
 }
diff --git a/src/main/java/com/gcc/commissionerreview/controller/RoadWarApiController.java b/src/main/java/com/gcc/commissionerreview/controller/RoadWarApiController.java
index b7c0240..e0d28d5 100644
--- a/src/main/java/com/gcc/commissionerreview/controller/RoadWarApiController.java
+++ b/src/main/java/com/gcc/commissionerreview/controller/RoadWarApiController.java
@@ -158,6 +158,23 @@ public class RoadWarApiController {
 	
 	//for road war register dashboard
 	
+	@GetMapping("/getTotalRoadByGIS")
+	public Map<String, Object> getTotalRoadByGIS(){
+			
+		Map<String, Object> response = new HashMap<>();
+		List<Map<String, Object>> roads = roadWarService.getTotalRoadByGIS();
+		if (!roads.isEmpty()) {
+			response.put("status", true);
+			response.put("message", "Total Road counts By GIS fetched successfully");
+			response.put("data", roads);
+		} else {
+			response.put("status", false);
+			response.put("message", "No roads counts found");
+			response.put("data", Collections.emptyList());
+		}
+		return response;
+	}
+	
 	@GetMapping("/getdashboardsummary")
 	public Map<String, Object> getDashboardSummary(@RequestParam(required = false) String zone,
 			@RequestParam(required = false) String ward, @RequestParam(required = false) Integer roadType,
diff --git a/src/main/java/com/gcc/commissionerreview/service/DbfotService.java b/src/main/java/com/gcc/commissionerreview/service/DbfotService.java
new file mode 100644
index 0000000..50b65c4
--- /dev/null
+++ b/src/main/java/com/gcc/commissionerreview/service/DbfotService.java
@@ -0,0 +1,832 @@
+package com.gcc.commissionerreview.service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+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.jdbc.core.namedparam.MapSqlParameterSource;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DbfotService {
+
+	@Autowired
+	@Value("${fileBaseUrl}")
+
+	private String fileBaseUrl;
+	@Autowired
+	private JdbcTemplate jdbcTemplate;
+	
+	@Autowired
+	private Environment environment;
+	
+	
+	
+	@Autowired
+	public void setDataSource(@Qualifier("mysqlDBFOT_TOILETSDataSource") DataSource DataSource) {
+		this.jdbcTemplate = new JdbcTemplate(DataSource);
+		
+	}
+	
+	public DbfotService(Environment environment) {
+
+		this.environment = environment;
+
+		this.fileBaseUrl = environment.getProperty("fileBaseUrl");
+	}
+	
+	public List<Map<String, Object>> ViewZoneDropdown() {
+		String sql = "SELECT DISTINCT(zone) "
+	    		+ "FROM pct_master "
+	    		+ "WHERE isactive=1 AND isdelete=0 ORDER BY zone";
+	    try {
+	    	return jdbcTemplate.queryForList(sql);
+		} catch (Exception e) {
+			// TODO: handle exception
+			 e.printStackTrace();
+			 return Collections.emptyList();
+		}
+	}
+	
+	public List<Map<String, Object>> ViewWardDropdown(String zone) {
+		String sql = "SELECT DISTINCT(ward) "
+	    		+ "FROM pct_master "
+	    		+ "WHERE isactive=1 AND isdelete=0 AND zone=? ORDER BY ward";
+	    try {
+	    	return jdbcTemplate.queryForList(sql,zone);
+		} catch (Exception e) {
+			// TODO: handle exception
+			 e.printStackTrace();
+			 return Collections.emptyList();
+		}
+	}
+
+	public List<Map<String, Object>> ViewPctStatusDropdown() {
+		String sql = "SELECT DISTINCT(status) "
+	    		+ "FROM pct_master "
+	    		+ "WHERE isactive=1 AND isdelete=0 ORDER BY status";
+	    try {
+	    	return jdbcTemplate.queryForList(sql);
+		} catch (Exception e) {
+			// TODO: handle exception
+			 e.printStackTrace();
+			 return Collections.emptyList();
+		}
+	}
+
+
+	public Map<String, Object> getDashboardSummary(String date, String zone, String ward, String status,
+			String searchAddress) {
+
+		Map<String, Object> response = new HashMap<>();
+
+		try {
+
+			// Default date to today
+			String selectedDate = (date == null || date.trim().isEmpty()) ? java.time.LocalDate.now().toString()
+					: date.trim();
+
+			// ==========================================
+			// 1. OVERALL COUNTS - NO FILTERS
+			// ==========================================
+
+			String totalLocationsSql = "SELECT COUNT(*) FROM pct_master " + "WHERE isactive = 1 AND isdelete = 0";
+
+			Integer totalLocations = jdbcTemplate.queryForObject(totalLocationsSql, Integer.class);
+
+			String activeLocationsSql = "SELECT COUNT(*) FROM pct_master " + "WHERE UPPER(TRIM(status)) = 'ACTIVE' "
+					+ "AND isactive = 1 AND isdelete = 0";
+
+			Integer totalActiveLocations = jdbcTemplate.queryForObject(activeLocationsSql, Integer.class);
+
+			String totalComplaintsSql = "SELECT COUNT(*) FROM complaints_details "
+					+ "WHERE isactive = 1 AND isdelete = 0";
+
+			Integer totalComplaints = jdbcTemplate.queryForObject(totalComplaintsSql, Integer.class);
+
+			// ==========================================
+			// 2. BUILD FILTERS AND PARAMETERS
+			// ==========================================
+
+			StringBuilder filters = new StringBuilder();
+			List<Object> filterParams = new ArrayList<>();
+
+			if (zone != null && !zone.trim().isEmpty() && !"ALL".equalsIgnoreCase(zone.trim())) {
+
+				filters.append(" AND pm.zone = ? ");
+				filterParams.add(zone.trim());
+			}
+
+			if (ward != null && !ward.trim().isEmpty() && !"ALL".equalsIgnoreCase(ward.trim())) {
+
+				filters.append(" AND pm.ward = ? ");
+				filterParams.add(ward.trim());
+			}
+
+			if (status != null && !status.trim().isEmpty() && !"ALL".equalsIgnoreCase(status.trim())) {
+
+				filters.append(" AND UPPER(TRIM(pm.status)) = ? ");
+
+				filterParams.add(status.trim().toUpperCase());
+			}
+
+			if (searchAddress != null && !searchAddress.trim().isEmpty()) {
+
+				filters.append(" AND pm.address LIKE ? ");
+
+				filterParams.add("%" + searchAddress.trim() + "%");
+			}
+
+			// ==========================================
+			// 3. LOCATION TABLE
+			// ==========================================
+
+			String locationsSql = "SELECT " + " pm.id, " + " pm.pct, " + " pm.zone, " + " pm.ward, " + " pm.address, "
+					+ " pm.status, " + " COALESCE(mp.manpower_count, 0) AS manpower, "
+					+ " COALESCE(cc.total_complaints, 0) AS total_complaints, " + " COALESCE(cc.opened, 0) AS opened, "
+					+ " COALESCE(cc.under_review, 0) AS under_review, "
+					+ " COALESCE(cc.pending_closure, 0) AS pending_closure, " + " COALESCE(cc.closed, 0) AS closed " +
+
+					"FROM pct_master pm " +
+
+					// Manpower present per PCT on selected date
+					"LEFT JOIN ( " + "   SELECT me.pct, COUNT(*) AS manpower_count " + "   FROM man_power_employees me "
+					+ "   WHERE me.att_date >= ? " + "     AND me.att_date < DATE_ADD(?, INTERVAL 1 DAY) "
+					+ "     AND me.isactive = 1 AND me.isdelete = 0 " + "     AND EXISTS ( "
+					+ "         SELECT 1 FROM man_power_details md " + "         WHERE md.pct = me.pct "
+					+ "           AND md.isactive = 1 AND md.isdelete = 0 " + "     ) " + "   GROUP BY me.pct "
+					+ ") mp ON mp.pct = pm.pct " +
+
+					// Complaint counts per PCT
+					"LEFT JOIN ( " + "   SELECT " + "       cd.pct, " + "       COUNT(*) AS total_complaints, " +
+
+					"       SUM(CASE WHEN UPPER(TRIM(cd.status)) = 'OPEN' "
+					+ "           THEN 1 ELSE 0 END) AS opened, " +
+
+					"       SUM(CASE WHEN UPPER(TRIM(cd.status)) = 'UNDER REVIEW' "
+					+ "           THEN 1 ELSE 0 END) AS under_review, " +
+
+					"       SUM(CASE WHEN UPPER(TRIM(cd.status)) = 'PENDING CLOSURE' "
+					+ "           THEN 1 ELSE 0 END) AS pending_closure, " +
+
+					"       SUM(CASE WHEN UPPER(TRIM(cd.status)) = 'CLOSED' "
+					+ "           THEN 1 ELSE 0 END) AS closed " +
+
+					"   FROM complaints_details cd " + "   WHERE cd.isactive = 1 AND cd.isdelete = 0 "
+					+"     AND cd.complaint_raised_on >= ? " +
+					"     AND cd.complaint_raised_on < DATE_ADD(?, INTERVAL 1 DAY) " 
+					+ "   GROUP BY cd.pct " + ") cc ON cc.pct = pm.pct " +
+
+					"WHERE pm.isactive = 1 AND pm.isdelete = 0 " + filters + " ORDER BY pm.zone, pm.ward, pm.address";
+
+			// The first two parameters belong to the manpower subquery.
+			List<Object> locationParams = new ArrayList<>();
+
+			locationParams.add(java.sql.Date.valueOf(selectedDate));
+			locationParams.add(java.sql.Date.valueOf(selectedDate));
+			
+			locationParams.add(java.sql.Date.valueOf(selectedDate));
+			locationParams.add(java.sql.Date.valueOf(selectedDate));
+
+
+			// Append filter parameters in SQL order.
+			locationParams.addAll(filterParams);
+
+			List<Map<String, Object>> locations = jdbcTemplate.queryForList(locationsSql, locationParams.toArray());
+
+			// ==========================================
+			// 4. TODAY'S COMPLAINTS - FILTERED
+			// ==========================================
+
+			String todayComplaintsSql = "SELECT COUNT(*) " + "FROM complaints_details cd "
+					+ "INNER JOIN pct_master pm ON pm.pct = cd.pct " + "WHERE cd.complaint_raised_on >= ? "
+					+ "AND cd.complaint_raised_on < DATE_ADD(?, INTERVAL 1 DAY) "
+					+ "AND cd.isactive = 1 AND cd.isdelete = 0 " + "AND pm.isactive = 1 AND pm.isdelete = 0 " + filters;
+
+			List<Object> todayParams = new ArrayList<>();
+
+			todayParams.add(java.sql.Date.valueOf(selectedDate));
+			todayParams.add(java.sql.Date.valueOf(selectedDate));
+			todayParams.addAll(filterParams);
+
+			Integer todaysComplaints = jdbcTemplate.queryForObject(todayComplaintsSql, Integer.class,
+					todayParams.toArray());
+
+			// ==========================================
+			// 5. MANPOWER PRESENT - FILTERED TOTAL
+			// ==========================================
+
+			int manpowerPresent = 0;
+
+			for (Map<String, Object> row : locations) {
+
+				Object manpower = row.get("manpower");
+
+				if (manpower instanceof Number) {
+					manpowerPresent += ((Number) manpower).intValue();
+				}
+			}
+
+			// ==========================================
+			// 6. RESPONSE
+			// ==========================================
+
+			response.put("totalLocations", totalLocations != null ? totalLocations : 0);
+
+			response.put("totalActiveLocations", totalActiveLocations != null ? totalActiveLocations : 0);
+
+			response.put("totalComplaints", totalComplaints != null ? totalComplaints : 0);
+
+			response.put("todaysComplaints", todaysComplaints != null ? todaysComplaints : 0);
+
+			response.put("manpowerPresent", manpowerPresent);
+
+			response.put("locations", locations);
+
+			response.put("status", "Success");
+			response.put("message", "Fetched dashboard summary Successfully");
+
+		} catch (Exception e) {
+
+			e.printStackTrace();
+
+			response.put("status", "Failed");
+			response.put("message", "Error while fetching dashboard summary");
+		}
+
+		return response;
+	}
+	
+	
+	public Map<String, Object> getPctComplaints(String pct, String date, String zone, String ward, String status,
+			String searchAddress, String complaintStatus) {
+
+		Map<String, Object> response = new HashMap<>();
+
+		try {
+
+			if (pct == null || pct.trim().isEmpty()) {
+				response.put("status", "Failed");
+				response.put("message", "PCT is required");
+				return response;
+			}
+
+			String pctValue = pct.trim();
+
+			// ==========================================
+			// 1. FETCH PCT DETAILS
+			// ==========================================
+
+			String pctSql = "SELECT id, pct, zone, ward, address, status " + "FROM pct_master "
+					+ "WHERE pct = ? AND isactive = 1 AND isdelete = 0";
+
+			List<Map<String, Object>> pctList = jdbcTemplate.queryForList(pctSql, pctValue);
+
+			if (pctList.isEmpty()) {
+				response.put("status", "Failed");
+				response.put("message", "PCT not found");
+				return response;
+			}
+
+			Map<String, Object> pctDetails = pctList.get(0);
+
+			// ==========================================
+			// 2. BUILD COMMON FILTERS
+			// ==========================================
+
+			StringBuilder conditions = new StringBuilder();
+
+			List<Object> commonParams = new ArrayList<>();
+
+			conditions.append(" AND cd.pct = ? ");
+			commonParams.add(pctValue);
+
+			conditions.append(" AND cd.isactive = 1 AND cd.isdelete = 0 ");
+			conditions.append(" AND pm.isactive = 1 AND pm.isdelete = 0 ");
+
+			if (date != null && !date.trim().isEmpty()) {
+
+				java.sql.Date selectedDate = java.sql.Date.valueOf(date.trim());
+
+				conditions.append(" AND cd.complaint_raised_on >= ? "
+						+ " AND cd.complaint_raised_on < DATE_ADD(?, INTERVAL 1 DAY) ");
+
+				commonParams.add(selectedDate);
+				commonParams.add(selectedDate);
+			}
+
+			if (zone != null && !zone.trim().isEmpty() && !"ALL".equalsIgnoreCase(zone.trim())) {
+
+				conditions.append(" AND pm.zone = ? ");
+				commonParams.add(zone.trim());
+			}
+
+			if (ward != null && !ward.trim().isEmpty() && !"ALL".equalsIgnoreCase(ward.trim())) {
+
+				conditions.append(" AND pm.ward = ? ");
+				commonParams.add(ward.trim());
+			}
+
+			if (status != null && !status.trim().isEmpty() && !"ALL".equalsIgnoreCase(status.trim())) {
+
+				conditions.append(" AND UPPER(TRIM(pm.status)) = ? ");
+				commonParams.add(status.trim().toUpperCase());
+			}
+
+			if (searchAddress != null && !searchAddress.trim().isEmpty()) {
+
+				conditions.append(" AND pm.address LIKE ? ");
+				commonParams.add("%" + searchAddress.trim() + "%");
+			}
+
+			String baseFrom = " FROM complaints_details cd " + " LEFT JOIN pct_master pm ON pm.pct = cd.pct "
+					+ " WHERE 1 = 1 " + conditions;
+
+			// ==========================================
+			// 3. COUNTS FOR ALL FIVE TABS
+			// ==========================================
+
+			String countsSql = "SELECT " + " COUNT(*) AS all_count, " +
+
+					" COALESCE(SUM(CASE " + "   WHEN UPPER(TRIM(cd.status)) = 'OPEN' "
+					+ "   THEN 1 ELSE 0 END), 0) AS opened, " +
+
+					" COALESCE(SUM(CASE " + "   WHEN UPPER(TRIM(cd.status)) = 'UNDER REVIEW' "
+					+ "   THEN 1 ELSE 0 END), 0) AS under_review, " +
+
+					" COALESCE(SUM(CASE " + "   WHEN UPPER(TRIM(cd.status)) = 'PENDING CLOSURE' "
+					+ "   THEN 1 ELSE 0 END), 0) AS pending_closure, " +
+
+					" COALESCE(SUM(CASE " + "   WHEN UPPER(TRIM(cd.status)) = 'CLOSED' "
+					+ "   THEN 1 ELSE 0 END), 0) AS closed " +
+
+					baseFrom;
+
+			Map<String, Object> tabCounts = jdbcTemplate.queryForMap(countsSql, commonParams.toArray());
+
+			// ==========================================
+			// 4. FETCH COMPLAINTS FOR SELECTED TAB
+			// ==========================================
+
+			StringBuilder complaintStatusCondition = new StringBuilder();
+			List<Object> complaintParams = new ArrayList<>(commonParams);
+
+			if (complaintStatus != null && !complaintStatus.trim().isEmpty()
+					&& !"ALL".equalsIgnoreCase(complaintStatus.trim())) {
+
+				String normalizedStatus = complaintStatus.trim().toUpperCase();
+
+				List<String> allowedStatuses = Arrays.asList("OPEN", "UNDER REVIEW", "PENDING CLOSURE", "CLOSED");
+
+				if (!allowedStatuses.contains(normalizedStatus)) {
+					response.put("status", "Failed");
+					response.put("message", "Invalid complaint status");
+					return response;
+				}
+
+				complaintStatusCondition.append(" AND UPPER(TRIM(cd.status)) = ? ");
+
+				complaintParams.add(normalizedStatus);
+			}
+
+			String complaintsSql = "SELECT " + " cd.id, " + " cd.pct, " + " cd.complaint_id, "
+					+ " cd.status AS complaint_status, " + " cd.source, " + " cd.description, "
+					+ " cd.complaint_raised_on, " + " cd.turn_around_time, " + " cd.created_date, " + " cd.location, "
+					+ " cd.address " + baseFrom + complaintStatusCondition
+					+ " ORDER BY cd.complaint_raised_on DESC, cd.id DESC";
+
+			List<Map<String, Object>> complaints = jdbcTemplate.queryForList(complaintsSql, complaintParams.toArray());
+
+			// ==========================================
+			// 5. RESPONSE
+			// ==========================================
+
+			response.put("status", "Success");
+			response.put("pctDetails", pctDetails);
+			response.put("tabCounts", tabCounts);
+			response.put("complaints", complaints);
+			response.put("selectedComplaintStatus", complaintStatus == null ? "ALL" : complaintStatus.toUpperCase());
+
+		} catch (Exception e) {
+
+			e.printStackTrace();
+
+			response.put("status", "Failed");
+			response.put("message", "Error while fetching PCT complaints");
+		}
+
+		return response;
+	}
+	
+	public Map<String, Object> getComplaintTimeline(String complaintId) {
+
+	    Map<String, Object> response = new HashMap<>();
+
+	    try {
+
+	        if (complaintId == null || complaintId.trim().isEmpty()) {
+	            response.put("status", "Failed");
+	            response.put("message", "Complaint ID is required");
+	            return response;
+	        }
+
+	        String sql =
+	                "SELECT " +
+	                " cd.id AS complaint_detail_id, " +
+	                " cd.complaint_id, " +
+	                " cd.status AS current_status, " +
+	                " cd.description, " +
+	                " cd.source, " +
+	                " cd.location, " +
+	                " cd.address, " +
+	                " cd.complaint_raised_on AS current_raised_on, " +
+	                " cd.turn_around_time, " +
+	                " ch.id AS history_id, " +
+	                " ch.status AS history_status, " +
+	                " ch.remarks, " +
+	                " ch.complaint_raised_on, " +
+	                " ch.complaint_raised_by, " +
+	                " ch.complaint_updated_on, " +
+	                " ch.complaint_updated_by, " +
+	                
+	                " CASE " +
+	                "   WHEN ch.imgfile IS NOT NULL AND TRIM(ch.imgfile) <> '' " +
+	                "   THEN CONCAT('" + fileBaseUrl + "/gccofficialapp/files', ch.imgfile) " +
+	                "   ELSE NULL " +
+	                " END AS imgfile " +
+	                "FROM complaints_details cd " +
+
+	                "LEFT JOIN complaints_history ch " +
+	                " ON ch.complaint_id = cd.complaint_id " +
+	                " AND ch.isactive = 1 " +
+	                " AND ch.isdelete = 0 " +
+
+	                "WHERE cd.complaint_id = ? " +
+	                " AND cd.isactive = 1 " +
+	                " AND cd.isdelete = 0 " +
+
+	                "ORDER BY ch.complaint_updated_on DESC, ch.id DESC";
+
+	        List<Map<String, Object>> rows =
+	                jdbcTemplate.queryForList(sql, complaintId.trim());
+
+	        if (rows.isEmpty()) {
+	            response.put("status", "Failed");
+	            response.put("message", "Complaint not found");
+	            return response;
+	        }
+
+	        // Header information from complaints_details.
+	        Map<String, Object> firstRow = rows.get(0);
+
+	        Map<String, Object> complaint = new HashMap<>();
+
+	        complaint.put("complaint_id", firstRow.get("complaint_id"));
+	        complaint.put("current_status", firstRow.get("current_status"));
+	        complaint.put("description", firstRow.get("description"));
+	        complaint.put("source", firstRow.get("source"));
+	        complaint.put("location", firstRow.get("location"));
+	        complaint.put("address", firstRow.get("address"));
+	        complaint.put("turn_around_time",firstRow.get("turn_around_time"));
+	        complaint.put("complaint_raised_on",
+	                firstRow.get("current_raised_on"));
+
+	        // Timeline records from complaints_history.
+	        List<Map<String, Object>> timeline = new ArrayList<>();
+
+	        for (Map<String, Object> row : rows) {
+
+	            // LEFT JOIN may return a complaint without history.
+	            if (row.get("history_id") == null) {
+	                continue;
+	            }
+
+	            Map<String, Object> history = new HashMap<>();
+
+	            history.put("id", row.get("history_id"));
+	            history.put("status", row.get("history_status"));
+	            history.put("remarks", row.get("remarks"));
+
+	            history.put("complaint_raised_on",
+	                    row.get("complaint_raised_on"));
+
+	            history.put("complaint_raised_by",
+	                    row.get("complaint_raised_by"));
+
+	            history.put("complaint_updated_on",
+	                    row.get("complaint_updated_on"));
+
+	            history.put("complaint_updated_by",
+	                    row.get("complaint_updated_by"));
+
+	            history.put("imgfile", row.get("imgfile"));
+
+	            timeline.add(history);
+	        }
+
+	        response.put("status", "Success");
+	        response.put("complaint", complaint);
+	        response.put("timeline", timeline);
+	        response.put("message", "Complaint timeline fetched successfully");
+
+	    } catch (Exception e) {
+
+	        e.printStackTrace();
+
+	        response.put("status", "Failed");
+	        response.put("message", "Error while fetching complaint timeline");
+	    }
+
+	    return response;
+	}
+	
+	public Map<String, Object> getManpowerDetails(String pct, String date, String zone, String ward, String status,
+			String searchAddress) {
+
+		Map<String, Object> response = new HashMap<>();
+
+		try {
+			if (pct == null || pct.trim().isEmpty()) {
+				response.put("status", "Failed");
+				response.put("message", "PCT is required");
+				return response;
+			}
+
+			String selectedDate = (date == null || date.trim().isEmpty()) ? java.time.LocalDate.now().toString()
+					: date.trim();
+
+			java.sql.Date attendanceDate = java.sql.Date.valueOf(selectedDate);
+
+			StringBuilder filters = new StringBuilder();
+			List<Object> params = new ArrayList<>();
+
+			// Attendance date parameters
+			params.add(attendanceDate);
+			params.add(attendanceDate);
+
+			// The selected PCT
+			filters.append(" AND pm.pct = ? ");
+			params.add(pct.trim());
+
+			// Same dashboard filters
+			if (zone != null && !zone.trim().isEmpty() && !"ALL".equalsIgnoreCase(zone.trim())) {
+				filters.append(" AND pm.zone = ? ");
+				params.add(zone.trim());
+			}
+
+			if (ward != null && !ward.trim().isEmpty() && !"ALL".equalsIgnoreCase(ward.trim())) {
+				filters.append(" AND pm.ward = ? ");
+				params.add(ward.trim());
+			}
+
+			if (status != null && !status.trim().isEmpty() && !"ALL".equalsIgnoreCase(status.trim())) {
+				filters.append(" AND UPPER(TRIM(pm.status)) = ? ");
+				params.add(status.trim().toUpperCase());
+			}
+
+			if (searchAddress != null && !searchAddress.trim().isEmpty()) {
+				filters.append(" AND pm.address LIKE ? ");
+				params.add("%" + searchAddress.trim() + "%");
+			}
+
+			String sql = "SELECT " + " pm.id AS pct_id, " + " pm.pct, " + " pm.address, " + " pm.zone, " + " pm.ward, "
+					+ " pm.status AS pct_status, " + " me.id AS employee_id, " + " me.emp_name, "
+					+ " me.mobile_number, " + " me.att_date, " + " me.location, " + " CASE "
+					+ "   WHEN me.imgfile IS NOT NULL " + "        AND TRIM(me.imgfile) <> '' " + "   THEN CONCAT('"
+					+ fileBaseUrl + "/gccofficialapp/files', me.imgfile) " + "   ELSE NULL " + " END AS file_url " +
+
+					"FROM pct_master pm " +
+
+					"LEFT JOIN man_power_employees me " + " ON me.pct = pm.pct " + " AND me.att_date >= ? "
+					+ " AND me.att_date < DATE_ADD(?, INTERVAL 1 DAY) " + " AND me.isactive = 1 "
+					+ " AND me.isdelete = 0 " +
+
+					"WHERE pm.isactive = 1 " + " AND pm.isdelete = 0 " +
+
+					" AND EXISTS ( " + "   SELECT 1 FROM man_power_details md " + "   WHERE md.pct = pm.pct "
+					+ "   AND md.isactive = 1 " + "   AND md.isdelete = 0 " + " ) " +
+
+					filters +
+
+					" ORDER BY me.att_date DESC, me.id DESC";
+
+			List<Map<String, Object>> rows = jdbcTemplate.queryForList(sql, params.toArray());
+
+			if (rows.isEmpty()) {
+				response.put("status", "Failed");
+				response.put("message", "No manpower attendance found for the selected PCT and date");
+				response.put("employees", Collections.emptyList());
+				return response;
+			}
+
+			Map<String, Object> firstRow = rows.get(0);
+
+			Map<String, Object> pctDetails = new HashMap<>();
+			pctDetails.put("pct_id", firstRow.get("pct_id"));
+			pctDetails.put("pct", firstRow.get("pct"));
+			pctDetails.put("address", firstRow.get("address"));
+			pctDetails.put("zone", firstRow.get("zone"));
+			pctDetails.put("ward", firstRow.get("ward"));
+			pctDetails.put("status", firstRow.get("pct_status"));
+			pctDetails.put("date", selectedDate);
+
+			List<Map<String, Object>> employees = new ArrayList<>();
+
+			for (Map<String, Object> row : rows) {
+				Map<String, Object> employee = new HashMap<>();
+
+				employee.put("id", row.get("employee_id"));
+				employee.put("emp_name", row.get("emp_name"));
+				employee.put("mobile_number", row.get("mobile_number"));
+				employee.put("att_date", row.get("att_date"));
+				employee.put("location", row.get("location"));
+				employee.put("imgfile", row.get("file_url"));
+
+				employees.add(employee);
+			}
+
+			response.put("status", "Success");
+			response.put("message", "Manpower details fetched successfully");
+			response.put("pctDetails", pctDetails);
+			response.put("employees", employees);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+
+			response.put("status", "Failed");
+			response.put("message", "Error while fetching manpower details");
+		}
+
+		return response;
+	}
+	
+	// complainyts overview
+	
+	public List<Map<String, Object>> ViewLocationDropdown(String ward) {
+		String sql = "SELECT DISTINCT(address),pct "
+	    		+ "FROM pct_master "
+	    		+ "WHERE isactive=1 AND isdelete=0 AND ward=? ORDER BY address";
+	    try {
+	    	return jdbcTemplate.queryForList(sql,ward);
+		} catch (Exception e) {
+			// TODO: handle exception
+			 e.printStackTrace();
+			 return Collections.emptyList();
+		}
+	}
+	
+	public Map<String, Object> getComplaintsOverview(
+	        String date,
+	        String zone,
+	        String ward,
+	        String location,
+	        String status,
+	        String source,
+	        String searchAddress) {
+
+	    Map<String, Object> response = new HashMap<>();
+
+	    try {
+	        java.time.LocalDate selectedDate =
+	                java.time.LocalDate.parse(date.trim());
+
+	        StringBuilder filters = new StringBuilder();
+	        List<Object> params = new ArrayList<>();
+
+	        filters.append(" AND cd.complaint_raised_on >= ? ");
+	        filters.append(" AND cd.complaint_raised_on < DATE_ADD(?, INTERVAL 1 DAY) ");
+
+	        params.add(java.sql.Date.valueOf(selectedDate));
+	        params.add(java.sql.Date.valueOf(selectedDate));
+
+	        if (zone != null && !zone.trim().isEmpty()
+	                && !"ALL".equalsIgnoreCase(zone.trim())) {
+	            filters.append(" AND pm.zone = ? ");
+	            params.add(zone.trim());
+	        }
+
+	        if (ward != null && !ward.trim().isEmpty()
+	                && !"ALL".equalsIgnoreCase(ward.trim())) {
+	            filters.append(" AND pm.ward = ? ");
+	            params.add(ward.trim());
+	        }
+
+	        if (location != null && !location.trim().isEmpty()
+	                && !"ALL".equalsIgnoreCase(location.trim())) {
+	            filters.append(" AND pm.pct = ? ");
+	            params.add(location.trim());
+	        }
+
+	        if (status != null && !status.trim().isEmpty()
+	                && !"ALL".equalsIgnoreCase(status.trim())) {
+	            filters.append(" AND UPPER(TRIM(cd.status)) = ? ");
+	            params.add(status.trim().toUpperCase());
+	        }
+
+	        if (source != null && !source.trim().isEmpty()
+	                && !"ALL".equalsIgnoreCase(source.trim())) {
+	            filters.append(" AND LOWER(TRIM(cd.source)) = LOWER(?) ");
+	            params.add(source.trim());
+	        }
+
+	        if (searchAddress != null && !searchAddress.trim().isEmpty()) {
+	            filters.append(" AND pm.address LIKE ? ");
+	            params.add("%" + searchAddress.trim() + "%");
+	        }
+
+	        String baseWhere =
+	                " FROM complaints_details cd " +
+	                " INNER JOIN pct_master pm ON pm.pct = cd.pct " +
+	                " WHERE cd.isactive = 1 AND cd.isdelete = 0 " +
+	                " AND pm.isactive = 1 AND pm.isdelete = 0 " +
+	                filters;
+
+	        // 1. Summary cards: all filters apply.
+	        String summarySql =
+	                "SELECT COUNT(*) AS total_complaints, " +
+	                "COALESCE(SUM(CASE WHEN UPPER(TRIM(cd.status)) = 'OPEN' " +
+	                "THEN 1 ELSE 0 END), 0) AS opened, " +
+	                "COALESCE(SUM(CASE WHEN UPPER(TRIM(cd.status)) = 'UNDER REVIEW' " +
+	                "THEN 1 ELSE 0 END), 0) AS under_review, " +
+	                "COALESCE(SUM(CASE WHEN UPPER(TRIM(cd.status)) = 'PENDING CLOSURE' " +
+	                "THEN 1 ELSE 0 END), 0) AS pending_closure, " +
+	                "COALESCE(SUM(CASE WHEN UPPER(TRIM(cd.status)) = 'CLOSED' " +
+	                "THEN 1 ELSE 0 END), 0) AS closed " +
+	                baseWhere;
+
+	        Map<String, Object> summary =
+	                jdbcTemplate.queryForMap(summarySql, params.toArray());
+
+	        // 2. DataTable: one row per complaint.
+	        // The history subquery returns at most one row per complaint ID.
+	        String tableSql =
+	                "SELECT " +
+	                " pm.pct, pm.zone, pm.ward, pm.address, " +
+	                " cd.id AS complaint_detail_id, " +
+	                " cd.complaint_id, cd.description, " +
+	                " cd.turn_around_time, cd.source, cd.status, " +
+	                " cd.complaint_raised_on AS raised_on, " +
+	                " ch.closed_on " +
+	                baseWhere +
+	                " LEFT JOIN ( " +
+	                "   SELECT complaint_id, MAX(complaint_updated_on) AS closed_on " +
+	                "   FROM complaints_history " +
+	                "   WHERE UPPER(TRIM(status)) = 'CLOSED' " +
+	                "     AND isactive = 1 AND isdelete = 0 " +
+	                "   GROUP BY complaint_id " +
+	                " ) ch ON ch.complaint_id = cd.complaint_id " +
+	                " ORDER BY cd.complaint_raised_on DESC, cd.id DESC";
+
+	        // Put the history join before WHERE in the final SQL.
+	        tableSql =
+	                "SELECT pm.pct, pm.zone, pm.ward, pm.address, " +
+	                "cd.id AS complaint_detail_id, cd.complaint_id, " +
+	                "cd.description, cd.turn_around_time, cd.source, cd.status, " +
+	                "cd.complaint_raised_on AS raised_on, ch.closed_on " +
+	                "FROM complaints_details cd " +
+	                "INNER JOIN pct_master pm ON pm.pct = cd.pct " +
+	                "LEFT JOIN ( " +
+	                " SELECT complaint_id, MAX(complaint_updated_on) AS closed_on " +
+	                " FROM complaints_history " +
+	                " WHERE UPPER(TRIM(status)) = 'CLOSED' " +
+	                " AND isactive = 1 AND isdelete = 0 " +
+	                " GROUP BY complaint_id " +
+	                ") ch ON ch.complaint_id = cd.complaint_id " +
+	                "WHERE cd.isactive = 1 AND cd.isdelete = 0 " +
+	                "AND pm.isactive = 1 AND pm.isdelete = 0 " +
+	                filters +
+	                " ORDER BY cd.complaint_raised_on DESC, cd.id DESC";
+
+	        List<Map<String, Object>> complaints =
+	                jdbcTemplate.queryForList(tableSql, params.toArray());
+
+	        response.put("totalComplaints", summary.get("total_complaints"));
+	        response.put("opened", summary.get("opened"));
+	        response.put("underReview", summary.get("under_review"));
+	        response.put("pendingClosure", summary.get("pending_closure"));
+	        response.put("closed", summary.get("closed"));
+	        response.put("complaints", complaints);
+	        response.put("status", "Success");
+	        response.put("message", "Complaints overview fetched successfully");
+
+	    } catch (Exception e) {
+	        e.printStackTrace();
+	        response.put("status", "Failed");
+	        response.put("message", "Error while fetching complaints overview");
+	    }
+
+	    return response;
+	}
+
+}
diff --git a/src/main/java/com/gcc/commissionerreview/service/RoadWarService.java b/src/main/java/com/gcc/commissionerreview/service/RoadWarService.java
index 959b2d9..6e1f5cb 100644
--- a/src/main/java/com/gcc/commissionerreview/service/RoadWarService.java
+++ b/src/main/java/com/gcc/commissionerreview/service/RoadWarService.java
@@ -1,6 +1,9 @@
 package com.gcc.commissionerreview.service;
 
+import java.net.URI;
 import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -19,6 +22,7 @@ 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.web.client.RestTemplate;
 
 import com.itextpdf.text.Document;
 import com.itextpdf.text.PageSize;
@@ -26,8 +30,8 @@ import com.itextpdf.text.Paragraph;
 import com.itextpdf.text.DocumentException;
 import com.itextpdf.text.Element;
 import com.itextpdf.text.pdf.PdfWriter;
-
-
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.itextpdf.text.BaseColor;
 import com.itextpdf.text.Chunk;
 import com.itextpdf.text.Font;
@@ -1522,6 +1526,40 @@ public class RoadWarService {
 	
 	// for road war register dashboard
 	
+	
+	public List<Map<String, Object>> getTotalRoadByGIS() {
+		try {
+			String url = "https://gisgcc.chennaicorporation.gov.in/Java/proxy.jsp?https://gisgcc.chennaicorporation.gov.in/server/rest/services/GCCDepts/IT_API/FeatureServer/0/query?where=interior_brr+IN+%28%27BRR%27%2C%27Interior%27%29&fullText=&objectIds=&time=&geometry=&geometryType=esriGeometryEnvelope&inSR=4326&defaultSR=4326&spatialRel=esriSpatialRelIntersects&distance=&units=esriSRUnit_Meter&relationParam=&outFields=&returnGeometry=false&maxAllowableOffset=&geometryPrecision=&outSR=&havingClause=&gdbVersion=&historicMoment=&returnDistinctValues=false&returnIdsOnly=false&returnCountOnly=false&returnExtentOnly=false&orderByFields=&groupByFieldsForStatistics=&outStatistics=%5B%7B%22statisticType%22%3A%22count%22%2C%22onStatisticField%22%3A%22objectid%22%2C%22outStatisticFieldName%22%3A%22count%22%7D%5D&returnZ=false&returnM=false&multipatchOption=xyFootprint&resultOffset=&resultRecordCount=&returnTrueCurves=false&returnExceededLimitFeatures=false&quantizationParameters=&returnCentroid=false&returnEnvelope=false&timeReferenceUnknownClient=false&maxRecordCountFactor=&sqlFormat=none&resultType=&featureEncoding=esriDefault&datumTransformation=&cacheHint=false&f=pjson";
+
+			RestTemplate restTemplate = new RestTemplate();
+			String responseBody = restTemplate.getForObject(URI.create(url), String.class);
+
+			ObjectMapper objectMapper = new ObjectMapper();
+			JsonNode root = objectMapper.readTree(responseBody);
+			JsonNode features = root.path("features");
+
+			List<Map<String, Object>> roadList = new ArrayList<>();
+			if (features.isArray()) {
+				for (JsonNode feature : features) {
+					JsonNode props = feature.path("attributes");
+					String roadCount = props.path("count").asText();
+					
+					Map<String, Object> roadInfo = new HashMap<>();
+					roadInfo.put("roadCount", roadCount);
+					roadList.add(roadInfo);
+				}
+			}
+			return roadList;
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			return Collections.emptyList();
+		}
+	}
+	
+	
+	
+	
 	 public Map<String, Object> getDashboardSummary(
 	            String zone,
 	            String ward,
diff --git a/src/main/java/com/gcc/commissionerreview/service/StreetVendorService.java b/src/main/java/com/gcc/commissionerreview/service/StreetVendorService.java
index beac4ca..fa50848 100644
--- a/src/main/java/com/gcc/commissionerreview/service/StreetVendorService.java
+++ b/src/main/java/com/gcc/commissionerreview/service/StreetVendorService.java
@@ -79,9 +79,21 @@ public class StreetVendorService {
 	    sql.append("         THEN vd.id ");
 	    sql.append("     END) AS committee_processed, ");
 
-	    // 7. Total Processed
-	    sql.append("     ( ");
-
+	    
+	    // 7. Assistant Pending
+	    sql.append("     (COUNT(DISTINCT vd.id) - ");
+	    sql.append("      COUNT(DISTINCT CASE ");
+	    sql.append("          WHEN vd.tamil_name IS NOT NULL AND vd.tamil_name <> '' ");
+	    sql.append("          AND vd.tamil_f_h_name IS NOT NULL AND vd.tamil_f_h_name <> '' ");
+	    sql.append("          AND vd.tamil_landmark IS NOT NULL AND vd.tamil_landmark <> '' ");
+	    sql.append("          AND vd.tamil_gender IS NOT NULL AND vd.tamil_gender <> '' ");
+	    sql.append("          AND vd.tamil_present_district IS NOT NULL AND vd.tamil_present_district <> '' ");
+	    sql.append("          AND vd.tamil_vending_category IS NOT NULL ");
+	    sql.append("          THEN vd.id ");
+	    sql.append("      END)) AS assistant_pending, ");
+
+	 // 8. LI Pending = Assistant Processed - LI Processed
+	    sql.append("     GREATEST(0, ");
 	    sql.append("         COUNT(DISTINCT CASE ");
 	    sql.append("             WHEN vd.tamil_name IS NOT NULL AND vd.tamil_name <> '' ");
 	    sql.append("             AND vd.tamil_f_h_name IS NOT NULL AND vd.tamil_f_h_name <> '' ");
@@ -90,49 +102,29 @@ public class StreetVendorService {
 	    sql.append("             AND vd.tamil_present_district IS NOT NULL AND vd.tamil_present_district <> '' ");
 	    sql.append("             AND vd.tamil_vending_category IS NOT NULL ");
 	    sql.append("             THEN vd.id ");
-	    sql.append("         END) ");
-
-	    sql.append("         + COUNT(DISTINCT va1.vdid) ");
-	    sql.append("         + COUNT(DISTINCT va2.vdid) ");
-	    sql.append("         + COUNT(DISTINCT va3.vdid) ");
-
-	    sql.append("         + COUNT(DISTINCT CASE ");
+	    sql.append("         END) - COUNT(DISTINCT va1.vdid) ");
+	    sql.append("     ) AS li_pending, ");
+
+	    // 9. ARO Pending = LI Processed - ARO Processed
+	    sql.append("     GREATEST(0, ");
+	    sql.append("         COUNT(DISTINCT va1.vdid) - COUNT(DISTINCT va2.vdid) ");
+	    sql.append("     ) AS aro_pending, ");
+
+	    // 10. EE Pending = ARO Processed - EE Processed
+	    sql.append("     GREATEST(0, ");
+	    sql.append("         COUNT(DISTINCT va2.vdid) - COUNT(DISTINCT va3.vdid) ");
+	    sql.append("     ) AS ee_pending, ");
+
+	    // 11. Committee Pending = EE Processed - Committee Processed
+	    sql.append("     GREATEST(0, ");
+	    sql.append("         COUNT(DISTINCT va3.vdid) - ");
+	    sql.append("         COUNT(DISTINCT CASE ");
 	    sql.append("             WHEN vrl.vdid IS NOT NULL OR vpl.vdid IS NOT NULL ");
 	    sql.append("             THEN vd.id ");
 	    sql.append("         END) ");
+	    sql.append("     ) AS committee_pending, ");
 
-	    sql.append("     ) AS total_processed, ");
-
-	    // 8. Pending
-	    sql.append("     ( ");
-	    sql.append("         COUNT(DISTINCT vd.id) - ");
-
-	    sql.append("         ( ");
-
-	    sql.append("             COUNT(DISTINCT CASE ");
-	    sql.append("                 WHEN vd.tamil_name IS NOT NULL AND vd.tamil_name <> '' ");
-	    sql.append("                 AND vd.tamil_f_h_name IS NOT NULL AND vd.tamil_f_h_name <> '' ");
-	    sql.append("                 AND vd.tamil_landmark IS NOT NULL AND vd.tamil_landmark <> '' ");
-	    sql.append("                 AND vd.tamil_gender IS NOT NULL AND vd.tamil_gender <> '' ");
-	    sql.append("                 AND vd.tamil_present_district IS NOT NULL AND vd.tamil_present_district <> '' ");
-	    sql.append("                 AND vd.tamil_vending_category IS NOT NULL ");
-	    sql.append("                 THEN vd.id ");
-	    sql.append("             END) ");
-
-	    sql.append("             + COUNT(DISTINCT va1.vdid) ");
-	    sql.append("             + COUNT(DISTINCT va2.vdid) ");
-	    sql.append("             + COUNT(DISTINCT va3.vdid) ");
-
-	    sql.append("             + COUNT(DISTINCT CASE ");
-	    sql.append("                 WHEN vrl.vdid IS NOT NULL OR vpl.vdid IS NOT NULL ");
-	    sql.append("                 THEN vd.id ");
-	    sql.append("             END) ");
-
-	    sql.append("         ) ");
-
-	    sql.append("     ) AS pending, ");
-
-	    // 9. Processed within 30 days
+	    // 12. Processed within 30 days
 	    sql.append("     COUNT(DISTINCT CASE ");
 	    sql.append("         WHEN vrl.cdate IS NOT NULL ");
 	    sql.append("              AND DATEDIFF(vrl.cdate, vd.cdate) <= 30 ");
@@ -227,9 +219,20 @@ public class StreetVendorService {
 	    sql.append("         THEN vd.id ");
 	    sql.append("     END) AS committee_processed, ");
 
-	    // 7. Total Processed
-	    sql.append("     ( ");
-
+	 // 7. Assistant Pending
+	    sql.append("     (COUNT(DISTINCT vd.id) - ");
+	    sql.append("      COUNT(DISTINCT CASE ");
+	    sql.append("          WHEN vd.tamil_name IS NOT NULL AND vd.tamil_name <> '' ");
+	    sql.append("          AND vd.tamil_f_h_name IS NOT NULL AND vd.tamil_f_h_name <> '' ");
+	    sql.append("          AND vd.tamil_landmark IS NOT NULL AND vd.tamil_landmark <> '' ");
+	    sql.append("          AND vd.tamil_gender IS NOT NULL AND vd.tamil_gender <> '' ");
+	    sql.append("          AND vd.tamil_present_district IS NOT NULL AND vd.tamil_present_district <> '' ");
+	    sql.append("          AND vd.tamil_vending_category IS NOT NULL ");
+	    sql.append("          THEN vd.id ");
+	    sql.append("      END)) AS assistant_pending, ");
+
+	 // 8. LI Pending = Assistant Processed - LI Processed
+	    sql.append("     GREATEST(0, ");
 	    sql.append("         COUNT(DISTINCT CASE ");
 	    sql.append("             WHEN vd.tamil_name IS NOT NULL AND vd.tamil_name <> '' ");
 	    sql.append("             AND vd.tamil_f_h_name IS NOT NULL AND vd.tamil_f_h_name <> '' ");
@@ -238,47 +241,27 @@ public class StreetVendorService {
 	    sql.append("             AND vd.tamil_present_district IS NOT NULL AND vd.tamil_present_district <> '' ");
 	    sql.append("             AND vd.tamil_vending_category IS NOT NULL ");
 	    sql.append("             THEN vd.id ");
-	    sql.append("         END) ");
-
-	    sql.append("         + COUNT(DISTINCT va1.vdid) ");
-	    sql.append("         + COUNT(DISTINCT va2.vdid) ");
-	    sql.append("         + COUNT(DISTINCT va3.vdid) ");
-
-	    sql.append("         + COUNT(DISTINCT CASE ");
+	    sql.append("         END) - COUNT(DISTINCT va1.vdid) ");
+	    sql.append("     ) AS li_pending, ");
+
+	    // 9. ARO Pending = LI Processed - ARO Processed
+	    sql.append("     GREATEST(0, ");
+	    sql.append("         COUNT(DISTINCT va1.vdid) - COUNT(DISTINCT va2.vdid) ");
+	    sql.append("     ) AS aro_pending, ");
+
+	    // 10. EE Pending = ARO Processed - EE Processed
+	    sql.append("     GREATEST(0, ");
+	    sql.append("         COUNT(DISTINCT va2.vdid) - COUNT(DISTINCT va3.vdid) ");
+	    sql.append("     ) AS ee_pending, ");
+
+	    // 11. Committee Pending = EE Processed - Committee Processed
+	    sql.append("     GREATEST(0, ");
+	    sql.append("         COUNT(DISTINCT va3.vdid) - ");
+	    sql.append("         COUNT(DISTINCT CASE ");
 	    sql.append("             WHEN vrl.vdid IS NOT NULL OR vpl.vdid IS NOT NULL ");
 	    sql.append("             THEN vd.id ");
 	    sql.append("         END) ");
-
-	    sql.append("     ) AS total_processed, ");
-
-	    // 8. Pending
-	    sql.append("     ( ");
-	    sql.append("         COUNT(DISTINCT vd.id) - ");
-
-	    sql.append("         ( ");
-
-	    sql.append("             COUNT(DISTINCT CASE ");
-	    sql.append("                 WHEN vd.tamil_name IS NOT NULL AND vd.tamil_name <> '' ");
-	    sql.append("                 AND vd.tamil_f_h_name IS NOT NULL AND vd.tamil_f_h_name <> '' ");
-	    sql.append("                 AND vd.tamil_landmark IS NOT NULL AND vd.tamil_landmark <> '' ");
-	    sql.append("                 AND vd.tamil_gender IS NOT NULL AND vd.tamil_gender <> '' ");
-	    sql.append("                 AND vd.tamil_present_district IS NOT NULL AND vd.tamil_present_district <> '' ");
-	    sql.append("                 AND vd.tamil_vending_category IS NOT NULL ");
-	    sql.append("                 THEN vd.id ");
-	    sql.append("             END) ");
-
-	    sql.append("             + COUNT(DISTINCT va1.vdid) ");
-	    sql.append("             + COUNT(DISTINCT va2.vdid) ");
-	    sql.append("             + COUNT(DISTINCT va3.vdid) ");
-
-	    sql.append("             + COUNT(DISTINCT CASE ");
-	    sql.append("                 WHEN vrl.vdid IS NOT NULL OR vpl.vdid IS NOT NULL ");
-	    sql.append("                 THEN vd.id ");
-	    sql.append("             END) ");
-
-	    sql.append("         ) ");
-
-	    sql.append("     ) AS pending, ");
+	    sql.append("     ) AS committee_pending, ");
 
 	    // 9. Processed within 30 days
 	    sql.append("     COUNT(DISTINCT CASE ");
@@ -358,15 +341,17 @@ public class StreetVendorService {
 	    sql.append("     COUNT(DISTINCT va1.vdid) AS li_processed, ");
 
 
-	    // 8. Pending
-	    sql.append("     ( ");
-	    sql.append("         COUNT(DISTINCT vd.id) - ");
-
-
-
-	    sql.append("              COUNT(DISTINCT va1.vdid) ");
-
-
+	 // 8. LI Pending = Assistant Processed - LI Processed
+	    sql.append("     GREATEST(0, ");
+	    sql.append("         COUNT(DISTINCT CASE ");
+	    sql.append("             WHEN vd.tamil_name IS NOT NULL AND vd.tamil_name <> '' ");
+	    sql.append("             AND vd.tamil_f_h_name IS NOT NULL AND vd.tamil_f_h_name <> '' ");
+	    sql.append("             AND vd.tamil_landmark IS NOT NULL AND vd.tamil_landmark <> '' ");
+	    sql.append("             AND vd.tamil_gender IS NOT NULL AND vd.tamil_gender <> '' ");
+	    sql.append("             AND vd.tamil_present_district IS NOT NULL AND vd.tamil_present_district <> '' ");
+	    sql.append("             AND vd.tamil_vending_category IS NOT NULL ");
+	    sql.append("             THEN vd.id ");
+	    sql.append("         END) - COUNT(DISTINCT va1.vdid) ");
 	    sql.append("     ) AS li_pending ");
 
 
@@ -419,15 +404,16 @@ public class StreetVendorService {
 
 
 	    // 8. Pending
-	    sql.append("     ( ");
-	    sql.append("         COUNT(DISTINCT vd.id) - ");
-
-	    sql.append("         ( ");
-
-	    sql.append("              COUNT(DISTINCT va1.vdid) ");
-
-	    sql.append("         ) ");
-
+	    sql.append("     GREATEST(0, ");
+	    sql.append("         COUNT(DISTINCT CASE ");
+	    sql.append("             WHEN vd.tamil_name IS NOT NULL AND vd.tamil_name <> '' ");
+	    sql.append("             AND vd.tamil_f_h_name IS NOT NULL AND vd.tamil_f_h_name <> '' ");
+	    sql.append("             AND vd.tamil_landmark IS NOT NULL AND vd.tamil_landmark <> '' ");
+	    sql.append("             AND vd.tamil_gender IS NOT NULL AND vd.tamil_gender <> '' ");
+	    sql.append("             AND vd.tamil_present_district IS NOT NULL AND vd.tamil_present_district <> '' ");
+	    sql.append("             AND vd.tamil_vending_category IS NOT NULL ");
+	    sql.append("             THEN vd.id ");
+	    sql.append("         END) - COUNT(DISTINCT va1.vdid) ");
 	    sql.append("     ) AS li_pending ");
 
 
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 196b48f..7470be5 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,2 +1,2 @@
-spring.profiles.active=prod
-#spring.profiles.active=dev
\ 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/dbfot/CompDetails.html b/src/main/resources/templates/modules/dbfot/CompDetails.html
new file mode 100644
index 0000000..411ad94
--- /dev/null
+++ b/src/main/resources/templates/modules/dbfot/CompDetails.html
@@ -0,0 +1,1311 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <title>DBFOT Complaints Based Dashboard Details</title>
+
+    <!-- Bootstrap 5 CSS -->
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/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"/>
+      <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
+</head>
+<style>
+body{
+ background: #f6f7f8;
+}
+
+.dashboard-header {
+    width: 100%;
+    min-height: 115px;
+    /* background: #f6f7f8; */
+
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    padding: 12px 18px;
+    box-sizing: border-box;
+}
+.dashboard-title-section h1 {
+    margin: 0 0 6px 0;
+
+    font-size: 24px;
+    font-weight: 700;
+    line-height: 1.2;
+
+    color: #343a40;
+}
+
+.dashboard-title-section p {
+    margin: 0;
+
+    font-size: 15px;
+    font-weight: 400;
+
+    color: #6c757d;
+}
+.total-roads-cards {
+    display: flex;
+    align-items: center;
+    gap: 15px;
+}
+
+/* Total Roads Card */
+.total-roads-card {
+width: 160px;
+height: 40px;
+
+font-size: 13px;
+font-weight: 700;
+letter-spacing: 1.5px;
+border-radius: 9px;
+
+display: flex;
+flex-direction: column;
+align-items: center;
+justify-content: center;
+
+box-sizing: border-box;
+text-decoration: none;
+text-align: center;
+transition: all 0.2s ease;
+
+}
+
+/* Location Overview - First link */
+.total-roads-cards a:first-child {
+   background: white;
+    color: #29284f;
+    border: 2px solid #29284f;
+}
+
+/* Location Overview hover */
+.total-roads-cards a:first-child:hover {
+     background: #29284f;
+    color: white;
+    text-decoration: none;
+}
+
+/* Complaints List - Last link */
+.total-roads-cards a:last-child {
+	 background: #29284f;
+    color: white;
+    border: 2px solid #29284f;
+
+    
+}
+
+/* Complaints List hover */
+.total-roads-cards a:last-child:hover {
+
+	background: white;
+    color: #29284f;
+    text-decoration: none;
+
+   
+}
+@media (max-width: 600px) {
+
+    .dashboard-header {
+        flex-direction: column;
+        align-items: flex-start;
+        gap: 15px;
+
+        padding: 18px;
+    }
+
+    .total-roads-card {
+        width: 100%;
+        height: 40px;
+        letter-spacing: 0.5px;
+        font-size: 10px;
+        text-align: center;
+    }
+    
+}
+#filtercard label{
+	font-size: 14px;
+	font-weight: 500;
+	padding-bottom: 5px;
+}
+#datatblecard label{
+	font-size: 14px;
+	font-weight: 500;
+	padding-bottom: 5px;
+}
+.dashboard-stats {
+    margin: 0;
+}
+
+.stat-card {
+    background: #ffffff;
+    border: 1px solid #e8edf3 !important;
+    border-radius: 6px !important;
+    box-shadow: none !important;
+    transition: box-shadow 0.2s ease;
+}
+
+.stat-card .card-body {
+    display: flex;
+    align-items: center;
+    gap: 30px;
+   /*  padding: 10px 12px; */
+    height: 100px;
+}
+
+.stat-icon {
+    width: 58px;
+    height: 58px;
+    min-width: 28px;
+    border-radius: 6px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 12px;
+}
+
+.icon-blue {
+    background: #edf4ff;
+    color: #3980ff;
+}
+
+.icon-orange {
+    background: #fff5eb;
+    color: #ff7a18;
+}
+
+.icon-green {
+    background: #eafbf1;
+    color: #22c55e;
+}
+.icon-red{
+	background:#fecdcd;
+	color: red;
+}
+
+.icon-purple{
+	background:#fad6ff;
+	color: purple;
+}
+
+.stat-info {
+    min-width: 0;
+}
+
+.stat-count {
+    font-size: 22px;
+    font-weight: 600;
+    line-height: 1.15;
+    color: #202938;
+}
+
+.count-orange {
+    color: #ff6b00;
+}
+
+.stat-label {
+    font-size: 12px;
+    color: #64748b;
+    line-height: 1.4;
+    margin-top: 2px;
+    white-space: nowrap;
+}
+
+@media (max-width: 575.98px) {
+    .stat-label {
+        font-size: 10px;
+    }
+}
+.stat-icon i{
+	font-size:large;
+}
+
+table.dataTable th{
+       	background-color: #003366 !important;
+       	color: white;
+       }
+       
+#complaintTimeline {
+    position: relative;
+    padding-left: 26px;
+}
+
+.timeline-item {
+    position: relative;
+    padding: 0 0 24px 20px;
+    border-left: 2px solid #e2e8f0;
+}
+
+.timeline-item:last-child {
+    border-left-color: transparent;
+    padding-bottom: 0;
+}
+
+.timeline-dot {
+    position: absolute;
+    left: -8px;
+    top: 3px;
+    width: 14px;
+    height: 14px;
+    background: #172338;
+    border: 3px solid #dbeafe;
+    border-radius: 50%;
+}
+
+.timeline-card {
+    border: 1px solid #e2e8f0;
+    border-radius: 9px;
+    padding: 14px;
+    background: #fff;
+}
+
+.timeline-status {
+    font-size: 13px;
+    font-weight: 700;
+    color: #172338;
+    margin-bottom: 10px;
+}
+
+.timeline-remarks {
+    white-space: pre-wrap;
+    overflow-wrap: anywhere;
+    color: #334155;
+    margin-bottom: 12px;
+}
+
+.timeline-field {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 4px;
+    margin-top: 7px;
+    font-size: 12px;
+}
+
+.timeline-label {
+    color: #64748b;
+    min-width: 135px;
+}
+
+.timeline-value {
+    color: #1e293b;
+    font-weight: 500;
+}
+
+.timeline-image {
+    display: block;
+    max-width: 100%;
+    max-height: 260px;
+    object-fit: contain;
+    border-radius: 7px;
+    margin-top: 12px;
+    border: 1px solid #e2e8f0;
+     cursor: zoom-in;
+}
+#pctComplaintsModal .modal-body{
+	max-height: 60vh;		
+	overflow-y: auto;	
+}
+.complaint-status-badge {
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 5px;
+    font-size: 11px;
+    font-weight: 600;
+    background: #f1f5f9;
+    color: #475569;
+}
+
+.complaint-status-badge.open {
+   /*  background: #fee2e2;
+    color: #b91c1c; */
+    background:#fad6ff;
+	color: purple;
+}
+
+.complaint-status-badge.under-review {
+    /* background: #ffedd5;
+    color: #c2410c; */
+    background:#fecdcd;
+	color: red;
+}
+
+.complaint-status-badge.pending-closure {
+    /* background: #ede9fe;
+    color: #6d28d9; */
+     background: #fff5eb;
+    color: #ff7a18;
+}
+
+.complaint-status-badge.closed {
+    /* background: #d1fae5;
+    color: #047857; */
+    background: #eafbf1;
+    color: #22c55e;
+}
+</style>
+<body>
+<div class="container-fluid">
+	<div class="dashboard-header">
+
+	    <div class="dashboard-title-section">
+	        <h1>Complaints Overview</h1>
+	        <p>Track and analyze complaints data across all locations.</p>
+	    </div>
+	    
+	    <div class="total-roads-cards">
+	
+		    <a href="/commissionerreview/dbfot/locDetails"
+		       class="total-roads-card">
+		        Location Overview
+		    </a>
+		    
+		    <a href="/commissionerreview/dbfot/CompDetails"
+		       class="total-roads-card">
+		        Complaints List
+		    </a>
+	    
+	    </div>
+
+	</div>
+	
+	
+	<div class="p-1">
+	<div class="card shadow-sm" id="filtercard">
+    <div class="card-body">
+
+        <div class="row">
+        
+        	<div class="col-lg-2 col-md-4 col-sm-6 mb-3">
+                <label class="font-weight-bold">Zone</label>
+                <select class="form-control" id="zone">
+                    <option value="">ALL</option>
+                </select>
+            </div>
+
+            <div class="col-lg-2 col-md-4 col-sm-6 mb-3">
+                <label class="font-weight-bold">Ward</label>
+                <select class="form-control" id="ward">
+                    <option value="">ALL</option>
+                </select>
+            </div>       	
+            
+            <div class="col-lg-3 col-md-4 col-sm-6 mb-3">
+                <label class="font-weight-bold">Location</label>
+                <select class="form-control" id="location">
+                    <option value="">ALL</option>
+                </select>
+            </div>
+            
+            <div class="col-lg-2 col-md-4 col-sm-6 mb-3">
+                <label class="font-weight-bold">For Date</label>            
+                <input type="date" class="form-control" id=searchDate onclick="this.showPicker();">
+            </div>
+            
+            
+            
+            <div class="col-lg-2 col-md-4 col-sm-6 mb-3">
+                <label class="font-weight-bold">Status</label>
+                <select class="form-control" id="status">
+                    <option value="">ALL</option>
+                    <option value="Closed">Closed</option>
+                    <option value="Open">Open</option>
+                    <option value="Under Review">Under Review</option>
+                    <option value="Pending Closure">Pending Closure</option>
+                </select>
+            </div> 
+
+			<div class="col-lg-2 col-md-4 col-sm-6 mb-3">
+                <label class="font-weight-bold">Source</label>
+                <select class="form-control" id="source">
+                    <option value="">ALL</option>
+                    <option value="Public">Public</option>
+                    <option value="Procedure">Procedure</option>
+                    <option value="Customer Support">Customer Support</option>
+                    <option value="Independent Engineers">Independent Engineers</option>
+                </select>
+            </div>
+
+            <div class="col-lg-3 col-md-4 col-sm-6 mb-3">
+                <label class="font-weight-bold">Search</label>            
+                <input type="text" class="form-control" id=searchAdd placeholder="Search Address">
+            </div>
+            
+             
+                                                     
+
+        </div>
+        
+        <div class="filter-section d-flex justify-content-center align-items-end gap-3 flex-wrap">
+        	<div>
+        		 <button id="searchBtn" class="btn btn-primary px-4"> Apply</button>
+                <button id="resetBtn" class="btn btn-secondary px-4"> Clear</button>
+            </div>
+        </div>
+
+	    </div>
+	</div>
+	
+	</div>
+	
+	
+	<div class="row g-2 dashboard-stats">
+
+	    <!-- Total Complaints -->
+	    <div class="col-12 col-sm-6 col-lg">
+	        <div class="card stat-card h-100">
+	            <div class="card-body">
+	                <div class="stat-icon icon-blue">
+	                    <i class="fas fa-map-marker-alt"></i>
+	                </div>
+	                <div class="stat-info">
+	                    <div class="stat-count" id="total_loc">0</div>
+	                    <div class="stat-label">Total Complaints</div>
+	                </div>
+	            </div>
+	        </div>
+	    </div>
+	
+	    <!-- Opened -->
+	    <div class="col-12 col-sm-6 col-lg">
+	        <div class="card stat-card h-100">
+	            <div class="card-body">
+	                <div class="stat-icon icon-purple">
+	                    <i class="fas fa-circle-info"></i>
+	                </div>
+	                <div class="stat-info">
+	                    <div class="stat-count" id="act_loc">0</div>
+	                    <div class="stat-label">Opened</div>
+	                </div>
+	            </div>
+	        </div>
+	    </div>
+	
+	    <!-- Under review -->
+	    <div class="col-12 col-sm-6 col-lg">
+	        <div class="card stat-card h-100">
+	            <div class="card-body">
+	                <div class="stat-icon icon-red">
+	                    <i class="fa-solid fa-spinner"></i>
+	                </div>
+	                <div class="stat-info">
+	                    <div class="stat-count" id="total_comp">0</div>
+	                    <div class="stat-label">Under Review</div>
+	                </div>
+	            </div>
+	        </div>
+	    </div>
+	
+	    <!-- Pendind Closure -->
+	    <div class="col-12 col-sm-6 col-lg">
+	        <div class="card stat-card h-100">
+	            <div class="card-body">
+	                <div class="stat-icon icon-orange">
+	                    <i class="far fa-clock"></i>
+	                </div>
+	                <div class="stat-info">
+	                    <div class="stat-count count-orange" id="today_comp">0</div>
+	                    <div class="stat-label">Pending Closure</div>
+	                </div>
+	            </div>
+	        </div>
+	    </div>
+	
+	    <!-- Closed -->
+	    <div class="col-12 col-sm-6 col-lg">
+	        <div class="card stat-card h-100">
+	            <div class="card-body">
+	                <div class="stat-icon icon-green">
+	                    <i class="fas fa-circle-check"></i>
+	                </div>
+	                <div class="stat-info">
+	                    <div class="stat-count" id="manpower_pre">0</div>
+	                    <div class="stat-label">Closed</div>
+	                </div>
+	            </div>
+	        </div>
+	    </div>
+	
+	</div>
+	
+	
+	<div class="p-1 mt-2 mb-3">
+			<div class="card shadow-sm" id="datatblecard">
+				<label class="p-2">All Locations</label>
+				<div class="card-body">
+					<div class="table-responsive">
+
+                <table id="worksTable"
+                       class="table table-bordered  w-100">
+
+                    <thead class="">
+
+                    <tr>
+
+                        <th class="text-center">S.No</th>
+                        <th class="text-center">Zone</th>
+                        <th class="text-center">Ward</th>
+                        <th class="text-center">PCT</th>                      
+                        <th class="text-center">Complaint ID</th>
+                        <th class="text-center">Description</th>
+                        <th class="text-center">TurnAround Time</th>
+                        <th class="text-center">Source</th>
+                        <th class="text-center">Status</th>
+                        <th class="text-center">Raised On</th>
+                        <th class="text-center">Closed On</th>
+
+                    </tr>
+
+                    </thead>
+
+                    <tbody></tbody>
+
+                </table>
+
+            </div>
+				</div>
+			</div>
+		</div>
+		
+		</div>
+		
+		<!-- Loader -->
+		<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" style="width:3rem; height:3rem;"></div>
+		        <p class="mt-2 text-primary">Please wait...</p>
+		    </div>
+		</div>
+		
+		
+		<div class="modal fade"
+     id="pctComplaintsModal"
+     tabindex="-1"
+     aria-labelledby="pctComplaintsModalLabel"
+     aria-hidden="true">
+
+    <div class="modal-dialog modal-lg modal-dialog-centered"
+         role="document">
+
+        <div class="modal-content">
+
+            <!-- Modal Header -->
+            <div class="modal-header">
+                <div>
+                    <h5 class="modal-title font-weight-bold"
+                        id="pctComplaintsModalLabel">
+                        Complaint Details
+                    </h5>
+
+                    <div class="text-muted small mt-1">
+                        Complaint ID:
+                        <span id="timelineComplaintId">-</span>
+                    </div>
+                </div>
+
+               <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+            </div>
+
+            <!-- Modal Body -->
+            <div class="modal-body">
+
+                <!-- Current Complaint Details -->
+                <div class="mb-3">
+                    <div class="mb-2">
+                        <strong>Status:</strong>
+
+                        <span id="timelineCurrentStatus"
+                              class="complaint-status-badge">
+                            -
+                        </span>
+                    </div>
+
+                    <div class="mb-2">
+                        <strong>Description:</strong>
+
+                        <div id="timelineDescription" class="mt-1">
+                            -
+                        </div>
+                    </div>
+                    
+                    <div class="mb-2">                   	
+	                     <div id="timeline_tat" class="font-weight-bold">-
+						 </div>
+					 </div>
+					 
+                </div>
+
+                <hr>
+
+                <!-- History Timeline -->
+                <h6 class="font-weight-bold mb-3">
+                    Complaint History
+                </h6>
+
+                <div id="complaintTimeline">
+                    <div class="text-center text-muted py-3">
+                        Loading complaint history...
+                    </div>
+                </div>
+
+            </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>
+
+<!-- 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 type="text/javascript">
+
+let worksTable;
+
+$(document).ready(function () {
+	
+	let today = new Date();
+	let year = today.getFullYear();
+	let month = String(today.getMonth() + 1).padStart(2, '0');
+	let day = String(today.getDate()).padStart(2, '0');
+
+	let currentDate = `${year}-${month}-${day}`;
+
+	$('#searchDate').val(currentDate);
+	$('#searchDate').attr('max', currentDate);
+
+    // Load dropdowns when page loads
+    loadZones();
+    loadComplaintsOverview();
+    
+ // Zone change: load wards
+    $('#zone').on('change', function () {
+
+        let zone = $(this).val();
+
+        // Reset ward dropdown
+        $('#ward').empty()
+            .append('<option value="">ALL</option>');
+        
+        $('#location').empty()
+        .append('<option value="">ALL</option>');
+
+        if (zone !== '') {
+            loadWards(zone);
+        }
+    });
+    
+    $('#ward').on('change', function () {
+
+        let ward = $(this).val();
+
+        // Reset ward dropdown
+        $('#location').empty()
+            .append('<option value="">ALL</option>');
+
+        if (ward !== '') {
+            loadLocations(ward);
+        }
+    });
+    
+    worksTable = $('#worksTable').DataTable({
+        pageLength: 10,
+        responsive: false,
+        scrollX: true,
+        ordering: true,
+        searching: true,
+        lengthChange: true,
+        autoWidth: false,
+        dom: 'Bfrtip',
+        info: true,
+
+        buttons: [
+            {
+                extend: 'excelHtml5',
+                text: 'Export Excel',
+                title: 'Complaints Overview',
+                exportOptions: { columns: ':visible' }
+            },
+            {
+                extend: 'pdfHtml5',
+                text: 'Export PDF',
+                title: 'Complaints Overview',
+                pageSize: 'A4',
+                exportOptions: { columns: ':visible' }
+            }
+        ],
+
+        columns: [
+            {
+                data: null,
+                className: 'text-center',
+                render: function (data, type, row, meta) {
+                    return meta.row + meta.settings._iDisplayStart + 1;
+                }
+            },
+            { data: 'zone', defaultContent: '-', className: 'text-center' },
+            { data: 'ward', defaultContent: '-', className: 'text-center' },
+            { data: 'pct', defaultContent: '-', className: 'text-center' },
+            {
+                data: 'complaint_id',
+                className: 'text-center',
+                defaultContent: '-',
+                render: function (data, type, row) {
+
+                    if (type !== 'display' || !data) {
+                        return data || '-';
+                    }
+
+                    return '<a href="javascript:void(0);" ' +
+                        'class="complaint-timeline-link" ' +
+                        'data-complaint-id="' +
+                        $('<div>').text(data).html() + '">' +
+                        $('<div>').text(data).html() +
+                        '</a>';
+                }
+            },
+            { data: 'description', defaultContent: '-' },
+            { data: 'turn_around_time', defaultContent: '-', className: 'text-center' },
+            { data: 'source', defaultContent: '-', className: 'text-center' },
+            {
+                data: 'status',
+                className: 'text-center',
+                render: function (data, type) {
+                    if (type !== 'display') return data || '-';
+
+                    const status = (data || '').trim().toUpperCase();
+                    
+                    if (status === 'OPEN') {
+                        return '<span class="badge bg-primary">OPEN</span>';
+                    }
+
+                    if (status === 'UNDER REVIEW') {
+                        return '<span class="badge bg-danger">UNDER REVIEW</span>';
+                    }
+                    
+                    if (status === 'PENDING CLOSURE') {
+                        return '<span class="badge bg-warning">PENDING CLOSURE</span>';
+                    }
+                    
+                    if (status === 'CLOSED') {
+                        return '<span class="badge bg-success">CLOSED</span>';
+                    }
+
+                    return '<span class="badge bg-secondary">-</span>';
+                   
+                }
+            },
+            {
+                data: 'raised_on',
+                className: 'text-center',
+                render: function (data, type) {
+                    return formatComplaintDate(data, type);
+                }
+            },
+            {
+                data: 'closed_on',
+                className: 'text-center',
+                defaultContent: '-',
+                render: function (data, type) {
+                    return formatComplaintDate(data, type);
+                }
+            }
+        ]
+    });
+    
+});
+
+//Load Zone dropdown
+function loadZones() {
+
+    $.ajax({
+        url: '/commissionerreview/api/dbfot/getzones',
+        type: 'GET',
+        dataType: 'json',
+
+        success: function (response) {
+
+            if (response.status && response.data) {
+
+                let zoneDropdown = $('#zone');
+
+                zoneDropdown.empty()
+                    .append('<option value="">ALL</option>');
+
+                $.each(response.data, function (index, item) {
+
+                    zoneDropdown.append(
+                        $('<option>', {
+                            value: item.zone,
+                            text: item.zone
+                        })
+                    );
+
+                });
+            }
+        },
+
+        error: function (xhr) {
+            console.error('Error loading zones:', xhr.responseText);
+        }
+    });
+}
+
+
+// Load Ward dropdown based on selected Zone
+function loadWards(zone) {
+
+    $.ajax({
+        url: '/commissionerreview/api/dbfot/getwardbyzone',
+        type: 'GET',
+        data: {
+            zone: zone
+        },
+        dataType: 'json',
+
+        success: function (response) {
+
+            let wardDropdown = $('#ward');
+
+            wardDropdown.empty()
+                .append('<option value="">ALL</option>');
+
+            if (response.status && response.data) {
+
+                $.each(response.data, function (index, item) {
+
+                    wardDropdown.append(
+                        $('<option>', {
+                            value: item.ward,
+                            text: item.ward
+                        })
+                    );
+
+                });
+            }
+        },
+
+        error: function (xhr) {
+            console.error('Error loading wards:', xhr.responseText);
+        }
+    });
+}
+
+
+function loadLocations(ward) {
+
+    $.ajax({
+        url: '/commissionerreview/api/dbfot/getlocationsbyward',
+        type: 'GET',
+        data: {
+            ward: ward
+        },
+        dataType: 'json',
+
+        success: function (response) {
+
+            let locDropdown = $('#location');
+
+            locDropdown.empty()
+                .append('<option value="">ALL</option>');
+
+            if (response.status && response.data) {
+
+                $.each(response.data, function (index, item) {
+
+                	locDropdown.append(
+                        $('<option>', {
+                            value: item.pct,
+                            text: item.address
+                        })
+                    );
+
+                });
+            }
+        },
+
+        error: function (xhr) {
+            console.error('Error loading locations:', xhr.responseText);
+        }
+    });
+}
+$('#searchBtn').on('click', function () {
+
+    loadComplaintsOverview();
+});
+$('#resetBtn').on('click', function () {
+
+	  window.location.reload();
+
+	});
+	
+function loadComplaintsOverview() {
+
+	if(!$('#searchDate').val()){
+		Swal.fire({
+            icon: "info",
+            title: "Missing Date",
+            text: "Please select For Date"
+        });
+		return;
+	}
+
+    $.ajax({
+        url: '/commissionerreview/api/dbfot/getcomplaintsoverview',
+        type: 'GET',
+        dataType: 'json',
+        data: {
+            date: $('#searchDate').val(),
+            zone: $('#zone').val(),
+            ward: $('#ward').val(),
+            location: $('#location').val(),
+            status: $('#status').val(),
+            source: $('#source').val(),
+            searchAddress: $('#searchAdd').val()
+        },
+
+        success: function (response) {
+
+            if (response.status !== 'Success') {
+                alert(response.message || 'Unable to load dashboard.');
+                return;
+            }
+
+            $('#total_loc').text(response.totalComplaints || 0);
+            $('#act_loc').text(response.opened || 0);
+            $('#total_comp').text(response.underReview || 0);
+            $('#today_comp').text(response.pendingClosure || 0);
+            $('#manpower_pre').text(response.closed || 0);
+
+            const complaints = Array.isArray(response.complaints)
+            ? response.complaints
+            : [];
+
+        worksTable.clear();
+
+        if (complaints.length > 0) {
+            worksTable.rows.add(complaints);
+        }
+            worksTable.draw();
+        },
+
+        error: function (xhr) {
+            console.error('Dashboard error:', xhr.responseText);
+            alert('Error while fetching complaints overview.');
+        }
+    });
+}
+function formatComplaintDate(value, type) {
+
+    if (!value) {
+        return '-';
+    }
+
+    if (type !== 'display') {
+        return value;
+    }
+
+    const match = String(value).match(
+        /^(\d{4})-(\d{2})-(\d{2})(?:[ T](\d{2}):(\d{2}):(\d{2}))?/
+    );
+
+    if (!match) {
+        return value;
+    }
+
+    return match[3] + '-' + match[2] + '-' + match[1] +
+        ' ' + (match[4] || '00') +
+        ':' + (match[5] || '00') +
+        ':' + (match[6] || '00');
+}
+$(document).on('click', '.complaint-timeline-link', function (e) {
+
+    e.preventDefault();
+
+    const complaintId = $(this).attr('data-complaint-id');
+
+    if (!complaintId) {
+        return;
+    }
+
+    loadComplaintTimeline(complaintId);
+});
+
+function loadComplaintTimeline(complaintId) {
+
+    // Reset modal content before loading.
+    $('#timelineComplaintId').text(complaintId);
+    $('#timelineCurrentStatus').text('-');
+    $('#timelineDescription').text('Loading complaint details...');
+    $('#complaintTimeline').empty();
+
+    $('#complaintDetail').addClass('d-none');
+    $('#complaintList').removeClass('d-none');
+
+    // Open the existing timeline modal.
+    const modalElement = document.getElementById('pctComplaintsModal');
+    const modal = bootstrap.Modal.getOrCreateInstance(modalElement);
+    modal.show();
+
+    $.ajax({
+        url: '/commissionerreview/api/dbfot/getcomplainttimeline',
+        type: 'GET',
+        data: {
+            complaint_id: complaintId
+        },
+        dataType: 'json',
+
+        success: function (response) {
+
+            if (response.status !== 'Success') {
+                $('#complaintTimeline').html(
+                    $('<div>', {
+                        class: 'text-danger py-3',
+                        text: response.message ||
+                              'Unable to load complaint timeline.'
+                    })
+                );
+                return;
+            }
+
+            // Adjust these property names if your API response differs.
+            const complaint = response.complaint;
+            const timeline = response.timeline || [];
+
+            if (!complaint) {
+                $('#complaintTimeline').html(
+                    $('<div>', {
+                        class: 'text-muted py-3',
+                        text: 'Complaint details not found.'
+                    })
+                );
+                return;
+            }
+
+            renderComplaintTimeline(complaint, timeline);
+
+            // Show timeline directly instead of the complaint list.
+            $('#complaintList').addClass('d-none');
+            $('#complaintDetail').removeClass('d-none');
+        },
+
+        error: function (xhr) {
+            console.error(
+                'Error loading complaint timeline:',
+                xhr.responseText
+            );
+
+            $('#complaintTimeline').html(
+                $('<div>', {
+                    class: 'text-danger py-3',
+                    text: 'Error while loading complaint timeline.'
+                })
+            );
+        }
+    });
+}
+function renderComplaintTimeline(complaint, timeline) {
+
+    $('#timelineComplaintId').text(
+        complaint.complaint_id || '-'
+    );
+
+    $('#timelineCurrentStatus')
+        .text(complaint.current_status || '-')
+        .attr(
+            'class',
+            'complaint-status-badge ' +
+            getComplaintBadgeClass(complaint.current_status)
+        ).css('margin-left', '10px');
+
+    $('#timelineDescription').text(
+        complaint.description || 'No description available'
+    );
+    
+    $('#timeline_tat').text(
+            "Turn Around Time: "+ complaint.turn_around_time || 'No turn around time'
+        ).css('font-weight', 'bold');
+    
+    const container = $('#complaintTimeline');
+    container.empty();
+
+    if (!timeline || timeline.length === 0) {
+
+        container.html(
+            $('<div>', {
+                class: 'text-muted py-3',
+                text: 'No complaint history available.'
+            })
+        );
+
+        return;
+    }
+
+    timeline.forEach(function (item) {
+
+        const timelineItem = $('<div>', {
+            class: 'timeline-item'
+        });
+
+        timelineItem.append(
+            $('<div>', {
+                class: 'timeline-dot'
+            })
+        );
+
+        const card = $('<div>', {
+            class: 'timeline-card'
+        });
+
+        card.append(
+        	    $('<span>', {
+        	        class: 'complaint-status-badge ' +
+        	               getComplaintBadgeClass(item.status),
+        	        text: item.status || '-'
+        	    }).css('margin-bottom', '10px')
+        	);
+
+        const remarks = $('<div>', {
+            class: 'timeline-remarks'
+        });
+
+        remarks.append(
+            $('<strong>').text('Remarks: ')
+        );
+
+        remarks.append(
+            document.createTextNode(item.remarks || '-')
+        );
+
+        card.append(remarks);
+
+        appendTimelineField(
+            card, 'Complaint Raised On', item.complaint_raised_on
+        );
+
+        appendTimelineField(
+            card, 'Complaint Raised By', item.complaint_raised_by
+        );
+
+        appendTimelineField(
+            card, 'Complaint Updated On', item.complaint_updated_on
+        );
+
+        appendTimelineField(
+            card, 'Complaint Updated By', item.complaint_updated_by
+        );
+
+        
+        // Optional uploaded image.
+		if (item.imgfile && item.imgfile.trim() !== '') {
+		
+		    const imagePath = item.imgfile.trim();
+		
+		    // Do not display a failed-upload message as an image.
+		    if (!imagePath.startsWith('Failed to save file')) {
+		
+		        const imageUrl = getComplaintImageUrl(imagePath);
+		
+		        const image = $('<img>', {
+		            class: 'timeline-image',
+		            alt: 'Complaint attachment',
+		            loading: 'lazy'
+		        });
+		
+		        image.attr('src', imageUrl);
+		
+		        // Open the full image in a new tab when clicked.
+		        const imageLink = $('<a>', {
+		            href: imageUrl,
+		            target: '_blank',
+		            rel: 'noopener noreferrer',
+		            title: 'Click to view image in a new tab'
+		        });
+		
+		        imageLink.append(image);
+		
+		        image.on('error', function () {
+		            imageLink.replaceWith(
+		                $('<div>', {
+		                    class: 'text-muted small mt-2',
+		                    text: 'Unable to load attachment.'
+		                })
+		            );
+		        });
+		
+		        card.append(imageLink);
+		    }
+		}
+
+        timelineItem.append(card);
+        container.append(timelineItem);
+    });
+}
+function getComplaintBadgeClass(status) {
+
+    const normalized = (status || '').trim().toUpperCase();
+
+    switch (normalized) {
+        case 'OPEN':
+            return 'open';
+
+        case 'UNDER REVIEW':
+            return 'under-review';
+
+        case 'PENDING CLOSURE':
+            return 'pending-closure';
+
+        case 'CLOSED':
+            return 'closed';
+
+        default:
+            return '';
+    }
+}
+function getComplaintImageUrl(path) {
+    return path;
+}	
+
+function appendTimelineField(container, label, value) {
+
+    const field = $('<div>', {
+        class: 'timeline-field'
+    });
+
+    field.append(
+        $('<span>', {
+            class: 'timeline-label',
+            text: label
+        })
+    );
+
+    field.append(
+        $('<span>', {
+            class: 'timeline-value',
+            text: value == null || value === '' ? '-' : String(value)
+        })
+    );
+
+    container.append(field);
+}
+</script>
+	
+	
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/dbfot/locDetails.html b/src/main/resources/templates/modules/dbfot/locDetails.html
new file mode 100644
index 0000000..f56251d
--- /dev/null
+++ b/src/main/resources/templates/modules/dbfot/locDetails.html
@@ -0,0 +1,2023 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <title>DBFOT Location Based Dashboard Details</title>
+
+    <!-- Bootstrap 5 CSS -->
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/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"/>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
+</head>
+<style>
+#pctComplaintsModal .modal-body{
+	max-height: 60vh;		
+	overflow-y: auto;	
+}
+#manpowerDetailsModal .modal-body{
+	max-height: 60vh;		
+	overflow-y: auto;	
+}
+body{
+ background: #f6f7f8;
+}
+
+.dashboard-header {
+    width: 100%;
+    min-height: 115px;
+    /* background: #f6f7f8; */
+
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    padding: 12px 18px;
+    box-sizing: border-box;
+}
+.dashboard-title-section h1 {
+    margin: 0 0 6px 0;
+
+    font-size: 24px;
+    font-weight: 700;
+    line-height: 1.2;
+
+    color: #343a40;
+}
+
+.dashboard-title-section p {
+    margin: 0;
+
+    font-size: 15px;
+    font-weight: 400;
+
+    color: #6c757d;
+}
+.total-roads-cards {
+    display: flex;
+    align-items: center;
+    gap: 15px;
+}
+
+/* Total Roads Card */
+.total-roads-card {
+width: 160px;
+height: 40px;
+
+font-size: 13px;
+font-weight: 700;
+letter-spacing: 1.5px;
+border-radius: 9px;
+
+display: flex;
+flex-direction: column;
+align-items: center;
+justify-content: center;
+
+box-sizing: border-box;
+text-decoration: none;
+text-align: center;
+transition: all 0.2s ease;
+
+}
+
+/* Location Overview - First link */
+.total-roads-cards a:first-child {
+    background: #29284f;
+    color: white;
+    border: 2px solid #29284f;
+}
+
+/* Location Overview hover */
+.total-roads-cards a:first-child:hover {
+    background: white;
+    color: #29284f;
+    text-decoration: none;
+}
+
+/* Complaints List - Last link */
+.total-roads-cards a:last-child {
+    background: white;
+    color: #29284f;
+    border: 2px solid #29284f;
+}
+
+/* Complaints List hover */
+.total-roads-cards a:last-child:hover {
+    background: #29284f;
+    color: white;
+    text-decoration: none;
+}
+@media (max-width: 600px) {
+
+    .dashboard-header {
+        flex-direction: column;
+        align-items: flex-start;
+        gap: 15px;
+
+        padding: 18px;
+    }
+
+    .total-roads-card {
+        width: 100%;
+        height: 40px;
+        letter-spacing: 0.5px;
+        font-size: 10px;
+        text-align: center;
+    }
+    
+}
+
+#filtercard label{
+	font-size: 14px;
+	font-weight: 500;
+	padding-bottom: 5px;
+}
+#datatblecard label{
+	font-size: 14px;
+	font-weight: 500;
+	padding-bottom: 5px;
+}
+.dashboard-stats {
+    margin: 0;
+}
+
+.stat-card {
+    background: #ffffff;
+    border: 1px solid #e8edf3 !important;
+    border-radius: 6px !important;
+    box-shadow: none !important;
+    transition: box-shadow 0.2s ease;
+}
+
+.stat-card .card-body {
+    display: flex;
+    align-items: center;
+    gap: 30px;
+   /*  padding: 10px 12px; */
+    height: 100px;
+}
+
+.stat-icon {
+    width: 58px;
+    height: 58px;
+    min-width: 28px;
+    border-radius: 6px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 12px;
+}
+
+.icon-blue {
+    background: #edf4ff;
+    color: #3980ff;
+}
+
+.icon-orange {
+    background: #fff5eb;
+    color: #ff7a18;
+}
+
+.icon-green {
+    background: #eafbf1;
+    color: #22c55e;
+}
+
+.stat-info {
+    min-width: 0;
+}
+
+.stat-count {
+    font-size: 22px;
+    font-weight: 600;
+    line-height: 1.15;
+    color: #202938;
+}
+
+.count-orange {
+    color: #ff6b00;
+}
+
+.stat-label {
+    font-size: 12px;
+    color: #64748b;
+    line-height: 1.4;
+    margin-top: 2px;
+    white-space: nowrap;
+}
+
+@media (max-width: 575.98px) {
+    .stat-label {
+        font-size: 10px;
+    }
+}
+.stat-icon i{
+	font-size:large;
+}
+table.dataTable th{
+       	background-color: #003366 !important;
+       	color: white;
+       }
+       
+
+.complaint-count-btn {
+    background: transparent;
+    border: none;
+    padding: 2px 6px;
+    font-weight: 600;
+    cursor: pointer;
+    text-decoration: none;
+}
+
+.complaint-count-btn:hover {
+    text-decoration: underline;
+}
+
+.complaint-count-btn:focus {
+    outline: 2px solid #93c5fd;
+    outline-offset: 2px;
+}
+
+#complaintStatusTabs {
+    gap: 5px;
+    flex-wrap: wrap;
+}
+
+#complaintStatusTabs .nav-link {
+    border: 1px solid #dee2e6;
+    font-size: 12px;
+    padding: 8px 10px;
+    color: #475569;
+}
+
+#complaintStatusTabs .nav-link.active {
+    background-color: #172338;
+    color: #fff;
+}
+
+.complaint-card {
+    border: 1px solid #e2e8f0;
+    border-radius: 10px;
+    padding: 14px;
+    margin-bottom: 10px;
+    cursor: pointer;
+}
+
+.complaint-card:hover {
+    background-color: #f8fafc;
+}
+
+.complaint-card .complaint-description {
+    font-weight: 600;
+    color: #1e293b;
+    margin-top: 8px;
+}
+
+.complaint-card .complaint-meta {
+    font-size: 12px;
+    color: #64748b;
+    margin-top: 8px;
+}
+
+.complaint-status-badge {
+    display: inline-block;
+    padding: 4px 8px;
+    border-radius: 5px;
+    font-size: 11px;
+    font-weight: 600;
+    background: #f1f5f9;
+    color: #475569;
+}
+
+.complaint-status-badge.open {
+    background: #fee2e2;
+    color: #b91c1c;
+}
+
+.complaint-status-badge.under-review {
+    background: #ffedd5;
+    color: #c2410c;
+}
+
+.complaint-status-badge.pending-closure {
+    background: #ede9fe;
+    color: #6d28d9;
+}
+
+.complaint-status-badge.closed {
+    background: #d1fae5;
+    color: #047857;
+}
+#complaintTimeline {
+    position: relative;
+    padding-left: 26px;
+}
+
+.timeline-item {
+    position: relative;
+    padding: 0 0 24px 20px;
+    border-left: 2px solid #e2e8f0;
+}
+
+.timeline-item:last-child {
+    border-left-color: transparent;
+    padding-bottom: 0;
+}
+
+.timeline-dot {
+    position: absolute;
+    left: -8px;
+    top: 3px;
+    width: 14px;
+    height: 14px;
+    background: #172338;
+    border: 3px solid #dbeafe;
+    border-radius: 50%;
+}
+
+.timeline-card {
+    border: 1px solid #e2e8f0;
+    border-radius: 9px;
+    padding: 14px;
+    background: #fff;
+}
+
+.timeline-status {
+    font-size: 13px;
+    font-weight: 700;
+    color: #172338;
+    margin-bottom: 10px;
+}
+
+.timeline-remarks {
+    white-space: pre-wrap;
+    overflow-wrap: anywhere;
+    color: #334155;
+    margin-bottom: 12px;
+}
+
+.timeline-field {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 4px;
+    margin-top: 7px;
+    font-size: 12px;
+}
+
+.timeline-label {
+    color: #64748b;
+    min-width: 135px;
+}
+
+.timeline-value {
+    color: #1e293b;
+    font-weight: 500;
+}
+
+.timeline-image {
+    display: block;
+    max-width: 100%;
+    max-height: 260px;
+    object-fit: contain;
+    border-radius: 7px;
+    margin-top: 12px;
+    border: 1px solid #e2e8f0;
+     cursor: zoom-in;
+}
+.manpower-count-btn {
+    background: transparent;
+    border: none;
+    padding: 0;
+    font-weight: 600;
+    cursor: pointer;
+    text-decoration: none;
+}
+
+.manpower-count-btn:hover {
+    text-decoration: underline;
+}
+.manpower-employee-card {
+    border: 1px solid #e2e8f0;
+    border-radius: 9px;
+    padding: 15px;
+    background: #fff;
+}
+
+.manpower-employee-image {
+    display: block;
+    max-width: 100%;
+    max-height: 240px;
+    object-fit: contain;
+    border-radius: 7px;
+    border: 1px solid #e2e8f0;
+    margin-top: 12px;
+    cursor: zoom-in;
+}
+</style>
+<body>
+
+<div class="container-fluid">
+
+	<div class="dashboard-header">
+
+	    <div class="dashboard-title-section">
+	        <h1>Locations Overview</h1>
+	        <p>Get a quick overview of locations, complaints and workforce status.</p>
+	    </div>
+	    
+	    <div class="total-roads-cards">
+	
+		    <a href="/commissionerreview/dbfot/locDetails"
+		       class="total-roads-card">
+		        Location Overview
+		    </a>
+		    
+		    <a href="/commissionerreview/dbfot/CompDetails"
+		       class="total-roads-card">
+		        Complaints List
+		    </a>
+	    
+	    </div>
+
+	</div>
+	
+	
+	
+	<div class="p-1">
+	<div class="card shadow-sm" id="filtercard">
+    <div class="card-body">
+
+        <div class="row">
+        
+        	<div class="col-lg-3 col-md-4 col-sm-6 mb-3">
+                <label class="font-weight-bold">Search</label>            
+                <input type="text" class="form-control" id=searchAdd placeholder="Search Address">
+            </div>
+            
+            <div class="col-lg-2 col-md-4 col-sm-6 mb-3">
+                <label class="font-weight-bold">For Date</label>            
+                <input type="date" class="form-control" id=searchDate onclick="this.showPicker();">
+            </div>
+            
+            <div class="col-lg-2 col-md-4 col-sm-6 mb-3">
+                <label class="font-weight-bold">Status</label>
+                <select class="form-control" id="status">
+                    <option value="">ALL</option>
+                </select>
+            </div> 
+
+            <div class="col-lg-2 col-md-4 col-sm-6 mb-3">
+                <label class="font-weight-bold">Zone</label>
+                <select class="form-control" id="zone">
+                    <option value="">ALL</option>
+                </select>
+            </div>
+
+            <div class="col-lg-2 col-md-4 col-sm-6 mb-3">
+                <label class="font-weight-bold">Ward</label>
+                <select class="form-control" id="ward">
+                    <option value="">ALL</option>
+                </select>
+            </div>
+                                                     
+
+        </div>
+        
+        <div class="filter-section d-flex justify-content-center align-items-end gap-3 flex-wrap">
+        	<div>
+        		 <button id="searchBtn" class="btn btn-primary px-4"> Apply</button>
+                <button id="resetBtn" class="btn btn-secondary px-4"> Clear</button>
+            </div>
+        </div>
+
+	    </div>
+	</div>
+	
+	</div>
+	
+	
+	<div class="row g-2 dashboard-stats">
+
+	    <!-- Total Locations -->
+	    <div class="col-12 col-sm-6 col-lg">
+	        <div class="card stat-card h-100">
+	            <div class="card-body">
+	                <div class="stat-icon icon-blue">
+	                    <i class="fas fa-map-marker-alt"></i>
+	                </div>
+	                <div class="stat-info">
+	                    <div class="stat-count" id="total_loc">0</div>
+	                    <div class="stat-label">Total Locations</div>
+	                </div>
+	            </div>
+	        </div>
+	    </div>
+	
+	    <!-- Total Active Locations -->
+	    <div class="col-12 col-sm-6 col-lg">
+	        <div class="card stat-card h-100">
+	            <div class="card-body">
+	                <div class="stat-icon icon-orange">
+	                    <i class="fas fa-map-marker-alt"></i>
+	                </div>
+	                <div class="stat-info">
+	                    <div class="stat-count" id="act_loc">0</div>
+	                    <div class="stat-label">Total Active Locations</div>
+	                </div>
+	            </div>
+	        </div>
+	    </div>
+	
+	    <!-- Total Complaints -->
+	    <div class="col-12 col-sm-6 col-lg">
+	        <div class="card stat-card h-100">
+	            <div class="card-body">
+	                <div class="stat-icon icon-green">
+	                    <i class="far fa-clipboard"></i>
+	                </div>
+	                <div class="stat-info">
+	                    <div class="stat-count" id="total_comp">0</div>
+	                    <div class="stat-label">Total Complaints</div>
+	                </div>
+	            </div>
+	        </div>
+	    </div>
+	
+	    <!-- Today's Complaints -->
+	    <div class="col-12 col-sm-6 col-lg">
+	        <div class="card stat-card h-100">
+	            <div class="card-body">
+	                <div class="stat-icon icon-blue">
+	                    <i class="far fa-clipboard"></i>
+	                </div>
+	                <div class="stat-info">
+	                    <div class="stat-count" id="today_comp">0</div>
+	                    <div class="stat-label">Today's Complaints</div>
+	                </div>
+	            </div>
+	        </div>
+	    </div>
+	
+	    <!-- Manpower Present -->
+	    <div class="col-12 col-sm-6 col-lg">
+	        <div class="card stat-card h-100">
+	            <div class="card-body">
+	                <div class="stat-icon icon-orange">
+	                    <i class="fas fa-users"></i>
+	                </div>
+	                <div class="stat-info">
+	                    <div class="stat-count count-orange" id="manpower_pre">0</div>
+	                    <div class="stat-label">Manpower Present</div>
+	                </div>
+	            </div>
+	        </div>
+	    </div>
+	
+	</div>
+
+
+		<div class="p-1 mt-2 mb-3">
+			<div class="card shadow-sm" id="datatblecard">
+				<label class="p-2">All Locations</label>
+				<div class="card-body">
+					<div class="table-responsive">
+
+                <table id="worksTable"
+                       class="table table-bordered  w-100">
+
+                    <thead class="">
+
+                    <tr>
+
+                        <th class="text-center">S.No</th>
+                        <th class="text-center">PCT</th>
+                        <th class="text-center">Zone</th>
+                        <th class="text-center">Ward</th>
+                        <th class="text-center">Address</th>
+                        <th class="text-center">Status</th>
+                        <th class="text-center">Manpower</th>
+                        <th class="text-center">Total Complaints</th>
+                        <th class="text-center">Opened</th>
+                        <th class="text-center">Under Review</th>
+                        <th class="text-center">Pending Closure</th>
+                        <th class="text-center">Closed</th>
+
+                    </tr>
+
+                    </thead>
+
+                    <tbody></tbody>
+
+                </table>
+
+            </div>
+				</div>
+			</div>
+		</div>
+
+
+	</div>
+	
+	
+	<div class="modal fade" id="manpowerDetailsModal" tabindex="-1"
+     role="dialog" aria-labelledby="manpowerDetailsModalLabel"
+     aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
+
+    <div class="modal-dialog modal-lg modal-dialog-centered"
+         role="document">
+
+        <div class="modal-content">
+
+            <div class="modal-header">
+                <div>
+                    <h5 class="modal-title font-weight-bold"
+                        id="manpowerDetailsModalLabel">
+                        PCT Details
+                    </h5>
+
+                    <div id="manpowerPctAddress"
+                         class="text-muted small mt-1"></div>
+
+                    <div id="manpowerPctMeta"
+                         class="text-muted small mt-1"></div>
+
+                    <div id="manpowerAttendanceDate"
+                         class="text-primary small mt-2"></div>
+                </div>
+
+                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+            </div>
+
+            <div class="modal-body" id="manpowerModalBody">
+
+                <div id="manpowerEmployeeCount"
+                     class="text-muted small mb-3"></div>
+
+                <div id="manpowerEmployeeList">
+                    <div class="text-center text-muted py-4">
+                        Loading employee details...
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+</div>
+	
+	
+		<div class="modal fade" id="pctComplaintsModal" tabindex="-1"
+		     role="dialog" aria-labelledby="pctComplaintsModalLabel"
+		     aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
+		
+		    <div class="modal-dialog modal-lg modal-dialog-centered"
+		         role="document">
+		
+		        <div class="modal-content">
+		
+		            <div class="modal-header">
+		                <div>
+		                    <h5 class="modal-title font-weight-bold"
+		                        id="pctComplaintsModalLabel">PCT Details</h5>
+		
+		                    <div id="modalPctAddress"
+		                         class="text-muted small mt-1"></div>
+		
+		                    <div id="modalPctMeta"
+		                         class="text-muted small mt-1"></div>
+		                </div>
+		
+		                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+		            </div>
+		
+		            <div class="modal-body">  
+		
+		                <ul class="nav nav-pills mb-3"
+		                    id="complaintStatusTabs">
+		
+		                    <li class="nav-item">
+		                        <a href="#" class="nav-link active"
+		                           data-complaint-status="ALL">
+		                            All <span id="countAll">0</span>
+		                        </a>
+		                    </li>
+		
+		                    <li class="nav-item">
+		                        <a href="#" class="nav-link"
+		                           data-complaint-status="OPEN">
+		                            Open <span id="countOpen">0</span>
+		                        </a>
+		                    </li>
+		
+		                    <li class="nav-item">
+		                        <a href="#" class="nav-link"
+		                           data-complaint-status="UNDER REVIEW">
+		                            Under Review <span id="countUnderReview">0</span>
+		                        </a>
+		                    </li>
+		
+		                    <li class="nav-item">
+		                        <a href="#" class="nav-link"
+		                           data-complaint-status="PENDING CLOSURE">
+		                            Pending Closure
+		                            <span id="countPendingClosure">0</span>
+		                        </a>
+		                    </li>
+		
+		                    <li class="nav-item">
+		                        <a href="#" class="nav-link"
+		                           data-complaint-status="CLOSED">
+		                            Closed <span id="countClosed">0</span>
+		                        </a>
+		                    </li>
+		
+		                </ul>
+		
+		                <div id="complaintList">
+		                    <div class="text-center text-muted py-4">
+		                        Select a complaint count to load complaints.
+		                    </div>
+		                </div>
+		                
+		
+		                <div id="complaintDetail" class="d-none mt-3">
+
+							    <button type="button"
+							            class="btn btn-sm btn-outline-secondary mb-3"
+							            id="btnBackToComplaints">
+							        &larr; Back to complaints
+							    </button>
+							
+							    <!-- Complaint header -->
+							    <div class="border-bottom pb-3 mb-3">
+							        <div class="d-flex align-items-center mb-2">
+							            <h6 id="timelineComplaintId"
+							                class="font-weight-bold text-primary mb-0 mr-2">
+							            </h6>
+							
+							            <span id="timelineCurrentStatus"
+							                  class="complaint-status-badge">
+							            </span>
+							        </div>
+							
+							        <div id="timelineDescription"
+							             class="font-weight-bold">
+							        </div>
+							        
+							        <div id="timeline_tat"
+							             class="font-weight-bold">
+							        </div>
+							    </div>
+							
+							    <!-- Turnaround time intentionally omitted -->
+							
+							    <!-- History timeline -->
+							    <div id="complaintTimeline"></div>
+							
+							</div>
+							
+		
+		            </div>
+		        </div>
+		    </div>
+		</div>
+	
+	
+	
+<!-- Loader -->
+<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" style="width:3rem; height:3rem;"></div>
+        <p class="mt-2 text-primary">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 type="text/javascript">
+
+let worksTable;
+
+$(document).ready(function () {
+	
+	let today = new Date();
+	let year = today.getFullYear();
+	let month = String(today.getMonth() + 1).padStart(2, '0');
+	let day = String(today.getDate()).padStart(2, '0');
+
+	let currentDate = `${year}-${month}-${day}`;
+
+	$('#searchDate').val(currentDate);
+	$('#searchDate').attr('max', currentDate);
+
+    // Load dropdowns when page loads
+    loadZones();
+    loadPctStatus();
+
+    // Zone change: load wards
+    $('#zone').on('change', function () {
+
+        let zone = $(this).val();
+
+        // Reset ward dropdown
+        $('#ward').empty()
+            .append('<option value="">ALL</option>');
+
+        if (zone !== '') {
+            loadWards(zone);
+        }
+    });
+
+    loadDashboard();
+    
+    worksTable = $('#worksTable').DataTable({
+
+        pageLength: 10,
+
+        responsive: false,
+
+        scrollX: false,
+
+        ordering: true,
+
+        searching: true,
+
+        lengthChange: true,
+
+        autoWidth: false,
+        dom: 'Bfrtip',
+        info: true,
+
+        ordering: true,
+        
+        buttons: [
+
+            {
+                extend: 'excelHtml5',
+                text: 'Export Excel',
+                title: 'DBFOT Toilet Report',
+                exportOptions: {
+                    columns: ':visible'
+                }
+            },
+
+            {
+                extend: 'pdfHtml5',
+                text: 'Export PDF',
+                title: 'DBFOT Toilet Report',	                        
+                pageSize: 'A4',
+                exportOptions: {
+                    columns: ':visible'
+                }                             
+            }
+
+        ],
+
+        columns: [
+
+            {
+                data: null,
+                className: 'text-center',
+                render: function (data, type, row, meta) {
+                    return meta.row + 1;
+                }
+            },
+
+            {
+                data: 'pct',
+                className: 'text-center',
+                defaultContent: '-'
+            },
+
+            {
+                data: 'zone',
+                className: 'text-center',
+                defaultContent: '-'
+            },
+
+            {
+                data: 'ward',
+                className: 'project-name-column',
+                defaultContent: '-'
+            },
+
+            {
+                data: 'address',
+                defaultContent: '-'
+            },
+
+            {
+                data: 'status',
+                className: 'text-center',                
+                render: function (data) {
+                    let status = data ? data.trim().toUpperCase() : '';
+
+                    if (status === 'ACTIVE') {
+                        return '<span class="badge bg-success">ACTIVE</span>';
+                    }
+
+                    if (status === 'INACTIVE') {
+                        return '<span class="badge bg-danger">INACTIVE</span>';
+                    }
+
+                    return '<span class="badge bg-secondary">-</span>';
+                }
+            },
+
+         // Manpower
+            {
+                data: 'manpower',
+                className: 'text-center',
+                defaultContent: 0,
+                render: renderCount
+            },
+
+            // Total Complaints
+            {
+                data: 'total_complaints',
+                className: 'text-center',
+                defaultContent: 0,
+                render: renderCount
+            },
+
+            // Opened
+            {
+                data: 'opened',
+                className: 'text-center',
+                defaultContent: 0,
+                render: renderCount
+            },
+
+            // Under Review
+            {
+                data: 'under_review',
+                className: 'text-center',
+                defaultContent: 0,
+                render: renderCount
+            },
+
+            // Pending Closure
+            {
+                data: 'pending_closure',
+                className: 'text-center',
+                defaultContent: 0,
+                render: renderCount
+            },
+
+            // Closed
+            {
+                data: 'closed',
+                className: 'text-center',
+                defaultContent: 0,
+                render: renderCount
+            }
+            
+        ]
+    });
+
+});
+
+function updateWorksTable(tableData) {
+
+    worksTable.clear();
+
+    if (tableData && tableData.length > 0) {
+        worksTable.rows.add(tableData);
+    }
+
+    worksTable.draw();
+}
+
+$('#searchBtn').on('click', function () {
+
+    loadDashboard();
+
+});
+
+$('#resetBtn').on('click', function () {
+
+  window.location.reload();
+
+});
+
+function loadDashboard() {
+	
+	
+	if(!$('#searchDate').val()){
+		Swal.fire({
+            icon: "info",
+            title: "Missing Date",
+            text: "Please select For Date"
+        });
+		return;
+	}
+
+    $('#pageLoader').show();
+
+    $.ajax({
+
+        url: '/commissionerreview/api/dbfot/getdashboardsummary',
+
+        type: 'GET',
+
+        data: {
+
+        	searchAddress: $('#searchAdd').val() || null,
+
+            date: $('#searchDate').val() || null,
+
+            status: $('#status').val() || null,
+
+            zone: $('#zone').val() || null,
+
+            ward: $('#ward').val() || null
+        },
+
+        beforeSend: function () {
+
+            $('#searchBtn').prop('disabled', true);
+
+        },
+
+        success: function (response) {
+        	$('#pageLoader').hide();
+
+            console.log("Dashboard Response:", response);
+			
+            if(response.status=='Success'){
+            	
+            	 $("#total_loc").text(response.totalLocations);
+            	 $("#act_loc").text(response.totalActiveLocations);
+            	 $("#total_comp").text(response.totalComplaints);
+            	 $("#today_comp").text(response.todaysComplaints);
+            	 $("#manpower_pre").text(response.manpowerPresent);
+            	
+            	updateWorksTable(
+                        response.locations || []
+                    );
+            }
+
+            else{
+            	
+            	Swal.fire({
+                    icon: "error",
+                    title: "Error",
+                    text: response.message
+                });
+            }
+
+        },
+
+        error: function (xhr, status, error) {
+        	$('#pageLoader').hide();
+
+            console.error("Dashboard API Error:");
+            console.error(xhr.responseText);
+
+            alert("Unable to load dashboard data.");
+        },
+
+        complete: function () {
+
+            $('#searchBtn').prop('disabled', false);
+
+            $('#pageLoader').hide();
+        }
+    });
+}
+//Load Zone dropdown
+function loadZones() {
+
+    $.ajax({
+        url: '/commissionerreview/api/dbfot/getzones',
+        type: 'GET',
+        dataType: 'json',
+
+        success: function (response) {
+
+            if (response.status && response.data) {
+
+                let zoneDropdown = $('#zone');
+
+                zoneDropdown.empty()
+                    .append('<option value="">ALL</option>');
+
+                $.each(response.data, function (index, item) {
+
+                    zoneDropdown.append(
+                        $('<option>', {
+                            value: item.zone,
+                            text: item.zone
+                        })
+                    );
+
+                });
+            }
+        },
+
+        error: function (xhr) {
+            console.error('Error loading zones:', xhr.responseText);
+        }
+    });
+}
+
+
+// Load Ward dropdown based on selected Zone
+function loadWards(zone) {
+
+    $.ajax({
+        url: '/commissionerreview/api/dbfot/getwardbyzone',
+        type: 'GET',
+        data: {
+            zone: zone
+        },
+        dataType: 'json',
+
+        success: function (response) {
+
+            let wardDropdown = $('#ward');
+
+            wardDropdown.empty()
+                .append('<option value="">ALL</option>');
+
+            if (response.status && response.data) {
+
+                $.each(response.data, function (index, item) {
+
+                    wardDropdown.append(
+                        $('<option>', {
+                            value: item.ward,
+                            text: item.ward
+                        })
+                    );
+
+                });
+            }
+        },
+
+        error: function (xhr) {
+            console.error('Error loading wards:', xhr.responseText);
+        }
+    });
+}
+
+
+// Load PCT Status dropdown
+function loadPctStatus() {
+
+    $.ajax({
+        url: '/commissionerreview/api/dbfot/getpctstatus',
+        type: 'GET',
+        dataType: 'json',
+
+        success: function (response) {
+
+            if (response.status && response.data) {
+
+                let statusDropdown = $('#status');
+
+                statusDropdown.empty()
+                    .append('<option value="">ALL</option>');
+
+                $.each(response.data, function (index, item) {
+
+                    if (item.status) {
+                        statusDropdown.append(
+                            $('<option>', {
+                                value: item.status,
+                                text: item.status
+                            })
+                        );
+                    }
+
+                });
+            }
+        },
+
+        error: function (xhr) {
+            console.error('Error loading statuses:', xhr.responseText);
+        }
+    });
+}
+
+function renderCount(data, type, row, meta) {
+
+    let count = Number(data) || 0;
+
+    // Export the raw count to Excel/PDF instead of HTML.
+    if (type !== 'display') {
+        return count;
+    }
+
+    let colors = {
+        manpower: '#212529',
+        total_complaints: '#2563eb',
+        opened: '#dc2626',
+        under_review: '#ea580c',
+        pending_closure: '#7c3aed',
+        closed: '#059669'
+    };
+
+    let column = meta.settings.aoColumns[meta.col].data;
+    let color = colors[column] || '#212529';
+
+    // Manpower is not clickable.
+    if (column === 'manpower') {
+
+    if (count > 0) {
+        return '<button type="button" ' +
+            'class="manpower-count-btn" ' +
+            'data-pct="' +
+            $('<div>').text(row.pct || '').html() + '" ' +
+            'style="color:' + color + ';">' +
+            count +
+            '</button>';
+    }
+
+    return '<span style="color:' + color +
+        ';font-weight:600;">' + count + '</span>';
+}
+
+    // Complaint counts are clickable only when greater than zero.
+    if (count > 0) {
+        return '<button type="button" ' +
+            'class="complaint-count-btn" ' +
+            'data-pct="' + $('<div>').text(row.pct || '').html() + '" ' +
+            'data-count-type="' + column + '" ' +
+            'style="color:' + color + ';">' +
+            count +
+            '</button>';
+    }
+
+    return '<span style="color:' + color +
+           ';font-weight:600;">' + count + '</span>';
+}
+
+
+const pctComplaintsApi ='/commissionerreview/api/dbfot/getpctcomplaints';
+
+let selectedPct = '';
+let selectedComplaintStatus = 'ALL';
+let currentPctData = null;
+let currentComplaints = [];
+
+// Map clicked DataTable columns to complaint statuses.
+const complaintStatusMap = {
+    total_complaints: 'ALL',
+    opened: 'OPEN',
+    under_review: 'UNDER REVIEW',
+    pending_closure: 'PENDING CLOSURE',
+    closed: 'CLOSED'
+};
+
+function getDashboardFilters() {
+    return {
+        date: $('#searchDate').val() || '',
+        zone: $('#zone').val() || '',
+        ward: $('#ward').val() || '',
+        status: $('#status').val() || '',
+        searchAddress: $('#searchAddress').val() || ''
+    };
+}
+
+function loadPctComplaints(pct, complaintStatus) {
+
+    selectedPct = pct;
+    selectedComplaintStatus = complaintStatus;
+
+    $('#complaintList').html(
+        '<div class="text-center py-4">' +
+        '<span class="spinner-border spinner-border-sm"></span> ' +
+        'Loading complaints...' +
+        '</div>'
+    );
+
+    $('#complaintDetail').addClass('d-none');
+    $('#complaintList').removeClass('d-none');
+
+    $.ajax({
+        url: pctComplaintsApi,
+        type: 'GET',
+        dataType: 'json',
+
+        data: {
+            pct: pct,
+            ...getDashboardFilters(),
+            complaintStatus: complaintStatus
+        },
+
+        success: function (response) {
+
+            if (response.status !== 'Success') {
+                $('#complaintList').html(
+                    '<div class="alert alert-danger">' +
+                    escapeHtml(response.message ||
+                        'Unable to load complaints') +
+                    '</div>'
+                );
+                return;
+            }
+
+            currentPctData = response.pctDetails;
+            currentComplaints = response.complaints || [];
+
+            renderPctHeader(response.pctDetails);
+            renderComplaintTabCounts(response.tabCounts);
+            renderComplaints(currentComplaints);
+
+        },
+
+        error: function (xhr) {
+
+            console.error('Complaint API error:', xhr.responseText);
+
+            $('#complaintList').html(
+                '<div class="alert alert-danger">' +
+                'Error while fetching complaints.' +
+                '</div>'
+            );
+        }
+    });
+}
+
+function renderPctHeader(pct) {
+
+    if (!pct) {
+        return;
+    }
+
+    $('#pctComplaintsModalLabel').text(
+        'PCT #' + (pct.pct || '-')
+    );
+
+    $('#modalPctAddress').text(pct.address || '-');
+
+    $('#modalPctMeta').text(
+        'WARD ' + (pct.ward || '-') +
+        '  ·  ZONE ' + (pct.zone || '-')
+    );
+}
+
+function renderComplaintTabCounts(counts) {
+
+    counts = counts || {};
+
+    $('#countAll').text(counts.all_count || 0);
+    $('#countOpen').text(counts.opened || 0);
+    $('#countUnderReview').text(counts.under_review || 0);
+    $('#countPendingClosure').text(counts.pending_closure || 0);
+    $('#countClosed').text(counts.closed || 0);
+
+    $('#complaintStatusTabs .nav-link').each(function () {
+
+        const tabStatus = $(this).attr('data-complaint-status');
+
+        $(this).toggleClass(
+            'active',
+            tabStatus === selectedComplaintStatus
+        );
+    });
+}
+
+function getComplaintBadgeClass(status) {
+
+    const normalized = (status || '').trim().toUpperCase();
+
+    switch (normalized) {
+        case 'OPEN':
+            return 'open';
+
+        case 'UNDER REVIEW':
+            return 'under-review';
+
+        case 'PENDING CLOSURE':
+            return 'pending-closure';
+
+        case 'CLOSED':
+            return 'closed';
+
+        default:
+            return '';
+    }
+}
+
+function renderComplaints(complaints) {
+
+    const container = $('#complaintList');
+
+    container.empty();
+
+    if (!complaints || complaints.length === 0) {
+
+        container.html(
+            '<div class="text-center text-muted py-4">' +
+            'No complaints found for this status and filter.' +
+            '</div>'
+        );
+
+        return;
+    }
+
+    complaints.forEach(function (complaint, index) {
+
+        const card = $('<div>', {
+            class: 'complaint-card',
+            tabindex: 0,
+            role: 'button',
+            'data-index': index
+        });
+
+        const top = $('<div>', {
+            class: 'd-flex justify-content-between align-items-center'
+        });
+
+        top.append(
+            $('<span>', {
+                class: 'text-primary font-weight-bold',
+                text: complaint.complaint_id || '-'
+            })
+        );
+
+        top.append(
+            $('<span>', {
+                class: 'complaint-status-badge ' +
+                    getComplaintBadgeClass(
+                        complaint.complaint_status
+                    ),
+                text: complaint.complaint_status || '-'
+            })
+        );
+
+        card.append(top);
+
+        card.append(
+            $('<div>', {
+                class: 'complaint-description',
+                text: complaint.description || 'No description available'
+            })
+        );
+
+        const raisedDate = complaint.complaint_raised_on
+            ? String(complaint.complaint_raised_on)
+            : '';
+
+        card.append(
+            $('<div>', {
+                class: 'complaint-meta',
+                text: 'Source: ' + (complaint.source || '-') +
+                    (raisedDate ? ' · Raised: ' + raisedDate : '')
+            })
+        );
+
+        const footer = $('<div>', {
+            class: 'text-right mt-2 text-muted small'
+        }).text('View complaint details ›');
+
+        card.append(footer);
+
+        container.append(card);
+    });
+}
+
+// Safely encode text before displaying any API error message.
+function escapeHtml(value) {
+    return $('<div>').text(value == null ? '' : String(value)).html();
+}
+
+// Click a positive count in the DataTable.
+$('#worksTable tbody').on(
+    'click',
+    '.complaint-count-btn',
+    function () {
+
+        const pct = $(this).attr('data-pct');
+        const countType = $(this).attr('data-count-type');
+        const complaintStatus = complaintStatusMap[countType];
+
+        if (!pct || !complaintStatus) {
+            return;
+        }
+
+        $('#complaintDetail').addClass('d-none');
+        $('#complaintList').removeClass('d-none');
+
+        $('#pctComplaintsModal').modal('show');
+
+        loadPctComplaints(pct, complaintStatus);
+    }
+);
+
+// Switch complaint status tabs.
+$('#complaintStatusTabs').on(
+    'click',
+    '[data-complaint-status]',
+    function (event) {
+
+        event.preventDefault();
+
+        const complaintStatus =
+            $(this).attr('data-complaint-status');
+
+        if (!selectedPct) {
+            return;
+        }
+
+        loadPctComplaints(selectedPct, complaintStatus);
+    }
+);
+
+// Open individual complaint details from complaints_details.
+$('#complaintList').on(
+    'click keydown',
+    '.complaint-card',
+    function (event) {
+
+        if (event.type === 'keydown' &&
+            event.key !== 'Enter' &&
+            event.key !== ' ') {
+            return;
+        }
+
+        if (event.type === 'keydown') {
+            event.preventDefault();
+        }
+
+        const index = Number($(this).attr('data-index'));
+        const complaint = currentComplaints[index];
+
+        if (!complaint || !complaint.complaint_id) {
+            return;
+        }
+
+        loadComplaintTimeline(complaint.complaint_id);
+    }
+);
+
+function renderComplaintTimeline(complaint, timeline) {
+
+    $('#timelineComplaintId').text(
+        complaint.complaint_id || '-'
+    );
+
+    $('#timelineCurrentStatus')
+        .text(complaint.current_status || '-')
+        .attr(
+            'class',
+            'complaint-status-badge ' +
+            getComplaintBadgeClass(complaint.current_status)
+        ).css('margin-left', '10px');
+
+    $('#timelineDescription').text(
+        complaint.description || 'No description available'
+    );
+    
+    $('#timeline_tat').text(
+            "Turn Around Time: "+ complaint.turn_around_time || 'No turn around time'
+        );
+    
+    const container = $('#complaintTimeline');
+    container.empty();
+
+    if (!timeline || timeline.length === 0) {
+
+        container.html(
+            $('<div>', {
+                class: 'text-muted py-3',
+                text: 'No complaint history available.'
+            })
+        );
+
+        return;
+    }
+
+    timeline.forEach(function (item) {
+
+        const timelineItem = $('<div>', {
+            class: 'timeline-item'
+        });
+
+        timelineItem.append(
+            $('<div>', {
+                class: 'timeline-dot'
+            })
+        );
+
+        const card = $('<div>', {
+            class: 'timeline-card'
+        });
+
+        card.append(
+        	    $('<span>', {
+        	        class: 'complaint-status-badge ' +
+        	               getComplaintBadgeClass(item.status),
+        	        text: item.status || '-'
+        	    }).css('margin-bottom', '10px')
+        	);
+
+        const remarks = $('<div>', {
+            class: 'timeline-remarks'
+        });
+
+        remarks.append(
+            $('<strong>').text('Remarks: ')
+        );
+
+        remarks.append(
+            document.createTextNode(item.remarks || '-')
+        );
+
+        card.append(remarks);
+
+        appendTimelineField(
+            card, 'Complaint Raised On', item.complaint_raised_on
+        );
+
+        appendTimelineField(
+            card, 'Complaint Raised By', item.complaint_raised_by
+        );
+
+        appendTimelineField(
+            card, 'Complaint Updated On', item.complaint_updated_on
+        );
+
+        appendTimelineField(
+            card, 'Complaint Updated By', item.complaint_updated_by
+        );
+
+        
+        // Optional uploaded image.
+		if (item.imgfile && item.imgfile.trim() !== '') {
+		
+		    const imagePath = item.imgfile.trim();
+		
+		    // Do not display a failed-upload message as an image.
+		    if (!imagePath.startsWith('Failed to save file')) {
+		
+		        const imageUrl = getComplaintImageUrl(imagePath);
+		
+		        const image = $('<img>', {
+		            class: 'timeline-image',
+		            alt: 'Complaint attachment',
+		            loading: 'lazy'
+		        });
+		
+		        image.attr('src', imageUrl);
+		
+		        // Open the full image in a new tab when clicked.
+		        const imageLink = $('<a>', {
+		            href: imageUrl,
+		            target: '_blank',
+		            rel: 'noopener noreferrer',
+		            title: 'Click to view image in a new tab'
+		        });
+		
+		        imageLink.append(image);
+		
+		        image.on('error', function () {
+		            imageLink.replaceWith(
+		                $('<div>', {
+		                    class: 'text-muted small mt-2',
+		                    text: 'Unable to load attachment.'
+		                })
+		            );
+		        });
+		
+		        card.append(imageLink);
+		    }
+		}
+
+        timelineItem.append(card);
+        container.append(timelineItem);
+    });
+}
+
+function getComplaintImageUrl(path) {
+    return path;
+}	
+
+function appendTimelineField(container, label, value) {
+
+    const field = $('<div>', {
+        class: 'timeline-field'
+    });
+
+    field.append(
+        $('<span>', {
+            class: 'timeline-label',
+            text: label
+        })
+    );
+
+    field.append(
+        $('<span>', {
+            class: 'timeline-value',
+            text: value == null || value === '' ? '-' : String(value)
+        })
+    );
+
+    container.append(field);
+}
+
+$('#btnBackToComplaints').on('click', function () {
+
+    $('#complaintDetail').addClass('d-none');
+    $('#complaintList').removeClass('d-none');
+});
+
+const complaintTimelineApi =
+    '/commissionerreview/api/dbfot/getcomplainttimeline';
+
+function loadComplaintTimeline(complaintId) {
+
+    $('#complaintList').addClass('d-none');
+    $('#complaintDetail').removeClass('d-none');
+
+    $('#complaintTimeline').html(
+        '<div class="text-center text-muted py-4">' +
+        '<span class="spinner-border spinner-border-sm"></span> ' +
+        'Loading complaint timeline...' +
+        '</div>'
+    );
+
+    $.ajax({
+        url: complaintTimelineApi,
+        type: 'GET',
+        dataType: 'json',
+        data: {
+            complaint_id: complaintId
+        },
+
+        success: function (response) {
+
+            if (response.status !== 'Success') {
+
+                $('#complaintTimeline').html(
+                    $('<div>', {
+                        class: 'alert alert-danger',
+                        text: response.message ||
+                            'Unable to load complaint timeline'
+                    })
+                );
+
+                return;
+            }
+
+            renderComplaintTimeline(response.complaint,
+                                   response.timeline || []);
+        },
+
+        error: function (xhr) {
+
+            console.error(
+                'Complaint timeline API error:',
+                xhr.responseText
+            );
+
+            $('#complaintTimeline').html(
+                $('<div>', {
+                    class: 'alert alert-danger',
+                    text: 'Error while loading complaint timeline.'
+                })
+            );
+        }
+    });
+}
+
+$('#worksTable').on('click', '.manpower-count-btn', function () {
+
+    const pct = $(this).attr('data-pct');
+
+    loadManpowerDetails(pct);
+});
+
+function loadManpowerDetails(pct) {
+
+    const selectedDate = $('#searchDate').val();
+
+    $('#manpowerPctAddress').text('');
+    $('#manpowerPctMeta').text('');
+    $('#manpowerAttendanceDate').text('');
+    $('#manpowerEmployeeCount').text('');
+
+    $('#manpowerEmployeeList').html(
+        '<div class="text-center text-muted py-4">' +
+        '<span class="spinner-border spinner-border-sm"></span> ' +
+        'Loading employee details...' +
+        '</div>'
+    );
+
+    $('#manpowerDetailsModal').modal('show');
+
+    $.ajax({
+        url: '/commissionerreview/api/dbfot/getmanpowerdetails',
+        type: 'GET',
+        dataType: 'json',
+
+        data: {
+            pct: pct,
+            date: $('#searchDate').val() || '',
+            zone: $('#zone').val() || '',
+            ward: $('#ward').val() || '',
+            status: $('#status').val() || '',
+            searchAddress: $('#searchAddress').val() || ''
+        },
+
+        success: function (response) {
+
+            if (response.status !== 'Success') {
+
+                $('#manpowerEmployeeList').html(
+                    $('<div>', {
+                        class: 'alert alert-info',
+                        text: response.message ||
+                            'No manpower details found.'
+                    })
+                );
+
+                return;
+            }
+
+            renderManpowerDetails(
+                response.pctDetails,
+                response.employees || [],
+                $('#searchDate').val() || ''
+            );
+        },
+
+        error: function (xhr) {
+
+            console.error(
+                'Manpower API error:',
+                xhr.responseText
+            );
+
+            $('#manpowerEmployeeList').html(
+                $('<div>', {
+                    class: 'alert alert-danger',
+                    text: 'Error while loading manpower details.'
+                })
+            );
+        }
+    });
+}
+function renderManpowerDetails(pctDetails, employees,selectedDate) {
+
+    $('#manpowerDetailsModalLabel').text(
+        'PCT #' + (pctDetails.pct || '-')
+    );
+
+    $('#manpowerPctAddress').text(
+        pctDetails.address || '-'
+    );
+
+    $('#manpowerPctMeta').text(
+        'Ward ' + (pctDetails.ward || '-') +
+        ' · Zone ' + (pctDetails.zone || '-') +
+        ' · Status ' + (pctDetails.status || '-')
+    );
+
+    $('#manpowerAttendanceDate').text(
+            'Attendance Date: ' +
+            formatAttendanceDate(selectedDate, true)
+        );
+
+    $('#manpowerEmployeeCount').text(
+        'Employees Present (' + employees.length + ')'
+    );
+
+    const container = $('#manpowerEmployeeList');
+    container.empty();
+
+    if (employees.length === 0) {
+        container.html(
+            $('<div>', {
+                class: 'text-center text-muted py-4',
+                text: 'No employees found for this date.'
+            })
+        );
+        return;
+    }
+
+    employees.forEach(function (employee) {
+
+        const card = $('<div>', {
+            class: 'manpower-employee-card mb-3'
+        });
+
+        const heading = $('<div>', {
+            class: 'd-flex justify-content-between align-items-start flex-wrap'
+        });
+
+        const employeeInfo = $('<div>');
+
+        employeeInfo.append(
+            $('<h6>', {
+                class: 'font-weight-bold mb-1',
+                text: employee.emp_name || '-'
+            })
+        );
+
+        employeeInfo.append(
+            $('<div>', {
+                class: 'text-muted small',
+                text: 'Mobile: ' + (employee.mobile_number || '-')
+            })
+        );
+
+        heading.append(employeeInfo);
+
+        card.append(heading);
+
+        appendTimelineField(
+            card, 'Attendance Date',
+            formatAttendanceDate(employee.att_date)
+        );
+
+        appendTimelineField(
+            card, 'Location', employee.location
+        );
+
+        // Optional employee image; click to open in a new tab.
+        if (employee.imgfile && employee.imgfile.trim() !== '') {
+
+            const imageUrl = employee.imgfile.trim();
+
+            const image = $('<img>', {
+                class: 'manpower-employee-image',
+                alt: 'Employee attendance image',
+                loading: 'lazy'
+            }).attr('src', imageUrl);
+
+            const link = $('<a>', {
+                href: imageUrl,
+                target: '_blank',
+                rel: 'noopener noreferrer',
+                title: 'Click to view image in a new tab'
+            });
+
+            image.on('error', function () {
+                link.replaceWith(
+                    $('<div>', {
+                        class: 'text-muted small mt-2',
+                        text: 'Unable to load employee image.'
+                    })
+                );
+            });
+
+            link.append(image);
+            card.append(link);
+        }
+
+        container.append(card);
+    });
+}
+function formatAttendanceDate(value, dateOnly) {
+
+    if (!value) {
+        return '-';
+    }
+
+    const match = String(value).match(
+        /^(\d{4})-(\d{2})-(\d{2})(?:[ T](\d{2}):(\d{2}):(\d{2}))?/
+    );
+
+    if (!match) {
+        return String(value);
+    }
+
+    const date = match[3] + '-' + match[2] + '-' + match[1];
+
+    if (dateOnly) {
+        return date;
+    }
+
+    return date + ' ' +
+        (match[4] || '00') + ':' +
+        (match[5] || '00') + ':' +
+        (match[6] || '00');
+}
+
+</script>
+	
+	
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/roadwarweb/roadwarregisterdashboard.html b/src/main/resources/templates/modules/roadwarweb/roadwarregisterdashboard.html
index 4bfd60a..9164757 100644
--- a/src/main/resources/templates/modules/roadwarweb/roadwarregisterdashboard.html
+++ b/src/main/resources/templates/modules/roadwarweb/roadwarregisterdashboard.html
@@ -577,7 +577,7 @@
 	
 		    <div class="total-roads-card">
 		        <div class="total-roads-label">GCC TOTAL ROADS</div>
-		        <div class="total-roads-count" id="erpMasterRoads">36807</div>
+		        <div class="total-roads-count" id="erpMasterRoads">0</div>
 		    </div>
 		    
 		    <div class="total-roads-card">
@@ -1169,7 +1169,7 @@
 <script>
 
 $(document).ready(function () {
-	/* loadOverallCount(); */
+	loadOverallCount();
 	loadDashboard();
 	$.ajax({
 		url: '/commissionerreview/api/roadwarweb/getzones',
@@ -1232,6 +1232,47 @@ $(document).ready(function () {
 	});
 });
 
+function loadOverallCount() {
+	 
+	 $("#pageLoader").show();
+
+   $.ajax({
+       url: '/commissionerreview/api/roadwarweb/getTotalRoadByGIS',
+       type: 'GET',
+       dataType: 'json',
+       success: function(response) {
+       	
+       	
+       	// Print the complete API response
+           console.log("getTotalRoadByGIS =", response);
+
+       	 // Print response as formatted JSON
+           //console.log(JSON.stringify(response, null, 2));
+
+           if (response.status) {
+
+               var data = response.data;
+
+               if (data && data.length > 0) {
+                   $("#erpMasterRoads").text(data[0].roadCount);
+               } else {
+                   $("#erpMasterRoads").text("0");
+               }
+
+           } else {
+               console.log(response.message);
+               $("#erpMasterRoads").text("0");
+           }
+           $("#pageLoader").hide();
+       },
+       error: function(xhr, status, error) {
+       	$("#pageLoader").hide();
+           console.error("Error fetching total roads countsby GIS:", error);
+       }
+   });
+
+} 
+
 $('#zone').change(function () {
 
 	let zone = $(this).val();
@@ -1283,30 +1324,7 @@ $("#ward, #roadType, #swd").change(function() {
     loadDashboard();
 
 });
-/* function loadOverallCount() {
-
-    $.ajax({
-        url: '/commissionerreview/api/roadwarweb/getoverallcount',
-        type: 'GET',
-        dataType: 'json',
-        success: function(response) {
-
-            if (response.length > 0 && response[0].status) {
-
-                var data = response[0].data[0];
-
-                $("#erpMasterRoads").text(data.erpMasterRoads);               
-
-            } else {
-                console.log(response[0].message);
-            }
-        },
-        error: function(xhr, status, error) {
-            console.error("Error fetching overall counts:", error);
-        }
-    });
-
-} */
+ 
 
 function renderZoneCounts(data) {
 
diff --git a/src/main/resources/templates/modules/streetvendor/overalldetails.html b/src/main/resources/templates/modules/streetvendor/overalldetails.html
index 2ca5020..3c828ef 100644
--- a/src/main/resources/templates/modules/streetvendor/overalldetails.html
+++ b/src/main/resources/templates/modules/streetvendor/overalldetails.html
@@ -86,18 +86,25 @@
 	        <tr>
 	        	<th  rowspan="2" class="text-center">Zone</th>
 	        	<th  rowspan="2" class="text-center">Application Received</th>
-	        	<th colspan="5" class="text-center">Application Processed</th>
-	        	<th rowspan="2" class="text-center">Total Processed</th>
-	        	<th rowspan="2" class="text-center">Pending </th>
+	        	<th colspan="2" class="text-center">Assistant</th>
+	        	<th colspan="2" class="text-center">LI</th>
+	        	<th colspan="2" class="text-center">ARO</th>
+	        	<th colspan="2" class="text-center">EE</th>
+	        	<th colspan="2" class="text-center">Committee</th>	        	
 	        	<th rowspan="2" class="text-center">Processed within 30 days</th>
 	        	
 	        </tr>
 	        <tr>
 	        	<th class="text-center">Assistant Processed</th>
+	        	<th class="text-center">Assistant Pending</th>
 	        	<th class="text-center">LI Processed</th>
+	        	<th class="text-center">LI Pending</th>
 	        	<th class="text-center">ARO Processed</th> 
+	        	<th class="text-center">ARO Pending</th> 
 	        	<th class="text-center">EE Processed</th> 
-	        	<th class="text-center">Committee Processed</th> 	           
+	        	<th class="text-center">EE Pending</th> 
+	        	<th class="text-center">Committee Processed</th> 
+	        	<th class="text-center">Committee Pending</th> 	           
 	        </tr>
 	        </thead>
 	        <tbody>
@@ -121,18 +128,25 @@
 				        <tr>
 				        	<th  rowspan="2" class="text-center">Ward</th>
 				        	<th  rowspan="2" class="text-center">Application Received</th>
-				        	<th colspan="5" class="text-center">Application Processed</th>
-				        	<th rowspan="2" class="text-center">Total Processed</th>
-				        	<th rowspan="2" class="text-center">Pending </th>
+				        	<th colspan="2" class="text-center">Assistant</th>
+				        	<th colspan="2" class="text-center">LI</th>
+				        	<th colspan="2" class="text-center">ARO</th>
+				        	<th colspan="2" class="text-center">EE</th>
+				        	<th colspan="2" class="text-center">Committee</th>
 				        	<th rowspan="2" class="text-center">Processed within 30 days</th>
 				        	
 				        </tr>
 				        <tr>
 				        	<th class="text-center">Assistant Processed</th>
+				        	<th class="text-center">Assistant Pending</th>
 				        	<th class="text-center">LI Processed</th>
+				        	<th class="text-center">LI Pending</th>
 				        	<th class="text-center">ARO Processed</th> 
+				        	<th class="text-center">ARO Pending</th> 
 				        	<th class="text-center">EE Processed</th> 
-				        	<th class="text-center">Committee Processed</th> 	           
+				        	<th class="text-center">EE Pending</th> 
+				        	<th class="text-center">Committee Processed</th> 
+				        	<th class="text-center">Committee Pending</th> 	   	           
 				        </tr>
 				        </thead>
 				        <tbody>
@@ -260,12 +274,15 @@ $('#fromDate, #toDate').on('change', function () {
 		                    { data: 'application_received', defaultContent: '-', className: 'text-center' },
 		                    
 	                        { data: 'assistant_processed', defaultContent: '-', className: 'text-center' },
+	                        { data: 'assistant_pending', defaultContent: '-', className: 'text-center' },
 	                        { data: 'li_processed', defaultContent: '-', className: 'text-center' },
-		                    { data: 'aro_processed', defaultContent: '-', className: 'text-center' },	                    
+	                        { data: 'li_pending', defaultContent: '-', className: 'text-center' },
+		                    { data: 'aro_processed', defaultContent: '-', className: 'text-center' },
+		                    { data: 'aro_pending', defaultContent: '-', className: 'text-center' },
 		                    { data: 'ee_processed', defaultContent: '-', className: 'text-center' },
+		                    { data: 'ee_pending', defaultContent: '-', className: 'text-center' },
 		                    { data: 'committee_processed', defaultContent: '-', className: 'text-center' },
-		                    { data: 'total_processed', defaultContent: '-', className: 'text-center' },
-		                    { data: 'pending', defaultContent: '-', className: 'text-center' },
+		                    { data: 'committee_pending', defaultContent: '-', className: 'text-center' },	                   
 		                    { data: 'processed_within_30_days', defaultContent: '-', className: 'text-center' }
 	                  ],
 	                  dom: 'Bfrtip',
@@ -444,12 +461,15 @@ function openZoneModal(zoneCode) {
                   { data: 'application_received', defaultContent: '-', className: 'text-center' },
                   
                   { data: 'assistant_processed', defaultContent: '-', className: 'text-center' },
+                  { data: 'assistant_pending', defaultContent: '-', className: 'text-center' },
                   { data: 'li_processed', defaultContent: '-', className: 'text-center' },
-                  { data: 'aro_processed', defaultContent: '-', className: 'text-center' },	                    
+                  { data: 'li_pending', defaultContent: '-', className: 'text-center' },
+                  { data: 'aro_processed', defaultContent: '-', className: 'text-center' },	
+                  { data: 'aro_pending', defaultContent: '-', className: 'text-center' },
                   { data: 'ee_processed', defaultContent: '-', className: 'text-center' },
+                  { data: 'ee_pending', defaultContent: '-', className: 'text-center' },
                   { data: 'committee_processed', defaultContent: '-', className: 'text-center' },
-                  { data: 'total_processed', defaultContent: '-', className: 'text-center' },
-                  { data: 'pending', defaultContent: '-', className: 'text-center' },
+                  { data: 'committee_pending', defaultContent: '-', className: 'text-center' },                 
                   { data: 'processed_within_30_days', defaultContent: '-', className: 'text-center' }
                   ],
                   dom: 'Bfrtip',