diff --git a/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java b/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java
deleted file mode 100644
index f6474c4..0000000
--- a/src/main/java/com/gcc/commissionerreview/configuration/DataSourceConfig.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.gcc.commissionerreview.configuration;
-
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
-
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-import javax.sql.DataSource;
-
-@Configuration
-@EnableTransactionManagement
-public class DataSourceConfig {
-
-	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";
-
-	public static class MyDataSourceConfig {
-		@Primary
-		@Bean(name = "mydatasource")
-
-		public DataSource MyDataSource() {
-			// DriverManagerDataSource dataSource = new DriverManagerDataSource();
-			// dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
-			// dataSource.setUrl("jdbc:mysql://"+host+"/dashboard_service");
-			// dataSource.setUsername("root");
-			// dataSource.setPassword("root");
-			// return dataSource;
-
-			DriverManagerDataSource dataSource = new DriverManagerDataSource();
-			dataSource.setUrl("jdbc:mysql://" + host + "/commissioner_review");
-			// dataSource.setUrl("jdbc:mysql://"+host+"/dashboard_service");
-			dataSource.setUsername("root");
-			dataSource.setPassword(dbpassword);
-			dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
-			return dataSource;
-
-		}
-
-		@Primary
-		@Bean(name = "myTransactionManager")
-		public PlatformTransactionManager myTransactionManager(@Qualifier("mydatasource") DataSource dataSource) {
-			return new DataSourceTransactionManager(dataSource);
-		}
-	}
-
-	////////////////////////////// Domestic Waste Management
-	////////////////////////////// ////////////////////////
-	@Bean(name = "mysqlSofaBedCollectionDataSource")
-	public DataSource mysqlSofaBedCollectionDataSource() {
-		DriverManagerDataSource dataSource = new DriverManagerDataSource();
-		dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
-		dataSource.setUrl("jdbc:mysql://" + host + "/domestic_waste_management");
-		dataSource.setUsername("root");
-		dataSource.setPassword(dbpassword);
-		return dataSource;
-	}
-
-	////////////////////////////// Food distribution ////////////////////////
-	@Bean(name = "mysqlFoodDistributionDataSource")
-	public DataSource mysqlFoodDistributionDataSource() {
-		DriverManagerDataSource dataSource = new DriverManagerDataSource();
-		dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
-		dataSource.setUrl("jdbc:mysql://" + host + "/gcc_food_distribution");
-		dataSource.setUsername("root");
-		dataSource.setPassword(dbpassword);
-		return dataSource;
-	}
-
-	////////////////////////////// ORACLE ////////////////////////
-	@Bean(name = "oracleDataSource")
-	public DataSource oracleDataSource() {
-		DriverManagerDataSource dataSource = new DriverManagerDataSource();
-		dataSource.setDriverClassName("oracle.jdbc.OracleDriver");
-		dataSource.setUrl("jdbc:oracle:thin:@10.1.0.14:1521:chncorp");
-		dataSource.setUsername("FAS");
-		dataSource.setPassword("FAS");
-		return dataSource;
-	}
-}
diff --git a/src/main/java/com/gcc/commissionerreview/controller/FoodSchemeController.java b/src/main/java/com/gcc/commissionerreview/controller/FoodSchemeController.java
deleted file mode 100644
index d0979e0..0000000
--- a/src/main/java/com/gcc/commissionerreview/controller/FoodSchemeController.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.gcc.commissionerreview.controller;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.gcc.commissionerreview.service.FoodSchemeService;
-
-@RestController
-@RequestMapping("/commissionerreview/api")
-public class FoodSchemeController {
-
-    @Autowired
-    private FoodSchemeService foodSchemeService;
-
-    /*
-     * @GetMapping("/feedback-summary")
-     * public List<Map<String, Object>> getFeedbackSummary(@RequestParam String
-     * date) {
-     * return feedbackService.getFeedbackSummary(date);
-     * }
-     * 
-     * @GetMapping("/driver-report")
-     * public List<Map<String, Object>> getDriverReport(@RequestParam String date) {
-     * //System.out.println("Date received in controller: " + date);
-     * return feedbackService.getDriverReport(date);
-     * }
-     */
-    // ak
-    @GetMapping("/feedback-summary")
-    public ResponseEntity<?> getFeedbackSummary(@RequestParam String date) {
-        try {
-            List<Map<String, Object>> data = foodSchemeService.getFeedbackSummary(date);
-
-            Map<String, Object> response = new HashMap<>();
-            response.put("status", "success");
-            response.put("date", date);
-            response.put("data", data);
-
-            return ResponseEntity.ok(response);
-
-        } catch (Exception e) {
-            Map<String, Object> error = new HashMap<>();
-            error.put("status", "error");
-            error.put("message", e.getMessage());
-
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error);
-        }
-    }
-
-    // ak
-    @GetMapping("/zone-details")
-    public ResponseEntity<?> getZoneDetails(
-            @RequestParam int qid,
-            @RequestParam String column,
-            @RequestParam String date) {
-
-        try {
-            List<Map<String, Object>> data = foodSchemeService.getZoneDetails(qid, column, date);
-
-            Map<String, Object> response = new HashMap<>();
-            response.put("status", "success");
-            response.put("date", date);
-            response.put("data", data);
-
-            return ResponseEntity.ok(response);
-
-        } catch (Exception e) {
-            Map<String, Object> error = new HashMap<>();
-            error.put("status", "error");
-            error.put("message", e.getMessage());
-
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error);
-        }
-    }
-
-    
-
-    @GetMapping("/ward-details")
-    public ResponseEntity<?> getWardDetails(
-            @RequestParam int qid,
-            @RequestParam String column,
-            @RequestParam String date,
-            @RequestParam int zoneId) {
-
-        return ResponseEntity.ok(Map.of(
-                "status", "success",
-                "date", date,
-                "data", foodSchemeService.getWardDetails(qid, column, date, zoneId)));
-    }
-
-    @GetMapping("/driver-report")
-    public ResponseEntity<?> getDriverReport(@RequestParam String date, @RequestParam(required = false) Integer zone) {
-        try {
-            List<Map<String, Object>> data = foodSchemeService.getDriverReport(date, zone);
-
-            Map<String, Object> response = new HashMap<>();
-            response.put("status", "success");
-            response.put("date", date);
-            response.put("data", data);
-
-            return ResponseEntity.ok(response);
-
-        } catch (Exception e) {
-            Map<String, Object> error = new HashMap<>();
-            error.put("status", "error");
-            error.put("message", e.getMessage());
-
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error);
-        }
-    }
-
-    @GetMapping("/zones")
-    public ResponseEntity<?> getZones() {
-        List<Map<String, Object>> data = foodSchemeService.getZones();
-        return ResponseEntity.ok(Map.of("data", data));
-    }
-
-    /// yogi
-    @GetMapping("/abstract")
-    public ResponseEntity<?> getAbstractReport(@RequestParam String date) {
-        try {
-            List<Map<String, Object>> report = foodSchemeService.getAbstractReport(date);
-            // System.out.println("report : " + report);
-
-            Map<String, Object> response = new HashMap<>();
-            response.put("status", "success");
-            response.put("date", date);
-            response.put("data", report);
-
-            return ResponseEntity.ok(response);
-
-        } catch (Exception e) {
-            Map<String, Object> error = new HashMap<>();
-            error.put("status", "error");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error);
-        }
-    }
-
-    @GetMapping("/zoneandshiftbasedreport")
-    public ResponseEntity<?> getZoneWiseShiftBasedReport(@RequestParam String date, @RequestParam Integer shiftId) {
-        try {
-            List<Map<String, Object>> report = foodSchemeService.getZoneWiseShiftBasedReport(date, shiftId);
-            // System.out.println("report : " + report);
-
-            Map<String, Object> response = new HashMap<>();
-            response.put("status", "success");
-            response.put("date", date);
-            response.put("data", report);
-
-            return ResponseEntity.ok(response);
-
-        } catch (Exception e) {
-            Map<String, Object> error = new HashMap<>();
-            error.put("status", "error");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error);
-        }
-    }
-
-    @GetMapping("/wardwiseShiftReport")
-    public ResponseEntity<?> getWardWiseShiftReport(
-            @RequestParam String date,
-            @RequestParam Integer shiftId,
-            @RequestParam Integer zone) {
-
-        try {
-            List<Map<String, Object>> data = foodSchemeService.getWardWiseShiftReport(shiftId, zone, date);
-
-            Map<String, Object> response = new HashMap<>();
-            response.put("status", "success");
-            response.put("zone", zone);
-            response.put("data", data);
-
-            return ResponseEntity.ok(response);
-
-        } catch (Exception e) {
-            Map<String, Object> error = new HashMap<>();
-            error.put("status", "error");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error);
-        }
-    }
-
-    @GetMapping("/wardlocationreport")
-    public ResponseEntity<?> getWardLocationReport(@RequestParam String date) {
-        try {
-            List<Map<String, Object>> report = foodSchemeService.getWardLocationWiseReport(date);
-
-            Map<String, Object> response = new HashMap<>();
-            response.put("status", "success");
-            response.put("date", date);
-            response.put("data", report);
-
-            return ResponseEntity.ok(response);
-        } catch (Exception e) {
-            Map<String, Object> error = new HashMap<>();
-            error.put("status", "error");
-            error.put("message", e.getMessage());
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error);
-        }
-    }
-
-}
diff --git a/src/main/java/com/gcc/commissionerreview/service/FoodSchemeService.java b/src/main/java/com/gcc/commissionerreview/service/FoodSchemeService.java
deleted file mode 100644
index 95ec871..0000000
--- a/src/main/java/com/gcc/commissionerreview/service/FoodSchemeService.java
+++ /dev/null
@@ -1,1865 +0,0 @@
-package com.gcc.commissionerreview.service;
-
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.imageio.ImageIO;
-import javax.sql.DataSource;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.env.Environment;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Service;
-import java.net.URL;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
-import javax.imageio.ImageIO;
-
-import java.util.Arrays;
-import java.util.Base64;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.Map;
-
-import com.gcc.commissionerreview.configuration.AppConfig;
-
-@Service
-public class FoodSchemeService {
-
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-    @Autowired
-    private Environment environment;
-    @Autowired
-    private AppConfig appConfig;
-
-    @Autowired
-    @Value("${fileBaseUrl}")
-
-    private String fileBaseUrl;
-
-    // ak for pdf image render
-    // private final Map<String, String> imageCache = new ConcurrentHashMap<>();
-
-    @Autowired
-    public void setFeedbackDataSource(@Qualifier("mysqlFoodDistributionDataSource") DataSource dataSource) {
-        this.jdbcTemplate = new JdbcTemplate(dataSource);
-    }
-
-    public FoodSchemeService(Environment environment) {
-
-        this.environment = environment;
-
-        this.fileBaseUrl = environment.getProperty("fileBaseUrl");
-    }
-    /*
-     * private String convertUrlToBase64(String url) {
-     * try {
-     * if (imageCache.containsKey(url)) {
-     * return imageCache.get(url);
-     * }
-     * 
-     * URL imageUrl = new URL(url);
-     * BufferedImage image = ImageIO.read(imageUrl);
-     * 
-     * ByteArrayOutputStream baos = new ByteArrayOutputStream();
-     * ImageIO.write(image, "jpeg", baos);
-     * 
-     * String base64 = "data:image/jpeg;base64," +
-     * Base64.getEncoder().encodeToString(baos.toByteArray());
-     * 
-     * imageCache.put(url, base64);
-     * return base64;
-     * 
-     * } catch (Exception e) {
-     * e.printStackTrace();
-     * return null;
-     * }
-     * }
-     */
-
-    public List<Map<String, Object>> getFeedbackSummary(String date) {
-
-        String sql = "SELECT " +
-                "    fq.qid, " +
-                "    fq.question, " +
-                "fq.qid, " +
-
-                "    SUM(CASE WHEN fq.qid = 1 AND fd.q1 = '1' THEN 1 ELSE 0 END) AS on_time_distribution, " +
-                "    SUM(CASE WHEN fq.qid = 1 AND fd.q1 = '2' THEN 1 ELSE 0 END) AS delayeded, " +
-
-                "    SUM(CASE WHEN fq.qid = 2 AND fd.q2 = '3' THEN 1 ELSE 0 END) AS good, " +
-                "    SUM(CASE WHEN fq.qid = 2 AND fd.q2 = '4' THEN 1 ELSE 0 END) AS average, " +
-
-                "    SUM(CASE WHEN fq.qid = 3 AND fd.q3 = '5' THEN 1 ELSE 0 END) AS sufficient_food_quantity, " +
-                "    SUM(CASE WHEN fq.qid = 3 AND fd.q3 = '6' THEN 1 ELSE 0 END) AS less_quantity " +
-
-                "FROM feedback_questions fq " + // ← space added
-                "LEFT JOIN feedback_data fd " + // ← space added
-                "    ON fd.isactive = 1 " + // ← space added
-                "    AND fd.isdelete = 0 " + // ← space added
-                "    AND DATE(fd.feedback_date) = ? " + // ← space added
-
-                "WHERE fq.isactive = 1 " +
-                "AND fq.isdelete = 0 " +
-
-                "GROUP BY fq.qid, fq.question " +
-                "ORDER BY fq.orderby";
-
-        return jdbcTemplate.queryForList(sql, date);
-
-    }
-
-    // ak
-    public List<Map<String, Object>> getZoneDetails(int qid, String column, String date) {
-
-        String sql = "SELECT lm.zone, fq.qid, fq.question, " +
-                "SUM(CASE " +
-                "   WHEN ? = 'on_time_distribution' AND fd.q1 = '1' THEN 1 " +
-                "   WHEN ? = 'delayeded' AND fd.q1 = '2' THEN 1 " +
-
-                "   WHEN ? = 'good' AND fd.q2 = '3' THEN 1 " +
-                "   WHEN ? = 'average' AND fd.q2 = '4' THEN 1 " +
-
-                "   WHEN ? = 'sufficient_food_quantity' AND fd.q3 = '5' THEN 1 " +
-                "   WHEN ? = 'less_quantity' AND fd.q3 = '6' THEN 1 " +
-                "   ELSE 0 END) AS count_value " +
-
-                "FROM feedback_data fd " +
-                "INNER JOIN location_mapping lm ON fd.feedback_by = lm.siloginid " +
-                "INNER JOIN feedback_questions fq ON fq.qid = ? " +
-
-                "WHERE fd.isactive = 1 " +
-                "AND fd.isdelete = 0 " +
-                "AND DATE(fd.feedback_date) = ? " +
-
-                "GROUP BY lm.zone, fq.qid, fq.question " +
-                "ORDER BY lm.zone";
-
-        return jdbcTemplate.queryForList(
-                sql,
-                column, column, column, column, column, column, // 6 column comparisons
-                qid, // qid
-                date // date
-        );
-    }
-
-    /*
-     * public List<Map<String, Object>> getZoneDetails(int qid, String column,
-     * String date) {
-     * 
-     * String sql = "SELECT lm.zone, fq.qid, fq.question, " +
-     * "SUM(CASE " +
-     * "   WHEN ? = 'on_time_distribution' AND fd.q1 = '1' THEN 1 " +
-     * "   WHEN ? = 'delayeded' AND fd.q1 = '2' THEN 1 " +
-     * 
-     * "   WHEN ? = 'good' AND fd.q2 = '3' THEN 1 " +
-     * "   WHEN ? = 'average' AND fd.q2 = '4' THEN 1 " +
-     * 
-     * "   WHEN ? = 'sufficient_food_quantity' AND fd.q3 = '5' THEN 1 " +
-     * "   WHEN ? = 'less_quantity' AND fd.q3 = '6' THEN 1 " +
-     * "   ELSE 0 END) AS count_value " +
-     * 
-     * "FROM location_mapping lm " +
-     * "LEFT JOIN feedback_data fd ON fd.feedback_by = lm.siloginid " +
-     * "    AND fd.isactive = 1 " +
-     * "    AND fd.isdelete = 0 " +
-     * "    AND DATE(fd.feedback_date) = ? " +
-     * 
-     * "LEFT JOIN feedback_questions fq ON fq.qid = ? " +
-     * 
-     * "GROUP BY lm.zone, fq.qid, fq.question " +
-     * "ORDER BY lm.zone";
-     * 
-     * return jdbcTemplate.queryForList(sql,
-     * column, column, column, column, column, column, // bind 6 times
-     * date, // date
-     * qid // qid
-     * );
-     * }
-     */
-
-    public List<Map<String, Object>> getDriverReport(String date, Integer zone) {
-        // System.out.println("File Base URL: " + fileBaseUrl);.
-        String zoneCondition = "";
-        if (zone != null) {
-            zoneCondition = " AND lm.zone = " + zone + " ";
-        }
-        System.out.println("zoneCondition: " + zone);
-
-        String sql = "SELECT lm.location AS LocationDescription, " +
-                "dl.username AS DriverName, " +
-                "lm.zone AS Zone, " +
-                "lm.ward AS Ward, " +
-                "SUBSTRING(dss_start.driver_live_mobile, 4) AS DriverMobile, " +
-                "CONCAT('" + fileBaseUrl + "/gccofficialapp/files', dss_start.image) AS StartImage, " +
-                // "CONCAT(dss_start.latitude, ', ', dss_start.longitude) AS StartPoint, " +
-                "dss_start.address AS StartAddress, " +
-
-                // "DATE_FORMAT(dss_start.datetime, '%Y-%m-%d %H:%i') AS StartTime, " +
-                "DATE_FORMAT(dss_start.datetime, '%h:%i %p') AS StartTime," +
-                // "CONCAT(dss_stop.latitude, ', ', dss_stop.longitude) AS EndPoint, " +
-                "dss_stop.address AS EndAddress, " +
-                "CONCAT('" + fileBaseUrl + "/gccofficialapp/files', dss_stop.image) AS EndImage, " +
-                // "DATE_FORMAT(dss_stop.datetime, '%Y-%m-%d %H:%i') AS EndTime " +
-                "DATE_FORMAT(dss_stop.datetime, '%h:%i %p') AS EndTime " +
-
-                "FROM location_mapping lm " +
-                "INNER JOIN driver_login dl ON dl.loginid = lm.driverid " +
-
-                "LEFT JOIN driver_start_stop dss_start " +
-                "ON dss_start.loginid = lm.driverid " +
-                "AND dss_start.action = 'Start' " +
-
-                "LEFT JOIN driver_start_stop dss_stop " +
-                "ON dss_stop.loginid = lm.driverid " +
-                "AND dss_stop.action = 'Stop' " +
-                "AND dss_stop.startid = dss_start.locationid " +
-
-                "WHERE DATE(dss_start.datetime) = ?" + zoneCondition +
-                "order by dss_start.datetime";
-
-        return jdbcTemplate.queryForList(sql, date);
-    }
-
-    public List<Map<String, Object>> getZones() {
-        String sql = "SELECT DISTINCT zone FROM location_mapping ";
-        return jdbcTemplate.queryForList(sql);
-    }
-
-    // yogi used has old without isactive isdelete
-    // public List<Map<String, Object>> getAbstractReport(String date) {
-
-    // String sql = """
-    // SELECT * FROM (
-
-    // SELECT
-
-    // sm.name AS shift_name,
-    // sm.Code as shift_code,
-    // sm.shiftid as shiftid,
-    // IFNULL(SUM(gru.total_food_requested), 0) AS food_requested,
-    // IFNULL(SUM(gru.total_food_received), 0) AS food_delivered,
-    // IFNULL(SUM(dr.nulm + dr.private + dr.permanent), 0) AS overall_count,
-    // IFNULL(SUM(dr.nulm + dr.private + dr.permanent), 0) AS present_count,
-    // IFNULL(SUM(gru.today_absentees_nulm + gru.today_absentees_private +
-    // gru.today_absentees_permanent), 0) AS unplanned_count,
-    // IFNULL(SUM(dr.absentees_nulm + dr.absentees_private +
-    // dr.absentees_permanent), 0) AS absent_count,
-    // IFNULL(SUM(gru.total_box_shortfall), 0) AS food_shortfall
-    // FROM shift_master sm
-    // LEFT JOIN daily_request dr
-    // ON sm.shiftid = dr.shiftid AND dr.required_date = ?
-    // LEFT JOIN gcc_received_update gru
-    // ON gru.requestid = dr.requestid
-    // GROUP BY sm.shiftid, sm.name
-
-    // UNION ALL
-
-    // SELECT
-    // 'Total' AS shift_name,
-    // 'TOTAL' AS shift_code,
-    // 'TOTAL' as shift_id,
-    // IFNULL(SUM(gru.total_food_requested), 0),
-    // IFNULL(SUM(gru.total_food_received), 0),
-    // IFNULL(SUM(dr.nulm + dr.private + dr.permanent), 0),
-    // IFNULL(SUM(dr.nulm + dr.private + dr.permanent), 0),
-    // IFNULL(SUM(gru.today_absentees_nulm + gru.today_absentees_private +
-    // gru.today_absentees_permanent), 0),
-    // IFNULL(SUM(dr.absentees_nulm + dr.absentees_private +
-    // dr.absentees_permanent), 0),
-    // IFNULL(SUM(gru.total_box_shortfall), 0)
-    // FROM shift_master sm
-    // LEFT JOIN daily_request dr
-    // ON sm.shiftid = dr.shiftid AND dr.required_date = ?
-    // LEFT JOIN gcc_received_update gru
-    // ON gru.requestid = dr.requestid
-    // ) AS final_result
-    // """;
-
-    // return jdbcTemplate.queryForList(sql, date, date);
-    // }
-
-    // new abstract report old
-    // public List<Map<String, Object>> getAbstractReport(String date) {
-
-    // String sql = """
-    // SELECT * FROM (
-
-    // /* ================= SHIFT-WISE SUMMARY ================= */
-    // SELECT
-    // sm.name AS shift_name,
-    // sm.code AS shift_code,
-    // sm.shiftid AS shiftid,
-
-    // /* ---------------- TOTAL COMPLEMENT ---------------- */
-    // IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0) AS
-    // total_complement,
-
-    // /* ---------------- WEEKLY OFF ---------------- */
-    // IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm
-    // +
-    // dr.weeklyoff_others + dr.weeklyoff_nmr), 0) AS weekly_off,
-
-    // /* ---------------- PLANNED LEAVE ---------------- */
-    // IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.absentees_nulm
-    // +
-    // dr.absentees_others + dr.absentees_nmr), 0) AS planned_leave,
-
-    // /* ---------------- PRESENT COUNT ---------------- */
-    // (
-    // IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-    // -
-    // IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm
-    // +
-    // dr.weeklyoff_others + dr.weeklyoff_nmr), 0)
-    // -
-    // IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.absentees_nulm
-    // +
-    // dr.absentees_others + dr.absentees_nmr), 0)
-    // ) AS present_count,
-
-    // /* ---------------- FOOD REQUESTED ---------------- */
-    // (
-    // IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-    // -
-    // IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm
-    // +
-    // dr.weeklyoff_others + dr.weeklyoff_nmr), 0)
-    // -
-    // IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.absentees_nulm
-    // +
-    // dr.absentees_others + dr.absentees_nmr), 0)
-    // ) AS food_requested,
-
-    // /* ---------------- FOOD DELIVERED ---------------- */
-    // IFNULL(SUM(gru.total_food_received), 0) AS food_delivered,
-
-    // /* ---------------- FOOD SHORTFALL ---------------- */
-    // (
-    // (
-    // IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-    // -
-    // IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm
-    // +
-    // dr.weeklyoff_others + dr.weeklyoff_nmr), 0)
-    // -
-    // IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.absentees_nulm
-    // +
-    // dr.absentees_others + dr.absentees_nmr), 0)
-    // )
-    // -
-    // IFNULL(SUM(gru.total_food_received), 0)
-    // ) AS food_shortfall
-
-    // FROM shift_master sm
-    // LEFT JOIN daily_request dr
-    // ON sm.shiftid = dr.shiftid AND dr.required_date = ?
-    // LEFT JOIN gcc_received_update gru
-    // ON gru.requestid = dr.requestid
-    // WHERE sm.isactive = 1 AND sm.isdelete = 0
-    // GROUP BY sm.shiftid, sm.name
-
-    // UNION ALL
-
-    // /* ================= TOTAL SUMMARY ================= */
-    // SELECT
-    // 'Total' AS shift_name,
-    // 'TOTAL' AS shift_code,
-    // 'TOTAL' AS shiftid,
-
-    // /* TOTAL COMPLEMENT */
-    // IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0),
-
-    // /* WEEKLY OFF */
-    // IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm
-    // +
-    // dr.weeklyoff_others + dr.weeklyoff_nmr), 0),
-
-    // /* PLANNED LEAVE */
-    // IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.absentees_nulm
-    // +
-    // dr.absentees_others + dr.absentees_nmr), 0),
-
-    // /* PRESENT COUNT */
-    // (
-    // IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-    // -
-    // IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm
-    // +
-    // dr.weeklyoff_others + dr.weeklyoff_nmr), 0)
-    // -
-    // IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.absentees_nulm
-    // +
-    // dr.absentees_others + dr.absentees_nmr), 0)
-    // ),
-
-    // /* FOOD REQUESTED */
-    // (
-    // IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-    // -
-    // IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm
-    // +
-    // dr.weeklyoff_others + dr.weeklyoff_nmr), 0)
-    // -
-    // IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.absentees_nulm
-    // +
-    // dr.absentees_others + dr.absentees_nmr), 0)
-    // ),
-
-    // /* FOOD DELIVERED */
-    // IFNULL(SUM(gru.total_food_received), 0),
-
-    // /* FOOD SHORTFALL */
-    // (
-    // (
-    // IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-    // -
-    // IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm
-    // +
-    // dr.weeklyoff_others + dr.weeklyoff_nmr), 0)
-    // -
-    // IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.absentees_nulm
-    // +
-    // dr.absentees_others + dr.absentees_nmr), 0)
-    // )
-    // -
-    // IFNULL(SUM(gru.total_food_received), 0)
-    // )
-
-    // FROM shift_master sm
-    // LEFT JOIN daily_request dr
-    // ON sm.shiftid = dr.shiftid AND dr.required_date = ?
-    // LEFT JOIN gcc_received_update gru
-    // ON gru.requestid = dr.requestid
-    // WHERE sm.isactive = 1 AND sm.isdelete = 0
-    // ) final_table
-    // """;
-
-    // return jdbcTemplate.queryForList(sql, date, date);
-    // }
-
-    // with using isactive and isdelete
-    public List<Map<String, Object>> getAbstractReport(String date) {
-
-        String sql = """
-                SELECT * FROM (
-
-                    /* ================= SHIFT-WISE SUMMARY ================= */
-                    SELECT
-                        sm.name AS shift_name,
-                        sm.code AS shift_code,
-                        sm.shiftid AS shiftid,
-
-                        /* TOTAL COMPLEMENT */
-                        IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0) AS total_complement,
-
-                        /* WEEKLY OFF */
-                        IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm +
-                                    dr.weeklyoff_others + dr.weeklyoff_nmr), 0) AS weekly_off,
-
-                        /* PLANNED LEAVE */
-                        IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.absentees_nulm +
-                                    dr.absentees_others + dr.absentees_nmr), 0) AS planned_leave,
-
-                        /* PRESENT COUNT */
-                        (
-                            IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-                            -
-                            IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm +
-                                        dr.weeklyoff_others + dr.weeklyoff_nmr), 0)
-                            -
-                            IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.absentees_nulm +
-                                        dr.absentees_others + dr.absentees_nmr), 0)
-                        ) AS present_count,
-
-                        /* FOOD REQUESTED = PRESENT COUNT */
-                        (
-                            IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-                            -
-                            IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm +
-                                        dr.weeklyoff_others + dr.weeklyoff_nmr), 0)
-                            -
-                            IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.absentees_nulm +
-                                        dr.absentees_others + dr.absentees_nmr), 0)
-                        ) AS food_requested,
-
-                        /* FOOD DELIVERED */
-                        IFNULL(SUM(gru.total_food_received), 0) AS food_delivered,
-
-                        /* FOOD SHORTFALL */
-                        (
-                            (
-                                IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-                                -
-                                IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm +
-                                            dr.weeklyoff_others + dr.weeklyoff_nmr), 0)
-                                -
-                                IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.absentees_nulm +
-                                            dr.absentees_others + dr.absentees_nmr), 0)
-                            )
-                            -
-                            IFNULL(SUM(gru.total_food_received), 0)
-                        ) AS food_shortfall
-
-                    FROM shift_master sm
-                    LEFT JOIN daily_request dr
-                        ON sm.shiftid = dr.shiftid
-                        AND dr.required_date = ?
-                        AND dr.isactive = 1
-                        AND dr.isdelete = 0
-                    LEFT JOIN gcc_received_update gru
-                        ON gru.requestid = dr.requestid
-                        AND gru.isactive = 1
-                        AND gru.isdelete = 0
-                    WHERE sm.isactive = 1 AND sm.isdelete = 0
-                    GROUP BY sm.shiftid, sm.name
-
-                    UNION ALL
-
-                    /* ================= TOTAL SUMMARY ================= */
-                    SELECT
-                        'Total' AS shift_name,
-                        'TOTAL' AS shift_code,
-                        'TOTAL' AS shiftid,
-
-                        /* TOTAL COMPLEMENT */
-                        IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0),
-
-                        /* WEEKLY OFF */
-                        IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm +
-                                    dr.weeklyoff_others + dr.weeklyoff_nmr), 0),
-
-                        /* PLANNED LEAVE */
-                        IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.absentees_nulm +
-                                    dr.absentees_others + dr.absentees_nmr), 0),
-
-                        /* PRESENT COUNT */
-                        (
-                            IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-                            -
-                            IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm +
-                                        dr.weeklyoff_others + dr.weeklyoff_nmr), 0)
-                            -
-                            IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.absentees_nulm +
-                                        dr.absentees_others + dr.absentees_nmr), 0)
-                        ),
-
-                        /* FOOD REQUESTED */
-                        (
-                            IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-                            -
-                            IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm +
-                                        dr.weeklyoff_others + dr.weeklyoff_nmr), 0)
-                            -
-                            IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.absentees_nulm +
-                                        dr.absentees_others + dr.absentees_nmr), 0)
-                        ),
-
-                        /* FOOD DELIVERED */
-                        IFNULL(SUM(gru.total_food_received), 0),
-
-                        /* FOOD SHORTFALL */
-                        (
-                            (
-                                IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-                                -
-                                IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm +
-                                            dr.weeklyoff_others + dr.weeklyoff_nmr), 0)
-                                -
-                                IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.absentees_nulm +
-                                            dr.absentees_others + dr.absentees_nmr), 0)
-                            )
-                            -
-                            IFNULL(SUM(gru.total_food_received), 0)
-                        )
-
-                    FROM shift_master sm
-                    LEFT JOIN daily_request dr
-                        ON sm.shiftid = dr.shiftid
-                        AND dr.required_date = ?
-                        AND dr.isactive = 1
-                        AND dr.isdelete = 0
-                    LEFT JOIN gcc_received_update gru
-                        ON gru.requestid = dr.requestid
-                        AND gru.isactive = 1
-                        AND gru.isdelete = 0
-                    WHERE sm.isactive = 1 AND sm.isdelete = 0
-                ) final_table
-                """;
-
-        return jdbcTemplate.queryForList(sql, date, date);
-    }
-
-    public List<Map<String, Object>> getWardDetails(int qid, String column, String date, int zone) {
-
-        String imageColumn = "";
-        String whereCondition = ""; // <-- will be used in WHERE
-        String sumCondition = ""; // <-- used inside SUM()
-
-        switch (column) {
-            case "on_time_distribution":
-                imageColumn = "fd.q1_img";
-                whereCondition = "fd.q1 = '1'";
-                sumCondition = "fd.q1 = '1'";
-                break;
-
-            case "delayeded":
-                imageColumn = "fd.q1_img";
-                whereCondition = "fd.q1 = '2'";
-                sumCondition = "fd.q1 = '2'";
-                break;
-
-            case "good":
-                imageColumn = "fd.q2_img";
-                whereCondition = "fd.q2 = '3'";
-                sumCondition = "fd.q2 = '3'";
-                break;
-
-            case "average":
-                imageColumn = "fd.q2_img";
-                whereCondition = "fd.q2 = '4'";
-                sumCondition = "fd.q2 = '4'";
-                break;
-
-            case "sufficient_food_quantity":
-                imageColumn = "fd.q3_img";
-                whereCondition = "fd.q3 = '5'";
-                sumCondition = "fd.q3 = '5'";
-                break;
-
-            case "less_quantity":
-                imageColumn = "fd.q3_img";
-                whereCondition = "fd.q3 = '6'";
-                sumCondition = "fd.q3 = '6'";
-                break;
-        }
-
-        String sql = "SELECT lm.ward,lm.location, fq.question, " +
-                "SUM(CASE WHEN " + sumCondition + " THEN 1 ELSE 0 END) AS count_value, " +
-                "CONCAT('" + fileBaseUrl + "/gccofficialapp/files'," + imageColumn + ") AS feedbackImage " +
-                "FROM feedback_data fd " +
-                "INNER JOIN location_mapping lm ON fd.feedback_by = lm.siloginid " +
-                "INNER JOIN feedback_questions fq ON fq.qid = ? " +
-                "WHERE lm.zone = ? " +
-                "AND DATE(fd.feedback_date) = ? " +
-                "AND fd.isactive = 1 AND fd.isdelete = 0 " +
-                "AND " + whereCondition + " " + // <-- EXACT MATCH ADDED
-                "GROUP BY lm.ward,lm.location,fq.question, " + imageColumn + " " +
-                "ORDER BY lm.ward";
-
-        return jdbcTemplate.queryForList(sql, qid, zone, date);
-    }
-
-    // with using isactive and isdelete
-    // public List<Map<String, Object>> getZoneWiseShiftBasedReport(String date, int
-    // shiftId) {
-
-    // String sql = """
-    // SELECT *
-    // FROM (
-
-    // /* ================= ZONE-WISE SUMMARY ================= */
-    // SELECT
-    // z.zone AS zone,
-
-    // /* -------- TOTAL COMPLEMENT -------- */
-    // (
-    // SELECT IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others),
-    // 0)
-    // FROM daily_request dr
-    // WHERE dr.required_date = ?
-    // AND dr.shiftid = ?
-    // AND dr.request_by IN (
-    // SELECT lm.siloginid FROM location_mapping lm WHERE lm.zone = z.zone
-    // )
-    // ) AS total_complement,
-
-    // /* -------- WEEKLY OFF -------- */
-    // (
-    // SELECT IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private +
-    // dr.weeklyoff_nulm + dr.weeklyoff_others + dr.weeklyoff_nmr), 0)
-    // FROM daily_request dr
-    // WHERE dr.required_date = ?
-    // AND dr.shiftid = ?
-    // AND dr.request_by IN (
-    // SELECT lm.siloginid FROM location_mapping lm WHERE lm.zone = z.zone
-    // )
-    // ) AS weekly_off,
-
-    // /* -------- PLANNED LEAVE -------- */
-    // (
-    // SELECT IFNULL(SUM(dr.absentees_permanent + dr.absentees_private +
-    // dr.absentees_nulm + dr.absentees_others + dr.absentees_nmr), 0)
-    // FROM daily_request dr
-    // WHERE dr.required_date = ?
-    // AND dr.shiftid = ?
-    // AND dr.request_by IN (
-    // SELECT lm.siloginid FROM location_mapping lm WHERE lm.zone = z.zone
-    // )
-    // ) AS planned_leave,
-
-    // /* -------- PRESENT COUNT -------- */
-    // (
-    // (
-    // SELECT IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others),
-    // 0)
-    // FROM daily_request dr
-    // WHERE dr.required_date = ?
-    // AND dr.shiftid = ?
-    // AND dr.request_by IN (
-    // SELECT lm.siloginid FROM location_mapping lm WHERE lm.zone = z.zone
-    // )
-    // )
-    // -
-    // (
-    // SELECT IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private +
-    // dr.weeklyoff_nulm + dr.weeklyoff_others + dr.weeklyoff_nmr), 0)
-    // FROM daily_request dr
-    // WHERE dr.required_date = ?
-    // AND dr.shiftid = ?
-    // AND dr.request_by IN (
-    // SELECT lm.siloginid FROM location_mapping lm WHERE lm.zone = z.zone
-    // )
-    // )
-    // -
-    // (
-    // SELECT IFNULL(SUM(dr.absentees_permanent + dr.absentees_private +
-    // dr.absentees_nulm + dr.absentees_others + dr.absentees_nmr), 0)
-    // FROM daily_request dr
-    // WHERE dr.required_date = ?
-    // AND dr.shiftid = ?
-    // AND dr.request_by IN (
-    // SELECT lm.siloginid FROM location_mapping lm WHERE lm.zone = z.zone
-    // )
-    // )
-    // ) AS present_count,
-
-    // /* -------- FOOD REQUESTED -------- */
-    // (
-    // (
-    // SELECT IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others),
-    // 0)
-    // FROM daily_request dr
-    // WHERE dr.required_date = ?
-    // AND dr.shiftid = ?
-    // AND dr.request_by IN (
-    // SELECT lm.siloginid FROM location_mapping lm WHERE lm.zone = z.zone
-    // )
-    // )
-    // -
-    // (
-    // SELECT IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private +
-    // dr.weeklyoff_nulm + dr.weeklyoff_others + dr.weeklyoff_nmr), 0)
-    // FROM daily_request dr
-    // WHERE dr.required_date = ?
-    // AND dr.shiftid = ?
-    // AND dr.request_by IN (
-    // SELECT lm.siloginid FROM location_mapping lm WHERE lm.zone = z.zone
-    // )
-    // )
-    // -
-    // (
-    // SELECT IFNULL(SUM(dr.absentees_permanent + dr.absentees_private +
-    // dr.absentees_nulm + dr.absentees_others + dr.absentees_nmr), 0)
-    // FROM daily_request dr
-    // WHERE dr.required_date = ?
-    // AND dr.shiftid = ?
-    // AND dr.request_by IN (
-    // SELECT lm.siloginid FROM location_mapping lm WHERE lm.zone = z.zone
-    // )
-    // )
-    // ) AS food_requested,
-
-    // /* -------- FOOD DELIVERED -------- */
-    // (
-    // SELECT IFNULL(SUM(gru.total_food_received), 0)
-    // FROM gcc_received_update gru
-    // WHERE gru.shiftid = ?
-    // AND gru.requestid IN (
-    // SELECT dr.requestid
-    // FROM daily_request dr
-    // WHERE dr.required_date = ?
-    // AND dr.shiftid = ?
-    // AND dr.request_by IN (
-    // SELECT lm.siloginid FROM location_mapping lm WHERE lm.zone = z.zone
-    // )
-    // )
-    // ) AS food_delivered,
-
-    // /* -------- FOOD SHORTFALL (UPDATED) -------- */
-    // (
-    // (
-    // (
-    // SELECT IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others),
-    // 0)
-    // FROM daily_request dr
-    // WHERE dr.required_date = ?
-    // AND dr.shiftid = ?
-    // AND dr.request_by IN (
-    // SELECT lm.siloginid FROM location_mapping lm WHERE lm.zone = z.zone
-    // )
-    // )
-    // -
-    // (
-    // SELECT IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private +
-    // dr.weeklyoff_nulm + dr.weeklyoff_others + dr.weeklyoff_nmr), 0)
-    // FROM daily_request dr
-    // WHERE dr.required_date = ?
-    // AND dr.shiftid = ?
-    // AND dr.request_by IN (
-    // SELECT lm.siloginid FROM location_mapping lm WHERE lm.zone = z.zone
-    // )
-    // )
-    // -
-    // (
-    // SELECT IFNULL(SUM(dr.absentees_permanent + dr.absentees_private +
-    // dr.absentees_nulm + dr.absentees_others + dr.absentees_nmr), 0)
-    // FROM daily_request dr
-    // WHERE dr.required_date = ?
-    // AND dr.shiftid = ?
-    // AND dr.request_by IN (
-    // SELECT lm.siloginid FROM location_mapping lm WHERE lm.zone = z.zone
-    // )
-    // )
-    // )
-    // -
-    // (
-    // SELECT IFNULL(SUM(gru.total_food_received), 0)
-    // FROM gcc_received_update gru
-    // WHERE gru.shiftid = ?
-    // AND gru.requestid IN (
-    // SELECT dr.requestid
-    // FROM daily_request dr
-    // WHERE dr.required_date = ?
-    // AND dr.shiftid = ?
-    // AND dr.request_by IN (
-    // SELECT lm.siloginid FROM location_mapping lm WHERE lm.zone = z.zone
-    // )
-    // )
-    // )
-    // ) AS food_shortfall
-
-    // FROM (
-    // SELECT DISTINCT zone
-    // FROM location_mapping
-    // WHERE zone IS NOT NULL
-    // ORDER BY CAST(zone AS UNSIGNED)
-    // ) z
-
-    // UNION ALL
-
-    // /* ================= GRAND TOTAL ================= */
-    // SELECT
-    // 'TOTAL' AS zone,
-
-    // IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0),
-    // IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm
-    // +
-    // dr.weeklyoff_others + dr.weeklyoff_nmr), 0),
-    // IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.absentees_nulm
-    // +
-    // dr.absentees_others + dr.absentees_nmr), 0),
-
-    // (
-    // IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-    // -
-    // IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm
-    // +
-    // dr.weeklyoff_others + dr.weeklyoff_nmr), 0)
-    // -
-    // IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.absentees_nulm
-    // +
-    // dr.absentees_others + dr.absentees_nmr), 0)
-    // ),
-
-    // /* food_requested total = present_count total */
-    // (
-    // IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-    // -
-    // IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm
-    // +
-    // dr.weeklyoff_others + dr.weeklyoff_nmr), 0)
-    // -
-    // IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.absentees_nulm
-    // +
-    // dr.absentees_others + dr.absentees_nmr), 0)
-    // ),
-
-    // /* delivered */
-    // IFNULL(SUM(gru.total_food_received), 0),
-
-    // /* -------- TOTAL FOOD SHORTFALL -------- */
-    // (
-    // (
-    // IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-    // -
-    // IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm
-    // +
-    // dr.weeklyoff_others + dr.weeklyoff_nmr), 0)
-    // -
-    // IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.absentees_nulm
-    // +
-    // dr.absentees_others + dr.absentees_nmr), 0)
-    // )
-    // -
-    // IFNULL(SUM(gru.total_food_received), 0)
-    // )
-
-    // FROM daily_request dr
-    // LEFT JOIN gcc_received_update gru
-    // ON gru.requestid = dr.requestid
-    // WHERE dr.required_date = ?
-    // AND dr.shiftid = ?
-
-    // ) final_output
-
-    // ORDER BY
-    // CASE WHEN zone = 'TOTAL' THEN 1 ELSE 0 END,
-    // CAST(zone AS UNSIGNED);
-    // """;
-
-    // return jdbcTemplate.queryForList(sql,
-    // /* zone-wise params */
-    // date, shiftId,
-    // date, shiftId,
-    // date, shiftId,
-    // date, shiftId, date, shiftId, date, shiftId,
-    // date, shiftId, date, shiftId, date, shiftId,
-    // shiftId, date, shiftId,
-
-    // /* shortfall zone params */
-    // date, shiftId, date, shiftId, date, shiftId,
-    // shiftId, date, shiftId,
-
-    // /* total row */
-    // date, shiftId);
-    // }
-
-    // with using isactive isdelete
-    public List<Map<String, Object>> getZoneWiseShiftBasedReport(String date, int shiftId) {
-
-        String sql = """
-                SELECT *
-                FROM (
-
-                    /* ================= ZONE-WISE SUMMARY ================= */
-                    SELECT
-                        z.zone AS zone,
-
-                        /* -------- TOTAL COMPLEMENT -------- */
-                        (
-                            SELECT IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-                            FROM daily_request dr
-                            WHERE dr.required_date = ?
-                              AND dr.shiftid = ?
-                              AND dr.isactive = 1
-                              AND dr.isdelete = 0
-                              AND dr.request_by IN (
-                                    SELECT lm.siloginid
-                                    FROM location_mapping lm
-                                    WHERE lm.zone = z.zone
-                                      AND lm.isactive = 1
-                                      AND lm.isdelete = 0
-                              )
-                        ) AS total_complement,
-
-                        /* -------- WEEKLY OFF -------- */
-                        (
-                            SELECT IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private +
-                                              dr.weeklyoff_nulm + dr.weeklyoff_others + dr.weeklyoff_nmr), 0)
-                            FROM daily_request dr
-                            WHERE dr.required_date = ?
-                              AND dr.shiftid = ?
-                              AND dr.isactive = 1
-                              AND dr.isdelete = 0
-                              AND dr.request_by IN (
-                                    SELECT lm.siloginid
-                                    FROM location_mapping lm
-                                    WHERE lm.zone = z.zone
-                                      AND lm.isactive = 1
-                                      AND lm.isdelete = 0
-                              )
-                        ) AS weekly_off,
-
-                        /* -------- PLANNED LEAVE -------- */
-                        (
-                            SELECT IFNULL(SUM(dr.absentees_permanent + dr.absentees_private +
-                                              dr.absentees_nulm + dr.absentees_others + dr.absentees_nmr), 0)
-                            FROM daily_request dr
-                            WHERE dr.required_date = ?
-                              AND dr.shiftid = ?
-                              AND dr.isactive = 1
-                              AND dr.isdelete = 0
-                              AND dr.request_by IN (
-                                    SELECT lm.siloginid
-                                    FROM location_mapping lm
-                                    WHERE lm.zone = z.zone
-                                      AND lm.isactive = 1
-                                      AND lm.isdelete = 0
-                              )
-                        ) AS planned_leave,
-
-                        /* -------- PRESENT COUNT -------- */
-                        (
-                            (
-                                SELECT IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-                                FROM daily_request dr
-                                WHERE dr.required_date = ?
-                                  AND dr.shiftid = ?
-                                  AND dr.isactive = 1
-                                  AND dr.isdelete = 0
-                                  AND dr.request_by IN (
-                                        SELECT lm.siloginid
-                                        FROM location_mapping lm
-                                        WHERE lm.zone = z.zone
-                                          AND lm.isactive = 1
-                                          AND lm.isdelete = 0
-                                  )
-                            )
-                            -
-                            (
-                                SELECT IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private +
-                                                  dr.weeklyoff_nulm + dr.weeklyoff_others + dr.weeklyoff_nmr), 0)
-                                FROM daily_request dr
-                                WHERE dr.required_date = ?
-                                  AND dr.shiftid = ?
-                                  AND dr.isactive = 1
-                                  AND dr.isdelete = 0
-                                  AND dr.request_by IN (
-                                        SELECT lm.siloginid
-                                        FROM location_mapping lm
-                                        WHERE lm.zone = z.zone
-                                          AND lm.isactive = 1
-                                          AND lm.isdelete = 0
-                                  )
-                            )
-                            -
-                            (
-                                SELECT IFNULL(SUM(dr.absentees_permanent + dr.absentees_private +
-                                                  dr.absentees_nulm + dr.absentees_others + dr.absentees_nmr), 0)
-                                FROM daily_request dr
-                                WHERE dr.required_date = ?
-                                  AND dr.shiftid = ?
-                                  AND dr.isactive = 1
-                                  AND dr.isdelete = 0
-                                  AND dr.request_by IN (
-                                        SELECT lm.siloginid
-                                        FROM location_mapping lm
-                                        WHERE lm.zone = z.zone
-                                          AND lm.isactive = 1
-                                          AND lm.isdelete = 0
-                                  )
-                            )
-                        ) AS present_count,
-
-                        /* -------- FOOD REQUESTED -------- */
-                        (
-                            (
-                                SELECT IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-                                FROM daily_request dr
-                                WHERE dr.required_date = ?
-                                  AND dr.shiftid = ?
-                                  AND dr.isactive = 1
-                                  AND dr.isdelete = 0
-                                  AND dr.request_by IN (
-                                        SELECT lm.siloginid
-                                        FROM location_mapping lm
-                                        WHERE lm.zone = z.zone
-                                          AND lm.isactive = 1
-                                          AND lm.isdelete = 0
-                                  )
-                            )
-                            -
-                            (
-                                SELECT IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private +
-                                                  dr.weeklyoff_nulm + dr.weeklyoff_others + dr.weeklyoff_nmr), 0)
-                                FROM daily_request dr
-                                WHERE dr.required_date = ?
-                                  AND dr.shiftid = ?
-                                  AND dr.isactive = 1
-                                  AND dr.isdelete = 0
-                                  AND dr.request_by IN (
-                                        SELECT lm.siloginid
-                                        FROM location_mapping lm
-                                        WHERE lm.zone = z.zone
-                                          AND lm.isactive = 1
-                                          AND lm.isdelete = 0
-                                  )
-                            )
-                            -
-                            (
-                                SELECT IFNULL(SUM(dr.absentees_permanent + dr.absentees_private +
-                                                  dr.absentees_nulm + dr.absentees_others + dr.absentees_nmr), 0)
-                                FROM daily_request dr
-                                WHERE dr.required_date = ?
-                                  AND dr.shiftid = ?
-                                  AND dr.isactive = 1
-                                  AND dr.isdelete = 0
-                                  AND dr.request_by IN (
-                                        SELECT lm.siloginid
-                                        FROM location_mapping lm
-                                        WHERE lm.zone = z.zone
-                                          AND lm.isactive = 1
-                                          AND lm.isdelete = 0
-                                  )
-                            )
-                        ) AS food_requested,
-
-                        /* -------- FOOD DELIVERED -------- */
-                        (
-                            SELECT IFNULL(SUM(gru.total_food_received), 0)
-                            FROM gcc_received_update gru
-                            WHERE gru.shiftid = ?
-                              AND gru.isactive = 1
-                              AND gru.isdelete = 0
-                              AND gru.requestid IN (
-                                    SELECT dr.requestid
-                                    FROM daily_request dr
-                                    WHERE dr.required_date = ?
-                                      AND dr.shiftid = ?
-                                      AND dr.isactive = 1
-                                      AND dr.isdelete = 0
-                                      AND dr.request_by IN (
-                                            SELECT lm.siloginid
-                                            FROM location_mapping lm
-                                            WHERE lm.zone = z.zone
-                                              AND lm.isactive = 1
-                                              AND lm.isdelete = 0
-                                      )
-                              )
-                        ) AS food_delivered,
-
-                        /* -------- FOOD SHORTFALL -------- */
-                        (
-                            (
-                                (
-                                    SELECT IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-                                    FROM daily_request dr
-                                    WHERE dr.required_date = ?
-                                      AND dr.shiftid = ?
-                                      AND dr.isactive = 1
-                                      AND dr.isdelete = 0
-                                      AND dr.request_by IN (
-                                            SELECT lm.siloginid
-                                            FROM location_mapping lm
-                                            WHERE lm.zone = z.zone
-                                              AND lm.isactive = 1
-                                              AND lm.isdelete = 0
-                                      )
-                                )
-                                -
-                                (
-                                    SELECT IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private +
-                                                      dr.weeklyoff_nulm + dr.weeklyoff_others + dr.weeklyoff_nmr), 0)
-                                    FROM daily_request dr
-                                    WHERE dr.required_date = ?
-                                      AND dr.shiftid = ?
-                                      AND dr.isactive = 1
-                                      AND dr.isdelete = 0
-                                      AND dr.request_by IN (
-                                            SELECT lm.siloginid
-                                            FROM location_mapping lm
-                                            WHERE lm.zone = z.zone
-                                              AND lm.isactive = 1
-                                              AND lm.isdelete = 0
-                                      )
-                                )
-                                -
-                                (
-                                    SELECT IFNULL(SUM(dr.absentees_permanent + dr.absentees_private +
-                                                      dr.absentees_nulm + dr.absentees_others + dr.absentees_nmr), 0)
-                                    FROM daily_request dr
-                                    WHERE dr.required_date = ?
-                                      AND dr.shiftid = ?
-                                      AND dr.isactive = 1
-                                      AND dr.isdelete = 0
-                                      AND dr.request_by IN (
-                                            SELECT lm.siloginid
-                                            FROM location_mapping lm
-                                            WHERE lm.zone = z.zone
-                                              AND lm.isactive = 1
-                                              AND lm.isdelete = 0
-                                      )
-                                )
-                            )
-                            -
-                            (
-                                SELECT IFNULL(SUM(gru.total_food_received), 0)
-                                FROM gcc_received_update gru
-                                WHERE gru.shiftid = ?
-                                  AND gru.isactive = 1
-                                  AND gru.isdelete = 0
-                                  AND gru.requestid IN (
-                                        SELECT dr.requestid
-                                        FROM daily_request dr
-                                        WHERE dr.required_date = ?
-                                          AND dr.shiftid = ?
-                                          AND dr.isactive = 1
-                                          AND dr.isdelete = 0
-                                          AND dr.request_by IN (
-                                                SELECT lm.siloginid
-                                                FROM location_mapping lm
-                                                WHERE lm.zone = z.zone
-                                                  AND lm.isactive = 1
-                                                  AND lm.isdelete = 0
-                                          )
-                                  )
-                            )
-                        ) AS food_shortfall
-
-                    FROM (
-                        SELECT DISTINCT zone
-                        FROM location_mapping
-                        WHERE zone IS NOT NULL
-                          AND isactive = 1
-                          AND isdelete = 0
-                        ORDER BY CAST(zone AS UNSIGNED)
-                    ) z
-
-                    UNION ALL
-
-                    /* ================= GRAND TOTAL ================= */
-                    SELECT
-                        'TOTAL' AS zone,
-
-                        IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0),
-                        IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm +
-                                    dr.weeklyoff_others + dr.weeklyoff_nmr), 0),
-                        IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.absentees_nulm +
-                                    dr.absentees_others + dr.absentees_nmr), 0),
-
-                        (
-                            IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-                            -
-                            IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm +
-                                        dr.weeklyoff_others + dr.weeklyoff_nmr), 0)
-                            -
-                            IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.absentees_nulm +
-                                        dr.absentees_others + dr.absentees_nmr), 0)
-                        ),
-
-                        (
-                            IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-                            -
-                            IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm +
-                                        dr.weeklyoff_others + dr.weeklyoff_nmr), 0)
-                            -
-                            IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.absentees_nulm +
-                                        dr.absentees_others + dr.absentees_nmr), 0)
-                        ),
-
-                        IFNULL(SUM(gru.total_food_received), 0),
-
-                        (
-                            (
-                                IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-                                -
-                                IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm +
-                                            dr.weeklyoff_others + dr.weeklyoff_nmr), 0)
-                                -
-                                IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.absentees_nulm +
-                                            dr.absentees_others + dr.absentees_nmr), 0)
-                            )
-                            -
-                            IFNULL(SUM(gru.total_food_received), 0)
-                        )
-
-                    FROM daily_request dr
-                    LEFT JOIN gcc_received_update gru
-                           ON gru.requestid = dr.requestid
-                          AND gru.isactive = 1
-                          AND gru.isdelete = 0
-                    WHERE dr.required_date = ?
-                      AND dr.shiftid = ?
-                      AND dr.isactive = 1
-                      AND dr.isdelete = 0
-
-                ) final_output
-
-                ORDER BY
-                    CASE WHEN zone = 'TOTAL' THEN 1 ELSE 0 END,
-                    CAST(zone AS UNSIGNED);
-                """;
-
-        return jdbcTemplate.queryForList(
-                sql,
-
-                /* zone-wise params */
-                date, shiftId,
-                date, shiftId,
-                date, shiftId,
-                date, shiftId, date, shiftId, date, shiftId,
-                date, shiftId, date, shiftId, date, shiftId,
-                shiftId, date, shiftId,
-
-                /* shortfall zone params */
-                date, shiftId, date, shiftId, date, shiftId,
-                shiftId, date, shiftId,
-
-                /* total row */
-                date, shiftId);
-    }
-
-    // without using isactive and isdelete
-    // public List<Map<String, Object>> getWardWiseShiftReport(Integer shiftId,
-    // Integer zone, String date) {
-
-    // String sql = """
-    // WITH ward_data AS (
-    // SELECT
-    // w.ward,
-    // IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others),0) AS
-    // total_complement,
-    // IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm
-    // + dr.weeklyoff_others + dr.weeklyoff_nmr),0) AS weekly_off,
-    // IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.absentees_nulm
-    // + dr.absentees_others + dr.absentees_nmr),0) AS planned_leave,
-
-    // -- PRESENT COUNT
-    // (
-    // IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others),0)
-    // - IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private +
-    // dr.weeklyoff_nulm + dr.weeklyoff_others + dr.weeklyoff_nmr),0)
-    // - IFNULL(SUM(dr.absentees_permanent + dr.absentees_private +
-    // dr.absentees_nulm + dr.absentees_others + dr.absentees_nmr),0)
-    // ) AS present_count,
-
-    // -- FOOD REQUESTED
-    // (
-    // IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others),0)
-    // - IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private +
-    // dr.weeklyoff_nulm + dr.weeklyoff_others + dr.weeklyoff_nmr),0)
-    // - IFNULL(SUM(dr.absentees_permanent + dr.absentees_private +
-    // dr.absentees_nulm + dr.absentees_others + dr.absentees_nmr),0)
-    // ) AS food_requested,
-
-    // IFNULL(SUM(gru.total_food_received),0) AS food_delivered,
-
-    // -- FOOD SHORTFALL (corrected logic)
-    // CASE
-    // WHEN IFNULL(SUM(gru.total_food_received),0) >= (
-    // IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr),0)
-    // - IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_nulm +
-    // dr.weeklyoff_private + dr.weeklyoff_nmr),0)
-    // - IFNULL(SUM(dr.absentees_permanent + dr.absentees_nulm +
-    // dr.absentees_private + dr.absentees_nmr),0)
-    // )
-    // THEN 0
-    // ELSE (
-    // (
-    // IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr),0)
-    // - IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_nulm +
-    // dr.weeklyoff_private + dr.weeklyoff_nmr),0)
-    // - IFNULL(SUM(dr.absentees_permanent + dr.absentees_nulm +
-    // dr.absentees_private + dr.absentees_nmr),0)
-    // )
-    // - IFNULL(SUM(gru.total_food_received),0)
-    // )
-    // END AS food_shortfall
-
-    // FROM (SELECT DISTINCT ward FROM location_mapping WHERE zone = ? AND ward IS
-    // NOT NULL) w
-    // LEFT JOIN location_mapping lm ON lm.ward = w.ward AND lm.zone = ?
-    // LEFT JOIN daily_request dr ON dr.request_by = lm.siloginid
-    // AND dr.required_date = ?
-    // AND dr.shiftid = ?
-    // LEFT JOIN gcc_received_update gru ON gru.requestid = dr.requestid
-
-    // GROUP BY w.ward
-    // )
-
-    // SELECT * FROM ward_data
-
-    // UNION ALL
-
-    // SELECT
-    // 'TOTAL' AS ward,
-    // SUM(total_complement),
-    // SUM(weekly_off),
-    // SUM(planned_leave),
-    // SUM(present_count),
-    // SUM(food_requested),
-    // SUM(food_delivered),
-    // SUM(food_shortfall)
-    // FROM ward_data
-
-    // ORDER BY CASE WHEN ward = 'TOTAL' THEN 1 ELSE 0 END, ward;
-    // """;
-
-    // Object[] params = new Object[] {
-    // zone, // w.zone
-    // zone, // lm.zone
-    // date, // dr.required_date
-    // shiftId // dr.shiftid
-    // };
-
-    // return jdbcTemplate.queryForList(sql, params);
-    // }
-
-    // with using isactive isdelete
-    public List<Map<String, Object>> getWardWiseShiftReport(Integer shiftId, Integer zone, String date) {
-
-        String sql = """
-                WITH ward_data AS (
-                    SELECT
-                        w.ward,
-
-                        /* TOTAL COMPLEMENT */
-                        IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0) AS total_complement,
-
-                        /* WEEKLY OFF */
-                        IFNULL(SUM(
-                            dr.weeklyoff_permanent + dr.weeklyoff_private +
-                            dr.weeklyoff_nulm + dr.weeklyoff_others + dr.weeklyoff_nmr
-                        ), 0) AS weekly_off,
-
-                        /* PLANNED LEAVE */
-                        IFNULL(SUM(
-                            dr.absentees_permanent + dr.absentees_private +
-                            dr.absentees_nulm + dr.absentees_others + dr.absentees_nmr
-                        ), 0) AS planned_leave,
-
-                        /* PRESENT COUNT */
-                        (
-                            IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-                            -
-                            IFNULL(SUM(
-                                dr.weeklyoff_permanent + dr.weeklyoff_private +
-                                dr.weeklyoff_nulm + dr.weeklyoff_others + dr.weeklyoff_nmr
-                            ), 0)
-                            -
-                            IFNULL(SUM(
-                                dr.absentees_permanent + dr.absentees_private +
-                                dr.absentees_nulm + dr.absentees_others + dr.absentees_nmr
-                            ), 0)
-                        ) AS present_count,
-
-                        /* FOOD REQUESTED */
-                        (
-                            IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-                            -
-                            IFNULL(SUM(
-                                dr.weeklyoff_permanent + dr.weeklyoff_private +
-                                dr.weeklyoff_nulm + dr.weeklyoff_others + dr.weeklyoff_nmr
-                            ), 0)
-                            -
-                            IFNULL(SUM(
-                                dr.absentees_permanent + dr.absentees_private +
-                                dr.absentees_nulm + dr.absentees_others + dr.absentees_nmr
-                            ), 0)
-                        ) AS food_requested,
-
-                        /* FOOD DELIVERED */
-                        IFNULL(SUM(gru.total_food_received), 0) AS food_delivered,
-
-                        /* FOOD SHORTFALL */
-                        CASE
-                            WHEN IFNULL(SUM(gru.total_food_received), 0) >=
-                                 (
-                                    IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-                                    -
-                                    IFNULL(SUM(
-                                        dr.weeklyoff_permanent + dr.weeklyoff_private +
-                                        dr.weeklyoff_nulm + dr.weeklyoff_others + dr.weeklyoff_nmr
-                                    ), 0)
-                                    -
-                                    IFNULL(SUM(
-                                        dr.absentees_permanent + dr.absentees_private +
-                                        dr.absentees_nulm + dr.absentees_others + dr.absentees_nmr
-                                    ), 0)
-                                 )
-                            THEN 0
-                            ELSE
-                                (
-                                    (
-                                        IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-                                        -
-                                        IFNULL(SUM(
-                                            dr.weeklyoff_permanent + dr.weeklyoff_private +
-                                            dr.weeklyoff_nulm + dr.weeklyoff_others + dr.weeklyoff_nmr
-                                        ), 0)
-                                        -
-                                        IFNULL(SUM(
-                                            dr.absentees_permanent + dr.absentees_private +
-                                            dr.absentees_nulm + dr.absentees_others + dr.absentees_nmr
-                                        ), 0)
-                                    )
-                                    -
-                                    IFNULL(SUM(gru.total_food_received), 0)
-                                )
-                        END AS food_shortfall
-
-                    FROM (
-                        SELECT DISTINCT ward
-                        FROM location_mapping
-                        WHERE zone = ?
-                          AND ward IS NOT NULL
-                          AND isactive = 1
-                          AND isdelete = 0
-                    ) w
-
-                    LEFT JOIN location_mapping lm
-                           ON lm.ward = w.ward
-                          AND lm.zone = ?
-                          AND lm.isactive = 1
-                          AND lm.isdelete = 0
-
-                    LEFT JOIN daily_request dr
-                           ON dr.request_by = lm.siloginid
-                          AND dr.required_date = ?
-                          AND dr.shiftid = ?
-                          AND dr.isactive = 1
-                          AND dr.isdelete = 0
-
-                    LEFT JOIN gcc_received_update gru
-                           ON gru.requestid = dr.requestid
-                          AND gru.isactive = 1
-                          AND gru.isdelete = 0
-
-                    GROUP BY w.ward
-                )
-
-                SELECT * FROM ward_data
-
-                UNION ALL
-
-                SELECT
-                    'TOTAL' AS ward,
-                    SUM(total_complement),
-                    SUM(weekly_off),
-                    SUM(planned_leave),
-                    SUM(present_count),
-                    SUM(food_requested),
-                    SUM(food_delivered),
-                    SUM(food_shortfall)
-                FROM ward_data
-
-                ORDER BY
-                    CASE WHEN ward = 'TOTAL' THEN 1 ELSE 0 END,
-                    ward;
-                """;
-
-        Object[] params = new Object[] {
-                zone, // ward subquery zone
-                zone, // lm.zone
-                date, // dr.required_date
-                shiftId // dr.shiftid
-        };
-
-        return jdbcTemplate.queryForList(sql, params);
-    }
-
-    // without using isactive and isdelete
-    // public List<Map<String, Object>> getWardLocationWiseReport(String date) {
-
-    // String sql = """
-    // SELECT * FROM (
-    // -- ================= LOCATION WISE =================
-    // SELECT
-    // lm.driverid,
-    // lm.zone,
-    // lm.ward,
-    // lm.location,
-    // IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others),0) AS
-    // total_complement,
-    // IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm
-    // + dr.weeklyoff_others + dr.weeklyoff_nmr),0) AS weekly_off,
-    // IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.nulm +
-    // dr.absentees_others + dr.absentees_nmr),0) AS planned_leave,
-    // (IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others),0)
-    // - IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.nulm +
-    // dr.weeklyoff_others + dr.weeklyoff_nmr),0)
-    // - IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.nulm +
-    // dr.absentees_others + dr.absentees_nmr),0)
-    // ) AS present_count,
-    // (IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others),0)
-    // - IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.nulm +
-    // dr.weeklyoff_others + dr.weeklyoff_nmr),0)
-    // - IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.nulm +
-    // dr.absentees_others + dr.absentees_nmr),0)
-    // ) AS food_requested,
-    // IFNULL(SUM(gru.total_food_received),0) AS food_delivered,
-    // -- ===== FOOD SHORTFALL LOGIC =====
-    // (IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others),0)
-    // - IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.nulm +
-    // dr.weeklyoff_others + dr.weeklyoff_nmr),0)
-    // - IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.nulm +
-    // dr.absentees_others + dr.absentees_nmr),0)
-    // ) - IFNULL(SUM(gru.total_food_received),0) AS food_shortfall
-    // FROM location_mapping lm
-    // LEFT JOIN daily_request dr
-    // ON dr.request_by = lm.siloginid AND dr.required_date = ?
-    // LEFT JOIN gcc_received_update gru
-    // ON gru.received_by = lm.siloginid AND gru.requestid = dr.requestid
-    // WHERE lm.ward IS NOT NULL AND lm.location IS NOT NULL
-    // GROUP BY lm.driverid, lm.zone, lm.ward, lm.location
-
-    // UNION ALL
-
-    // -- ================= TOTAL ROW =================
-    // SELECT
-    // 999999 AS driverid,
-    // 'TOTAL' AS zone,
-    // 'TOTAL' AS ward,
-    // 'TOTAL' AS location,
-    // IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others),0) AS
-    // total_complement,
-    // IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.weeklyoff_nulm
-    // + dr.weeklyoff_others + dr.weeklyoff_nmr),0) AS weekly_off,
-    // IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.nulm +
-    // dr.absentees_others + dr.absentees_nmr),0) AS planned_leave,
-    // (IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others),0)
-    // - IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private +
-    // dr.weeklyoff_nulm + dr.weeklyoff_others + dr.weeklyoff_nmr),0)
-    // - IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.nulm +
-    // dr.absentees_others + dr.absentees_nmr),0)
-    // ) AS present_count,
-    // (IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others),0)
-    // - IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.nulm +
-    // dr.weeklyoff_others + dr.weeklyoff_nmr),0)
-    // - IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.nulm +
-    // dr.absentees_others + dr.absentees_nmr),0)
-    // ) AS food_requested,
-    // IFNULL(SUM(gru.total_food_received),0) AS food_delivered,
-    // -- ===== FOOD SHORTFALL TOTAL =====
-    // (IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others),0)
-    // - IFNULL(SUM(dr.weeklyoff_permanent + dr.weeklyoff_private + dr.nulm +
-    // dr.weeklyoff_others + dr.weeklyoff_nmr),0)
-    // - IFNULL(SUM(dr.absentees_permanent + dr.absentees_private + dr.nulm +
-    // dr.absentees_others + dr.absentees_nmr),0)
-    // ) - IFNULL(SUM(gru.total_food_received),0) AS food_shortfall
-    // FROM daily_request dr
-    // LEFT JOIN gcc_received_update gru ON gru.requestid = dr.requestid
-    // WHERE dr.required_date = ?
-    // ) final_output
-    // ORDER BY driverid ASC
-    // """;
-
-    // Object[] params = new Object[] { date, date }; // first for location JOIN,
-    // second for TOTAL row
-    // return jdbcTemplate.queryForList(sql, params);
-    // }
-
-    // with using isactive isdelete
-    public List<Map<String, Object>> getWardLocationWiseReport(String date) {
-
-        String sql = """
-                SELECT * FROM (
-                    /* ================= LOCATION WISE ================= */
-                    SELECT
-                        lm.driverid,
-                        lm.zone,
-                        lm.ward,
-                        lm.location,
-
-                        /* TOTAL COMPLEMENT */
-                        IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0) AS total_complement,
-
-                        /* WEEKLY OFF */
-                        IFNULL(SUM(
-                            dr.weeklyoff_permanent + dr.weeklyoff_private +
-                            dr.weeklyoff_nulm + dr.weeklyoff_others + dr.weeklyoff_nmr
-                        ), 0) AS weekly_off,
-
-                        /* PLANNED LEAVE */
-                        IFNULL(SUM(
-                            dr.absentees_permanent + dr.absentees_private +
-                            dr.absentees_nulm + dr.absentees_others + dr.absentees_nmr
-                        ), 0) AS planned_leave,
-
-                        /* PRESENT COUNT */
-                        (
-                            IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-                            -
-                            IFNULL(SUM(
-                                dr.weeklyoff_permanent + dr.weeklyoff_private +
-                                dr.weeklyoff_nulm + dr.weeklyoff_others + dr.weeklyoff_nmr
-                            ), 0)
-                            -
-                            IFNULL(SUM(
-                                dr.absentees_permanent + dr.absentees_private +
-                                dr.absentees_nulm + dr.absentees_others + dr.absentees_nmr
-                            ), 0)
-                        ) AS present_count,
-
-                        /* FOOD REQUESTED */
-                        (
-                            IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-                            -
-                            IFNULL(SUM(
-                                dr.weeklyoff_permanent + dr.weeklyoff_private +
-                                dr.weeklyoff_nulm + dr.weeklyoff_others + dr.weeklyoff_nmr
-                            ), 0)
-                            -
-                            IFNULL(SUM(
-                                dr.absentees_permanent + dr.absentees_private +
-                                dr.absentees_nulm + dr.absentees_others + dr.absentees_nmr
-                            ), 0)
-                        ) AS food_requested,
-
-                        /* FOOD DELIVERED */
-                        IFNULL(SUM(gru.total_food_received), 0) AS food_delivered,
-
-                        /* FOOD SHORTFALL */
-                        (
-                            (
-                                IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-                                -
-                                IFNULL(SUM(
-                                    dr.weeklyoff_permanent + dr.weeklyoff_private +
-                                    dr.weeklyoff_nulm + dr.weeklyoff_others + dr.weeklyoff_nmr
-                                ), 0)
-                                -
-                                IFNULL(SUM(
-                                    dr.absentees_permanent + dr.absentees_private +
-                                    dr.absentees_nulm + dr.absentees_others + dr.absentees_nmr
-                                ), 0)
-                            )
-                            -
-                            IFNULL(SUM(gru.total_food_received), 0)
-                        ) AS food_shortfall
-
-                    FROM location_mapping lm
-                    LEFT JOIN daily_request dr
-                           ON dr.request_by = lm.siloginid
-                          AND dr.required_date = ?
-                          AND dr.isactive = 1
-                          AND dr.isdelete = 0
-
-                    LEFT JOIN gcc_received_update gru
-                           ON gru.requestid = dr.requestid
-                          AND gru.received_by = lm.siloginid
-                          AND gru.isactive = 1
-                          AND gru.isdelete = 0
-
-                    WHERE lm.ward IS NOT NULL
-                      AND lm.location IS NOT NULL
-                      AND lm.isactive = 1
-                      AND lm.isdelete = 0
-
-                    GROUP BY
-                        lm.driverid,
-                        lm.zone,
-                        lm.ward,
-                        lm.location
-
-                    UNION ALL
-
-                    /* ================= TOTAL ROW ================= */
-                    SELECT
-                        999999 AS driverid,
-                        'TOTAL' AS zone,
-                        'TOTAL' AS ward,
-                        'TOTAL' AS location,
-
-                        IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0),
-                        IFNULL(SUM(
-                            dr.weeklyoff_permanent + dr.weeklyoff_private +
-                            dr.weeklyoff_nulm + dr.weeklyoff_others + dr.weeklyoff_nmr
-                        ), 0),
-                        IFNULL(SUM(
-                            dr.absentees_permanent + dr.absentees_private +
-                            dr.absentees_nulm + dr.absentees_others + dr.absentees_nmr
-                        ), 0),
-
-                        (
-                            IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-                            -
-                            IFNULL(SUM(
-                                dr.weeklyoff_permanent + dr.weeklyoff_private +
-                                dr.weeklyoff_nulm + dr.weeklyoff_others + dr.weeklyoff_nmr
-                            ), 0)
-                            -
-                            IFNULL(SUM(
-                                dr.absentees_permanent + dr.absentees_private +
-                                dr.absentees_nulm + dr.absentees_others + dr.absentees_nmr
-                            ), 0)
-                        ),
-
-                        (
-                            IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-                            -
-                            IFNULL(SUM(
-                                dr.weeklyoff_permanent + dr.weeklyoff_private +
-                                dr.weeklyoff_nulm + dr.weeklyoff_others + dr.weeklyoff_nmr
-                            ), 0)
-                            -
-                            IFNULL(SUM(
-                                dr.absentees_permanent + dr.absentees_private +
-                                dr.absentees_nulm + dr.absentees_others + dr.absentees_nmr
-                            ), 0)
-                        ),
-
-                        IFNULL(SUM(gru.total_food_received), 0),
-
-                        (
-                            (
-                                IFNULL(SUM(dr.permanent + dr.nulm + dr.private + dr.nmr + dr.others), 0)
-                                -
-                                IFNULL(SUM(
-                                    dr.weeklyoff_permanent + dr.weeklyoff_private +
-                                    dr.weeklyoff_nulm + dr.weeklyoff_others + dr.weeklyoff_nmr
-                                ), 0)
-                                -
-                                IFNULL(SUM(
-                                    dr.absentees_permanent + dr.absentees_private +
-                                    dr.absentees_nulm + dr.absentees_others + dr.absentees_nmr
-                                ), 0)
-                            )
-                            -
-                            IFNULL(SUM(gru.total_food_received), 0)
-                        )
-
-                    FROM daily_request dr
-                    LEFT JOIN gcc_received_update gru
-                           ON gru.requestid = dr.requestid
-                          AND gru.isactive = 1
-                          AND gru.isdelete = 0
-                    WHERE dr.required_date = ?
-                      AND dr.isactive = 1
-                      AND dr.isdelete = 0
-
-                ) final_output
-                ORDER BY driverid ASC
-                """;
-
-        Object[] params = new Object[] {
-                date, // location-wise join
-                date // total row
-        };
-
-        return jdbcTemplate.queryForList(sql, params);
-    }
-
-}
-
-/*
- * String sql = "SELECT lm.location AS LocationDescription, "+
- * "dl.username AS DriverName, "+
- * " CONCAT('"
- * +fileBaseUrl+"/gccofficialapp/files',dss_start.image) as upload_image_url, "+
- * " CONCAT(dss_start.latitude, ', ', dss_start.longitude) AS StartPoint, "+
- * "Date(dss_start.datetime) AS StartTime, "+
- * 
- * " CONCAT(dss_stop.latitude, ', ', dss_stop.longitude) AS EndPoint, "+
- * Date(dss_stop.datetime) AS EndTime
- * 
- * FROM location_mapping lm
- * INNER JOIN driver_login dl
- * ON dl.loginid = lm.driverid
- * 
- * LEFT JOIN driver_start_stop dss_start
- * ON dss_start.loginid = lm.driverid
- * AND dss_start.action = 'Start'
- * 
- * 
- * LEFT JOIN driver_start_stop dss_stop
- * ON dss_stop.loginid = lm.driverid
- * AND dss_stop.action = 'Stop'
- * AND dss_stop.startid = dss_start.locationid
- * WHERE DATE(dss_start.datetime) = ?";
- * change for full query
- */
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/food_scheme/driverreport.html b/src/main/resources/templates/modules/food_scheme/driverreport.html
deleted file mode 100644
index 2efef0c..0000000
--- a/src/main/resources/templates/modules/food_scheme/driverreport.html
+++ /dev/null
@@ -1,430 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-
-<head>
-    <title>Food Scheme Operations Dashboard</title>
-
-
-    <!-- Bootstrap 5 CSS -->
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- DataTables CSS -->
-    <link href="https://cdn.datatables.net/1.13.4/css/jquery.dataTables.min.css" rel="stylesheet" />
-    <link href="https://cdn.datatables.net/buttons/2.3.6/css/buttons.dataTables.min.css" rel="stylesheet" />
-
-    <style>
-        table.dataTable th,
-        table.dataTable td {
-            text-align: center;
-            vertical-align: middle;
-            border: 1px solid #000;
-        }
-
-        table.dataTable th {
-            background-color: #003366 !important;
-            color: white;
-        }
-
-        .dataTables_wrapper .dt-buttons {
-            margin-bottom: 10px;
-        }
-
-        .dataTables_filter {
-            margin-bottom: 25px;
-            /* adjust as needed */
-        }
-
-        .page-header-title h4 {
-            margin: 20px 0;
-            text-align: center;
-        }
-
-        #zoneDetailsTable_wrapper .dataTables_scrollBody {
-            border: none !important;
-        }
-
-        #zoneDetailsTable td,
-        #zoneDetailsTable th {
-            vertical-align: middle;
-            text-align: center;
-            white-space: nowrap;
-        }
-
-        .time-column {
-            white-space: nowrap !important;
-        }
-    </style>
-</head>
-
-<body>
-
-    <div class="page-header-title">
-        <h4>Food Scheme Report</h4>
-    </div>
-
-
-
-    <div class="container mt-4">
-        <div class="card p-3 shadow-sm">
-
-            <div class="d-flex justify-content-between">
-                <h5><strong>Driver Logistics Report</strong></h5>
-
-                <!--<div class="d-flex gap-2">
-                    
-                    <input type="date" id="driverDate" class="form-control" style="width: 160px;">
-
-                    
-
-                    <button class="btn btn-primary" onclick="loadDriverReport()">Load Report</button>
-                    <button class="btn btn-success" onclick="goToSchemereport()">
-                        Back
-                    </button>
-
-                </div>-->
-                <div class="d-flex gap-3 align-items-end">
-
-                    <!-- DATE FIELD -->
-                    <div class="d-flex flex-column">
-                        <label class="form-label fw-bold mb-1">Date</label>
-                        <input type="date" id="driverDate" class="form-control" style="width: 160px;">
-                    </div>
-
-                    <!-- ZONE FIELD -->
-                    <div class="d-flex flex-column">
-                        <label class="form-label fw-bold mb-1">Zone</label>
-                        <select id="zoneFilter" class="form-control" style="width: 140px;">
-                            <option value="">All Zones</option>
-                        </select>
-                    </div>
-
-                    <!-- BUTTONS -->
-                    <div class="d-flex gap-2">
-                        <button class="btn btn-primary" onclick="loadDriverReport()">Load Report</button>
-                        <button class="btn btn-success" onclick="goToSchemereport()">Back</button>
-                    </div>
-
-                </div>
-
-
-
-            </div>
-
-            <table id="driverReportTable" class="table table-bordered table-hover mt-3 text-center"
-                style="display:none">
-                <thead class="table-primary">
-                    <tr>
-                        <th>Zone</th>
-                        <th>Ward</th>
-                        <th>Driver Name</th>
-                        <th>Driver Mobile Number</th>
-                        <th>Location Details</th>
-                        <!-- <th>Current Location of the Driver</th>-->
-                        <th>Start Image</th>
-
-
-                        <th>Start Address</th>
-                        <th>Start Time</th>
-                        <th>End Address</th>
-                        <th>End Time</th>
-                        <th>End Image</th>
-                    </tr>
-                </thead>
-                <tbody id="driverReportBody">
-                    <!-- Rows inserted dynamically -->
-                </tbody>
-            </table>
-        </div>
-    </div>
-
-    <div class="modal fade" id="imagePreviewModal" tabindex="-1">
-        <div class="modal-dialog modal-dialog-centered modal-lg">
-            <div class="modal-content">
-
-                <!-- CLOSE BUTTON -->
-                <div class="modal-header border-0">
-                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-                </div>
-
-                <div class="modal-body text-center">
-                    <img id="fullImage" src="" style="width: 100%; border-radius: 5px;">
-                </div>
-
-            </div>
-        </div>
-    </div>
-
-
-
-
-
-
-    <div id="pageLoader"
-        style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-        <div style="position: relative; top: 50%; transform: translateY(-50%);">
-            <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-                <span class="sr-only"></span>
-            </div>
-            <!-- Add the 'Please wait' text below the spinner -->
-            <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-        </div>
-    </div>
-
-
-    <!-- Scripts -->
-    <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-
-    <!-- DataTables JS -->
-    <script src="https://cdn.datatables.net/1.13.4/js/jquery.dataTables.min.js"></script>
-    <script src="https://cdn.datatables.net/buttons/2.3.6/js/dataTables.buttons.min.js"></script>
-    <script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.html5.min.js"></script>
-    <script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.print.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/pdfmake.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/vfs_fonts.js"></script>
-
-    <!-- SweetAlert -->
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-    <script>
-
-        let today = new Date().toISOString().split("T")[0];
-        document.getElementById("driverDate").setAttribute("max", today);
-        document.getElementById("driverDate").value = today;
-        $('#pageLoader').show();
-
-
-        // Auto-load report for today
-        loadDriverReport();
-        loadZones();
-        function goToSchemereport() {
-            window.location.href = "/commissionerreview/foodSchemeReport";
-        }
-        $(document).on("click", ".preview-img", function () {
-            let imgSrc = $(this).attr("src");
-            $("#fullImage").attr("src", imgSrc);
-            $("#imagePreviewModal").modal("show");
-        });
-        function loadZones() {
-            $.ajax({
-                url: "/commissionerreview/api/zones",
-                method: "GET",
-                success: function (res) {
-
-                    let zones = res.data;   // <-- FIXED
-
-                    let dropdown = $("#zoneFilter");
-                    dropdown.empty();
-                    dropdown.append(`<option value="">All Zones</option>`);
-
-                    zones.forEach(z => {
-                        dropdown.append(`<option value="${z.zone}">${z.zone}</option>`);
-                    });
-                }
-            });
-        }
-
-
-
-
-
-
-        function loadDriverReport() {
-
-            let date = document.getElementById("driverDate").value;
-            let zone = $("#zoneFilter").val();
-            console.log(zone);
-
-            if (!date) {
-                Swal.fire("Required!", "Please select Date", "warning");
-                return;
-            }
-
-            let tbody = document.getElementById("driverReportBody");
-
-            if ($.fn.DataTable.isDataTable("#driverReportTable")) {
-                $("#driverReportTable").DataTable().clear().destroy();
-            }
-            tbody.innerHTML = "";
-
-
-            $.ajax({
-                url: "/commissionerreview/api/driver-report",
-                method: "GET",
-                //data: { date: date },
-                data: { date: date, zone: zone },
-                success: function (response) {
-                    $('#pageLoader').hide();
-                    // console.log(response);
-
-                    // Build table rows
-                    response.data.forEach(d => {
-                        tbody.innerHTML += `
-                    <tr>
-                        <td>${d.Zone || ''}</td>
-                        <td>${d.Ward || ''}</td>  
-                        <td>${d.DriverName || ''}</td>
-                          <td>${d.DriverMobile || ''}</td> 
-                    
-                        <td>${d.LocationDescription || ''}</td>
-                        
-                       
-                      <td> <img src="${d.StartImage || ''}" width="80" class="img-thumbnail preview-img"></td>
-
-                        <td>${d.StartAddress || ''}</td>
-                        <td>${d.StartTime || ''}</td>
-                        <td>${d.EndAddress || ''}</td>
-                        <td class="time-column">${d.EndTime || ''}</td>
-                      
-                        <td> <img src="${d.EndImage || ''}" width="80" class="img-thumbnail preview-img"></td>
-                    </tr>
-                `;
-                    });
-
-                    document.getElementById("driverReportTable").style.display = "table";
-
-
-
-                    // Reinitialize DataTable WITH PDF & EXCEL
-                    setTimeout(() => {
-                        $("#driverReportTable").DataTable({
-                            dom: 'Bfrtip',
-                            paging: false,
-                            searching: false,
-                            ordering: false,
-                            info: false,
-                            buttons: [
-                                {
-                                    extend: 'excelHtml5',
-                                    title: 'Driver_Report_' + date,
-                                    className: 'btn btn-success btn-sm',
-                                    text: 'Download Excel'
-                                },
-                                {
-                                    extend: 'pdfHtml5',
-                                    title: 'Driver_Report_' + date,
-                                    className: 'btn btn-danger btn-sm',
-                                    orientation: 'landscape',
-                                    pageSize: 'A4',
-                                    text: 'Download PDF'
-                                }
-                            ]
-                        });
-                    }, 150);
-                },
-
-                error: function () {
-                    Swal.fire("Error!", "Unable to fetch driver report.", "error");
-                }
-            });
-        }
-
-
-
-        // Allow TODAY + PAST only (Restrict future)
-        // Restrict future dates
-        /*let today = new Date().toISOString().split("T")[0];
-        document.getElementById("driverDate").setAttribute("max", today);
-        document.getElementById("driverDate").value = today;
-        
-        
-            // Auto-load report for today
-            loadDriverReport();
-        
-        
-        function loadDriverReport() {
-        
-            let date = document.getElementById("driverDate").value;
-        
-            if (!date) {
-                Swal.fire("Required!", "Please select Date", "warning");
-                return;
-            }
-            
-            let tbody = document.getElementById("driverReportBody");
-        
-             if ($.fn.DataTable.isDataTable("#driverReportTable")) {
-                $("#driverReportTable").DataTable().clear().destroy();
-            }
-            tbody.innerHTML = "";
-        
-           
-            $.ajax({
-                url: "/commissionerreview/api/feedback/driver-report",
-                method: "GET",
-                data: { date: date },
-                success: function(data) {
-                    console.log(data);
-        
-                    // Build table rows
-                    data.forEach(d => {
-                        tbody.innerHTML += `
-                            <tr>
-                                <td>${d.DriverName || ''}</td>
-                                  <td>-</td> 
-                            
-                                <td>${d.LocationDescription || ''}</td>
-                                 
-                               <td><img src="${d.upload_image_url}" width="80" class="img-thumbnail"></td>
-        
-                                <td>${d.StartPoint || ''}</td>
-                                <td>${d.StartTime || ''}</td>
-                                <td>${d.EndPoint || ''}</td>
-                                <td>${d.EndTime || ''}</td>
-                            </tr>
-                        `;
-                    });
-        
-                    document.getElementById("driverReportTable").style.display = "table";
-        
-                 
-        
-                    // Reinitialize DataTable WITH PDF & EXCEL
-                    setTimeout(() => {
-                        $("#driverReportTable").DataTable({
-                            dom: 'Bfrtip',
-                            paging: false,
-                            searching: false,
-                            ordering: false,
-                            info: false,
-                            buttons: [
-                                {
-                                    extend: 'excelHtml5',
-                                    title: 'Driver_Report_' + date,
-                                    className: 'btn btn-success btn-sm',
-                                    text: 'Download Excel'
-                                },
-                                {
-                                    extend: 'pdfHtml5',
-                                    title: 'Driver_Report_' + date,
-                                    className: 'btn btn-danger btn-sm',
-                                    orientation: 'landscape',
-                                    pageSize: 'A4',
-                                    text: 'Download PDF'
-                                }
-                            ]
-                        });
-                    }, 150);
-                },
-        
-                error: function() {
-                    Swal.fire("Error!", "Unable to fetch driver report.", "error");
-                }
-            });
-        }*/
-
-
-
-
-
-
-
-
-
-
-    </script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/food_scheme/feedbackreport.html b/src/main/resources/templates/modules/food_scheme/feedbackreport.html
deleted file mode 100644
index 44ce2bf..0000000
--- a/src/main/resources/templates/modules/food_scheme/feedbackreport.html
+++ /dev/null
@@ -1,706 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-
-<head>
-    <title>Feedback Summary Report</title>
-
-    <!-- Bootstrap 5 -->
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/css/bootstrap.min.css" rel="stylesheet">
-
-    <style>
-        table th,
-        table td {
-            text-align: center;
-            vertical-align: middle;
-            border: 1px solid #000;
-        }
-
-        table th {
-            background-color: #003366 !important;
-            color: white;
-        }
-
-        .page-header-title h4 {
-            margin-top: 20px;
-            text-align: center;
-        }
-
-        .summary-title {
-            background: #f4a460;
-            padding: 6px;
-            font-weight: bold;
-            margin-top: 30px;
-            border-radius: 4px;
-            text-align: center;
-        }
-
-        .tables-row {
-            display: flex;
-            justify-content: space-between;
-            gap: 20px;
-        }
-
-        .table-block {
-            width: 32%;
-        }
-
-        /* Same column width across all tables */
-        table td:nth-child(1),
-        table th:nth-child(1) {
-            width: 65%;
-        }
-
-        table td:nth-child(2),
-        table th:nth-child(2) {
-            width: 35%;
-        }
-
-        /* Bold border above Grand Total */
-        .total-row td {
-            border-top: 3px solid black !important;
-            font-weight: bold;
-        }
-
-        .total-row td {
-            border-top: 3px solid #000 !important;
-            border-bottom: 3px solid #000 !important;
-            /* ADD THIS */
-            font-weight: bold;
-        }
-
-        #detailModal table tfoot th {
-            background-color: white !important;
-            color: black !important;
-            border-top: 3px solid black !important;
-        }
-
-        #detailModal tfoot tr th {
-            border-top: 3px solid black !important;
-            border-bottom: 3px solid black !important;
-        }
-
-        #imagePreviewModal .modal-dialog {
-            max-width: 300px;
-            /* you can change this */
-        }
-
-        #wardModal table tfoot tr th {
-            background-color: white !important;
-            color: black !important;
-            font-weight: bold !important;
-            border-top: 3px solid black !important;
-            border-bottom: 3px solid black !important;
-            text-align: center !important;
-        }
-
-        .table img {
-            display: block;
-            margin: auto;
-            padding: 3px;
-            /* gives spacing so border becomes visible */
-            border: 1px solid #ccc;
-            border-radius: 4px;
-        }
-
-        /* FIX COLUMN WIDTHS ONLY INSIDE WARD MODAL */
-        #wardModal table th:nth-child(1),
-        #wardModal table td:nth-child(1) {
-            width: 60px !important;
-        }
-
-        /* Location column */
-        #wardModal table th:nth-child(2),
-        #wardModal table td:nth-child(2) {
-            width: 60px !important;
-            text-align: left !important;
-        }
-
-        /* Count column */
-        #wardModal table th:nth-child(3),
-        #wardModal table td:nth-child(3) {
-            width: 350px !important;
-        }
-
-        /* Image column */
-        #wardModal table th:nth-child(4),
-        #wardModal table td:nth-child(4) {
-            width: 120px !important;
-        }
-
-        #wardModal table {
-            border-bottom: 3px solid #000 !important;
-        }
-
-        .export-btn-container {
-            text-align: right;
-            margin-bottom: 10px;
-        }
-    </style>
-</head>
-
-<body>
-
-    <div class="page-header-title">
-        <h4><strong>Food Scheme – Feedback Summary</strong></h4>
-    </div>
-
-    <div class="container mt-4">
-        <div class="card shadow-sm p-3">
-
-            <div class="d-flex justify-content-between align-items-center mb-3">
-                <h5 class="mb-0"><strong>Feedback Summary</strong></h5>
-
-                <div class="d-flex align-items-center gap-2">
-                    <input type="date" id="reportDate" class="form-control" style="width: 200px;">
-                    <button class="btn btn-success" onclick="goToSchemereport()">Back</button>
-                </div>
-            </div>
-
-            <div class="tables-row">
-
-                <div class="table-block">
-                    <div class="summary-title">Feedback - Food Distribution Time</div>
-                    <table class="table table-bordered mt-2">
-                        <thead>
-                            <tr>
-                                <th>Category</th>
-                                <th>Count</th>
-                            </tr>
-                        </thead>
-                        <tbody id="tableTime">
-                        </tbody>
-                    </table>
-                </div>
-
-                <div class="table-block">
-                    <div class="summary-title">Feedback - Food Taste</div>
-                    <table class="table table-bordered mt-2">
-                        <thead>
-                            <tr>
-                                <th>Category</th>
-                                <th>Count</th>
-                            </tr>
-                        </thead>
-                        <tbody id="tableTaste"></tbody>
-                    </table>
-                </div>
-
-                <div class="table-block">
-                    <div class="summary-title">Feedback - Food Quantity</div>
-                    <table class="table table-bordered mt-2">
-                        <thead>
-                            <tr>
-                                <th>Category</th>
-                                <th>Count</th>
-                            </tr>
-                        </thead>
-                        <tbody id="tableQuantity"></tbody>
-                    </table>
-                </div>
-
-            </div>
-
-
-        </div>
-    </div>
-
-    <!-- Modal -->
-    <div class="modal fade" id="detailModal" tabindex="-1">
-        <div class="modal-dialog modal-lg">
-            <div class="modal-content">
-
-                <div class="modal-header">
-                    <h5 class="modal-title">Feedback Details</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-                </div>
-
-                <div class="modal-body">
-
-                    <!-- Dynamic Title -->
-                    <h5 id="modalTitle" class="text-center mb-3"></h5>
-                    <div id="ModalExportContainer" class="mt-2"></div>
-
-
-                    <table id="detailModalTable" class="table table-bordered table-hover mt-3 text-center">
-                        <thead>
-                            <tr>
-                                <th>Zone</th>
-                                <th>Count</th>
-                            </tr>
-                        </thead>
-
-                        <tbody id="modalTableBody"></tbody>
-
-                        <!-- <tfoot>
-                            <tr>
-                                <th>Grand Total</th>
-                                <th id="modalGrandTotal"></th>
-                            </tr>
-                        </tfoot>-->
-                    </table>
-
-                </div>
-
-                <div class="modal-footer">
-                    <button class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-                </div>
-
-            </div>
-        </div>
-    </div>
-    <!-- Ward Modal (second popup) -->
-    <div class="modal fade" id="wardModal" tabindex="-1">
-        <div class="modal-dialog modal-lg">
-            <div class="modal-content">
-
-                <div class="modal-header">
-                    <!--<h5 class="modal-title">Ward Details</h5>-->
-                    <h5 class="modal-title" id="wardModalMainTitle">Ward Details</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-                </div>
-
-                <div class="modal-body">
-
-                    <h5 id="wardModalTitle" class="text-center mb-3"></h5>
-
-
-
-                    <table id="wardModalTable" class="table table-bordered table-hover mt-3 text-center">
-                        <thead>
-                            <tr>
-                                <th>S.No</th>
-                                <th>Ward</th>
-                                <th>Location</th>
-
-                                <th>Image</th>
-                            </tr>
-                        </thead>
-
-                        <tbody id="wardModalTableBody"></tbody>
-
-                        <tfoot>
-                            <tr>
-                                <!-- <th></th>
-                                <th>Grand Total</th>
-                                <th id="wardModalGrandTotal"></th>
-                                <th></th>-->
-
-                            </tr>
-                        </tfoot>
-                    </table>
-
-                </div>
-
-                <div class="modal-footer">
-                    <button class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-                </div>
-
-            </div>
-        </div>
-    </div>
-    <div class="modal fade" id="imagePreviewModal" tabindex="-1">
-        <div class="modal-dialog modal-dialog-centered modal-lg">
-            <div class="modal-content">
-
-                <!-- CLOSE BUTTON -->
-                <div class="modal-header border-0">
-                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-                </div>
-
-                <div class="modal-body text-center">
-                    <img id="fullImage" src="" style="width: 100%; border-radius: 5px;">
-                </div>
-
-            </div>
-        </div>
-    </div>
-
-
-
-
-
-
-    <div id="pageLoader"
-        style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255,255,255,0.8); z-index: 9999; text-align: center;">
-        <div style="position: relative; top: 50%; transform: translateY(-50%);">
-            <div class="spinner-border text-primary" style="width: 3rem; height: 3rem;"></div>
-            <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-        </div>
-    </div>
-
-    <!-- jQuery -->
-    <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/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>
-
-    <script>
-
-        $(document).ready(function () {
-            $('#pageLoader').show();
-
-            let today = new Date().toISOString().split("T")[0];
-            $("#reportDate").val(today);
-            $("#reportDate").attr("max", today);
-
-            loadSummary(today);
-
-            $("#reportDate").on("change", function () {
-                loadSummary(this.value);
-            });
-        });
-        $(document).on("click", ".preview-img", function () {
-            let imgSrc = $(this).attr("src");
-            $("#fullImage").attr("src", imgSrc);
-
-            $("#imagePreviewModal").modal("show");
-
-        });
-
-        //excel and pdf
-
-
-
-
-        function goToSchemereport() {
-            window.location.href = "/commissionerreview/foodSchemeReport";
-        }
-        $(document).on("click", ".clickable", function () {
-
-            let qid = $(this).data("qid");
-            let column = $(this).data("column");
-            let count = $(this).data("value");
-            let date = $("#reportDate").val();
-
-            let category = column.replace(/_/g, " ").toUpperCase();
-            if ($.fn.DataTable.isDataTable("#detailModalTable")) {
-                $("#detailModalTable").DataTable().clear().destroy();
-            }
-
-            // Title: Question + Category
-            $("#modalTitle").text("");
-
-            $.ajax({
-                url: "/commissionerreview/api/zone-details",
-                method: "GET",
-                data: { qid, column, date },
-
-                success: function (res) {
-                    console.log(res);
-
-                    let rows = res.data;
-                    let tbody = $("#modalTableBody");
-
-                    tbody.empty();
-
-                    let grandTotal = 0;
-
-                    if (rows.length > 0) {
-                        // Set Title
-                        $("#modalTitle").text(rows[0].question + " – " + category);
-
-                        rows.forEach(r => {
-                            tbody.append(`
-                        <tr>
-                            <td>${r.zone}</td>
-                          <td class="zoneCountClickable"
-                            data-zone="${r.zone}"
-                            data-qid="${qid}"
-                            data-column="${column}"
-                            style="cursor:pointer;color:blue;text-decoration:underline;">
-                            ${r.count_value}
-                        </td>
-                        </tr>
-                    `);
-
-                            grandTotal += r.count_value;
-                        });
-                    }
-
-                    tbody.append(`
-    <tr class="total-row">
-        <td><b>Grand Total</b></td>
-        <td><b>${grandTotal}</b></td>
-    </tr>
-`);
-
-
-
-                    // Destroy existing DataTable instance if exists
-                    document.getElementById("detailModalTable").style.display = "table";
-
-
-
-                    // Reinitialize DataTable WITH PDF & EXCEL
-                    setTimeout(() => {
-                        $("#detailModalTable").DataTable({
-                            dom: 'Bfrtip',
-                            paging: false,
-                            searching: false,
-                            ordering: false,
-                            info: false,
-                            buttons: [
-                                {
-                                    extend: 'excelHtml5',
-                                    title: 'zone_report',
-                                    // className: 'btn btn-success btn-sm',
-                                    text: 'Download Excel'
-
-                                },
-                                {
-                                    extend: 'pdfHtml5',
-                                    title: 'zone_report',
-                                    // className: 'btn btn-danger btn-sm',
-                                    orientation: 'landscape',
-                                    pageSize: 'A4',
-                                    text: 'Download PDF'
-
-                                }
-                            ]
-                        });
-                    }, 150);
-
-
-
-
-
-                    new bootstrap.Modal(document.getElementById("detailModal")).show();
-                }
-            });
-        });
-
-
-        $(document).on("click", ".zoneCountClickable", function () {
-
-            let zoneId = $(this).data("zone");
-            let qid = $(this).data("qid");
-            let column = $(this).data("column");
-            let date = $("#reportDate").val();
-            let label = column.replace(/_/g, " ").toUpperCase();
-
-            if ($.fn.DataTable.isDataTable("#wardModalTable")) {
-                $("#wardModalTable").DataTable().clear().destroy();
-            }
-
-
-            $("#wardModalMainTitle").text("Zone " + zoneId + " – Ward Details");
-
-            $.ajax({
-                url: "/commissionerreview/api/ward-details",
-                method: "GET",
-                data: { qid, column, date, zoneId },
-
-                success: function (res) {
-                    console.log(res);
-
-                    let rows = res.data;
-                    let tbody = $("#wardModalTableBody");
-                    tbody.empty();
-
-                    let grandTotal = 0;
-
-                    if (rows.length > 0) {
-                        $("#wardModalTitle").text(rows[0].question + " – " + label);
-
-                        rows.forEach((r, index) => {
-                            tbody.append(`
-         <tr>
-             <td>${index + 1}</td>  
-             <td>${r.ward}</td>
-             <td>${r.location}</td>
-             <td>
-                 <img src="${r.feedbackImage}" width="80" height="80" class="img-thumbnail preview-img">
-             </td>
-         </tr>
-     `);
-                        });
-
-                    }
-
-                    $("#wardModalGrandTotal").text(grandTotal);
-                    document.getElementById("wardModalTable").style.display = "table";
-
-
-
-                    // Reinitialize DataTable WITH PDF & EXCEL
-                    setTimeout(() => {
-                        $("#wardModalTable").DataTable({
-                            dom: 'Bfrtip',
-                            paging: false,
-                            searching: false,
-                            ordering: false,
-                            info: false,
-                            buttons: [
-                                {
-                                    extend: 'excelHtml5',
-                                    title: 'ward_report',
-
-                                    text: 'Download Excel'
-                                },
-                                {
-                                    extend: 'pdfHtml5',
-                                    title: 'ward_report',
-
-                                    orientation: 'landscape',
-                                    pageSize: 'A4',
-                                    text: 'Download PDF'
-                                }
-                            ]
-                        });
-                    }, 150);
-
-                    new bootstrap.Modal(document.getElementById("wardModal")).show();
-                }
-            });
-        });
-
-        /* $(document).on("click", ".clickable", function () {
- 
-             let qid = $(this).data("qid");
-             let column = $(this).data("column");
-             let count = $(this).data("value");
-             let date = $("#reportDate").val();
- 
-             $("#mCategory").text(column.replace(/_/g, " ").toUpperCase());
-             $("#mCount").text(count);
- 
-             $.ajax({
-                 url: "/commissionerreview/api/zone-details",
-                 method: "GET",
-                 data: { qid, column, date },
- 
-                 success: function (res) {
-                     console.log("Modal Data:", res);
- 
-                     if (res.data && res.data.length > 0) {
-                         let row = res.data[0];
- 
-                         $("#mZone").text(row.zone);
-                         $("#mQuestion").text(row.question);
-                     } else {
-                         $("#mZone").text("No Data");
-                         $("#mQuestion").text("No Data");
-                     }
- 
-                     new bootstrap.Modal(document.getElementById("detailModal")).show();
-                 }
-             });
-         });*/
-
-
-
-        /* --------------------------------
-           LOAD 3 FEEDBACK BLOCKS
-        --------------------------------- */
-        function loadSummary(date) {
-
-            $.ajax({
-                url: "/commissionerreview/api/feedback-summary",
-                method: "GET",
-                data: { date: date },
-
-                success: function (response) {
-                    $('#pageLoader').hide();
-
-                    // Extract the array
-                    let rows = response.data;
-
-                    // Clear tables
-                    $("#tableTime").empty();
-                    $("#tableTaste").empty();
-                    $("#tableQuantity").empty();
-
-                    // qid → table mapping
-                    const tableMap = {
-                        1: { body: $("#tableTime"), titleIndex: 0 },
-                        2: { body: $("#tableTaste"), titleIndex: 1 },
-                        3: { body: $("#tableQuantity"), titleIndex: 2 }
-                    };
-
-                    rows.forEach(row => {
-
-                        let tbl = tableMap[row.qid];
-                        if (!tbl) return;
-
-                        // Set dynamic title
-                        $(".summary-title").eq(tbl.titleIndex).text(row.question);
-
-                        let keys = [];
-                        let total = 0;
-
-                        // Keys based on qid
-                        if (row.qid === 1) {
-                            keys = ["on_time_distribution", "delayeded"];
-                        } else if (row.qid === 2) {
-                            keys = ["good", "average"];
-                        } else if (row.qid === 3) {
-                            keys = ["sufficient_food_quantity", "less_quantity"];
-                        }
-
-                        // Add rows
-                        keys.forEach(key => {
-                            let value = row[key];
-
-                            /*   tbl.body.append(`
-                   <tr>
-                       <td>${key.replace(/_/g, " ").toUpperCase()}</td>
-                       <td>${value}</td>
-                   </tr>
-               `);*/
-                            /*tbl.body.append(`
-<tr>
-    <td>${key.replace(/_/g, " ").toUpperCase()}</td>
-    <td class="clickable"
-        data-qid="${row.qid}" 
-        data-column="${key}" 
-        data-value="${value}"
-        style="cursor:pointer;color:blue;text-decoration:underline;">
-        ${value}
-    </td>
-</tr>
-`);*/
-                            let clickableClass = value > 0 ? "clickable" : "";
-                            let clickableStyle = value > 0 ? "cursor:pointer;color:blue;text-decoration:underline;" : "color:black;cursor:default;";
-
-                            tbl.body.append(`
-<tr>
-    <td>${key.replace(/_/g, " ").toUpperCase()}</td>
-    <td class="${clickableClass}"
-        data-qid="${row.qid}" 
-        data-column="${key}" 
-        data-value="${value}"
-        style="${clickableStyle}">
-        ${value}
-    </td>
-</tr>
-`);
-
-
-
-                            total += value;
-                        });
-
-                        // Add total row
-                        tbl.body.append(`
-<tr class="total-row">
-    <td>Grand Total</td>
-    <td>${total}</td>
-</tr>
-`);
-                    });
-                }
-
-
-            });
-        }
-    </script>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/food_scheme/foodschemereport.html b/src/main/resources/templates/modules/food_scheme/foodschemereport.html
deleted file mode 100644
index cd035e3..0000000
--- a/src/main/resources/templates/modules/food_scheme/foodschemereport.html
+++ /dev/null
@@ -1,1520 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-
-<head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-
-    <title>Food Distribution Operations Dashboard</title>
-
-
-    <!-- Bootstrap 5 CSS -->
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- DataTables CSS -->
-    <link href="https://cdn.datatables.net/1.13.4/css/jquery.dataTables.min.css" rel="stylesheet" />
-    <link href="https://cdn.datatables.net/buttons/2.3.6/css/buttons.dataTables.min.css" rel="stylesheet" />
-
-    <style>
-        table.dataTable th,
-        table.dataTable td {
-            text-align: center;
-            vertical-align: middle;
-            border: 1px solid #000;
-        }
-
-        table.dataTable th {
-            background-color: #003366 !important;
-            color: white;
-        }
-
-        .dataTables_wrapper .dt-buttons {
-            margin-bottom: 10px;
-        }
-
-        .dataTables_filter {
-            margin-bottom: 25px;
-            /* adjust as needed */
-        }
-
-        .page-header-title h4 {
-            margin: 20px 0;
-            text-align: center;
-        }
-
-        #zoneDetailsTable_wrapper .dataTables_scrollBody {
-            border: none !important;
-        }
-
-        #zoneDetailsTable td,
-        #zoneDetailsTable th {
-            vertical-align: middle;
-            text-align: center;
-            white-space: nowrap;
-        }
-
-        /* Reduce width of Locations column */
-        #wardwiseSummaryTable th:nth-child(1),
-        #wardwiseSummaryTable td:nth-child(1) {
-            max-width: 150px !important;
-            min-width: 120px !important;
-            white-space: normal !important;
-            word-break: break-word !important;
-        }
-
-        #wardwiseSummaryTable thead th {
-            position: sticky;
-            top: 0;
-            background: #cfe2ff;
-            z-index: 10;
-        }
-    </style>
-</head>
-
-<body>
-
-    <div class="page-header-title">
-        <h4>Food Distribution Report</h4>
-    </div>
-
-
-
-    <div class="container mt-4">
-        <div class="card p-3 shadow-sm">
-            <h5 class="mb-0"><strong>Shift Wise Overview</strong></h5>
-
-            <div class="d-flex justify-content-end gap-2">
-
-                <input type="date" id="reportDate" class="form-control" style="width: 200px;">
-
-                <button class="btn btn-primary" onclick="goToFeedback()">
-                    Feedback Report
-                </button>
-
-                <button class="btn btn-success" onclick="goToDriverReport()">
-                    Driver Report
-                </button>
-
-            </div>
-
-            <!-- 🔥 EXPORT BUTTONS HERE (outside table) -->
-            <div id="exportContainer" class="mt-2"></div>
-            <!-- <table id="shiftSummaryTable" class="table table-bordered table-hover mt-3 text-center">
-                <thead class="table-primary">
-                    <tr>
-                        <th>Shift</th>
-                        <th>Food Requested</th>
-                        <th>Food Delivered</th>
-                        <th>Overall Present</th>
-                        <th>Present Count</th>
-                        <th>Absent Count</th>
-                        <th>Food Shortfall</th>
-                    </tr>
-                </thead>
-
-
-                <tbody id="shiftTableBody"></tbody>
-            </table> -->
-            <table id="shiftSummaryTable" class="table table-bordered table-hover mt-3 text-center">
-                <thead class="table-primary">
-                    <tr>
-                        <th>Shift</th>
-                        <th>Total Complement</th>
-                        <th>Weekly Off</th>
-                        <th>Planned Leave</th>
-                        <th>Present Count</th>
-                        <th>Food Requested</th>
-                        <th>Food Delivered</th>
-                        <th>Food Shortfall</th>
-                    </tr>
-                </thead>
-
-
-                <tbody id="shiftTableBody"></tbody>
-            </table>
-        </div>
-    </div>
-
-
-
-    <div class="container mt-4" id="shiftASection">
-        <div class="card p-3 shadow-sm">
-            <h5 class="mb-0"><strong>Shift A - Daily Food Menu</strong></h5>
-
-            <table id="shift-a-foodmenu" class="table table-bordered table-hover mt-3 text-center">
-                <thead class="table-primary">
-                    <tr>
-                        <th>Sunday</th>
-                        <th>Monday</th>
-                        <th>Tuesday</th>
-                        <th>Wednesday</th>
-                        <th>Thursday</th>
-                        <th>Friday</th>
-                        <th>Saturday</th>
-                    </tr>
-                </thead>
-
-                <tbody>
-                    <tr>
-                        <td>Sambar Rice (650g) & Porial (100g)</td>
-                        <td>Lemon Rice (5000g) & Potato/yam/Raw banana fry (100g)</td>
-                        <td>Veg Biryani (500g) & Brinjal Onion (75g)</td>
-                        <td>Tomato Rice (500g) & Potato/yam/Raw banana fry (100g)</td>
-                        <td>Coriander/Mint Rice (500g) & Potato/yam/Raw banana fry (100g)</td>
-                        <td>Tamarind Rice (500g) & Potato/yam/Raw banana fry (100g)</td>
-                        <td>Veg Biryani (500g) & Brinjal Onion (75g)</td>
-                    </tr>
-                </tbody>
-            </table>
-
-        </div>
-    </div>
-
-    <div class="container mt-4" style="display:none" id="shiftBSection">
-        <div class="card p-3 shadow-sm">
-            <h5 class="mb-0"><strong>Shift B & C Daily Food Menu</strong></h5>
-
-            <table id="shift-b-foodmenu" class="table table-bordered table-hover mt-3 text-center">
-                <thead class="table-primary">
-                    <tr>
-                        <th>Sunday</th>
-                        <th>Monday</th>
-                        <th>Tuesday</th>
-                        <th>Wednesday</th>
-                        <th>Thursday</th>
-                        <th>Friday</th>
-                        <th>Saturday</th>
-                    </tr>
-                </thead>
-
-                <tbody>
-                    <tr>
-                        <td>Idly (6*5), Red Chutney & (50g) Sambar (250g)</td>
-                        <td>Chappathy(5-300g) & Veg Kuruma (300g)</td>
-                        <td>Rava Kitchady(500g) & Sambar (250g)</td>
-                        <td>Chappathy(5-300g) & Veg Kuruma (300g)</td>
-                        <td>Idly (6*5), Red Chutney & (50g) Sambar (250g)</td>
-                        <td>Rava Upma (500g) & Mint/Coriander Chutney (100g)</td>
-                        <td>Chappathy(5-300g) & Veg Kuruma (300g)</td>
-                    </tr>
-                </tbody>
-            </table>
-
-        </div>
-    </div>
-
-
-
-    <div class="container mt-4" style="display:none" id="shiftCSection">
-        <div class="card p-3 shadow-sm">
-            <h5 class="mb-0"><strong>Shift C Daily Food Menu</strong></h5>
-
-            <table id="shift-c-foodmenu" class="table table-bordered table-hover mt-3 text-center">
-                <thead class="table-primary">
-                    <tr>
-                        <th>Sunday</th>
-                        <th>Monday</th>
-                        <th>Tuesday</th>
-                        <th>Wednesday</th>
-                        <th>Thursday</th>
-                        <th>Friday</th>
-                        <th>Saturday</th>
-                    </tr>
-                </thead>
-
-                <tbody>
-                    <tr>
-                        <td>Chappathy(5-300g) & Veg Kuruma (300g)</td>
-                        <td>Idly (6*5), Red Chutney & (50g) Sambar (250g)</td>
-                        <td>Chappathy(5-300g) & Veg Kuruma (300 g)</td>
-                        <td>Rava Kitchady(500g) & Sambar (250g)</td>
-                        <td>Chappathy(5-300g) & Channa Masala (300g)</td>
-                        <td>Idly (6*5), Red Chutney & (50g) Sambar (250g)</td>
-                        <td>Rava Upma (500g) & Mint/Coriander Chutney (100g)</td>
-                    </tr>
-                </tbody>
-            </table>
-
-        </div>
-    </div>
-
-
-
-    <div class="container mt-4">
-        <div class="row g-4">
-
-            <!-- LEFT CARD -->
-            <!-- <div class="col-md-6">
-                <div class="card p-3 shadow-sm">
-                    <h5 class="mb-0"><strong>Zone wise Logistics Overallview</strong></h5>
-                     EXPORT BUTTONS HERE (outside table) 
-                    <div id="exportContainerzoneshift" class="mt-2"></div>
-                    <table id="zoneandshiftSummaryTable" class="table table-bordered table-hover mt-3 text-center">
-                        <thead class="table-primary">
-                            <tr>
-                                <th>zone</th>
-                                <th>Present Count</th>
-                                <th>Absent Count</th>
-                                <th>Food Requested</th>
-                                <th>Food Delivered</th>
-                                <th>Food Shortfall</th>
-                            </tr>
-                        </thead>
-                        <tbody id="zoneandshiftSummaryTableBody"></tbody>
-                    </table>
-                </div>
-            </div> -->
-
-            <div class="col-md-12">
-                <div class="card p-3 shadow-sm">
-                    <div class="d-flex justify-content-between align-items-center">
-                        <h5 class="mb-0"><strong>Zone wise Overallview</strong></h5>
-                        <!-- 🔥 EXPORT BUTTONS HERE (outside table) -->
-                        <div id="exportContainerzoneshift" class="mt-2"></div>
-
-                        <input type="date" id="zoneandshiftDate" class="form-control mt-2" style="width: 200px;"
-                            readonly>
-                    </div>
-                    <table id="zoneandshiftSummaryTable" class="table table-bordered table-hover mt-3 text-center">
-                        <thead class="table-primary">
-                            <tr>
-                                <th>zone</th>
-                                <th>Total Complement</th>
-                                <th>weekly Off</th>
-                                <th>Planned Leave</th>
-                                <th>Present Count</th>
-                                <th>Food Requested</th>
-                                <th>Food Delivered</th>
-                                <th>Food Shortfall</th>
-                            </tr>
-                        </thead>
-                        <tbody id="zoneandshiftSummaryTableBody"></tbody>
-                    </table>
-                </div>
-            </div>
-
-            <!-- RIGHT CARD (duplicate or different) -->
-
-            <div class="col-md-12">
-                <div class="card p-3 shadow-sm">
-                    <div class="d-flex justify-content-between align-items-center">
-                        <h5 class="mb-0"><strong>Overall Location wise Overview</strong></h5>
-                        <h5 class="mb-0"><strong>Select Zone:</strong><select id="zoneFilter" class="form-select mt-2"
-                                style="width: 150px;">
-                                <option value="ALL">All Zones</option>
-                            </select></h5>
-
-                        <input type="date" id="zonereportDate" class="form-control mt-2" style="width: 200px;" readonly>
-                    </div>
-
-
-
-
-
-
-
-                    <div class="table-scroll-container" style="max-height: 777px; overflow-y: auto;">
-                        <div id="exportContainerwardwise" class="mt-2"></div>
-                        <table id="wardwiseSummaryTable" class="table table-bordered table-hover mt-3 text-center">
-                            <thead class="table-primary">
-                                <tr>
-                                    <th>Zone</th>
-                                    <th>Ward</th>
-                                    <th>Locations</th>
-                                    <th>Total Complement</th>
-                                    <th>weekly Off</th>
-                                    <th>Planned Leave</th>
-                                    <th>Present Count</th>
-                                    <th>Food Requested</th>
-                                    <th>Food Delivered</th>
-                                    <th>Food Shortfall</th>
-                                </tr>
-                            </thead>
-                            <tbody id="wardSummaryTableBody"></tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-    </div>
-
-
-    <div class="modal fade" id="zoneModal" tabindex="-1">
-        <div class="modal-dialog modal-lg">
-            <div class="modal-content">
-
-                <div class="modal-header">
-                    <h5 class="modal-title">
-                        Zone <span id="zoneNumber"></span> – Ward Level Food Delivery Details
-                    </h5>
-                    <button class="btn-close" data-bs-dismiss="modal"></button>
-                </div>
-
-                <div class="modal-body">
-                    <table id="zoneWardTable" class="table table-bordered table-hover text-center">
-                        <thead class="table-primary">
-                            <tr>
-
-                                <th>Ward</th>
-                                <th>Food Requested</th>
-                                <th>Food Delivered</th>
-                                <th>Food Shortfall</th>
-                            </tr>
-                        </thead>
-                        <tbody id="zoneWardBody">
-                            <!-- Dynamic rows inserted -->
-                        </tbody>
-                    </table>
-                </div>
-
-            </div>
-        </div>
-    </div>
-
-
-    <!-- 🟦 Ward Summary Modal -->
-    <div class="modal fade" id="wardModal" tabindex="-1">
-        <div class="modal-dialog modal-xl modal-dialog-scrollable">
-            <div class="modal-content">
-
-                <div class="modal-header " style="background-color: rgb(0 51 102); color: white">
-                    <h5 class="modal-title">Ward Wise Logistics - Zone <span id="selectedZone"></span></h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal"
-                        style="filter: invert(1) brightness(200%);"></button>
-
-                </div>
-
-                <div class="modal-body">
-                    <div id="exportContainerzonewardwise" class="mt-2"></div>
-                    <table id="zonewardwiseSummaryTable" class="table table-bordered table-hover mt-3 text-center">
-                        <thead class="table-info">
-                            <tr>
-                                <th>Ward</th>
-                                <th>Total Complement</th>
-                                <th>Weekly Off</th>
-                                <th>Planned Leave</th>
-                                <th>Present Count</th>
-                                <th>Food Requested</th>
-                                <th>Food Delivered</th>
-                                <th>Food Shortfall</th>
-                            </tr>
-                        </thead>
-                        <tbody id="zonewardwiseSummaryTableBody"></tbody>
-                    </table>
-                </div>
-
-                <div class="modal-footer">
-                    <button class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-                </div>
-
-            </div>
-        </div>
-    </div>
-
-
-
-
-    <div class="modal fade" id="shiftModal" tabindex="-1">
-        <div class="modal-dialog modal-xl">
-            <div class="modal-content">
-
-                <div class="modal-header">
-                    <h5 class="modal-title">
-                        Zone-Wise Breakup – Shift <span id="shiftName"></span>
-                    </h5>
-                    <button class="btn-close" data-bs-dismiss="modal"></button>
-                </div>
-
-                <div class="modal-body">
-
-                    <table id="shiftZoneTable" class="table table-bordered table-striped text-center">
-                        <thead>
-                            <tr>
-                                <th>Zone</th>
-                                <th>Present Count</th>
-                                <th>Absent Count</th>
-                                <th>Unplanned Absent</th>
-                                <th>Food Requested</th>
-                                <th>Food Delivered</th>
-                                <th>Shortfall</th>
-                            </tr>
-                        </thead>
-                        <tbody id="shiftZoneBody">
-                            <!-- Static rows inserted by JS -->
-                        </tbody>
-                    </table>
-
-                </div>
-
-            </div>
-        </div>
-    </div>
-
-
-
-
-    <div id="pageLoader"
-        style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
-        <div style="position: relative; top: 50%; transform: translateY(-50%);">
-            <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
-                <span class="sr-only"></span>
-            </div>
-            <!-- Add the 'Please wait' text below the spinner -->
-            <p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
-        </div>
-    </div>
-
-
-    <!-- Scripts -->
-    <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-
-    <!-- DataTables JS -->
-    <script src="https://cdn.datatables.net/1.13.4/js/jquery.dataTables.min.js"></script>
-    <script src="https://cdn.datatables.net/buttons/2.3.6/js/dataTables.buttons.min.js"></script>
-    <script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.html5.min.js"></script>
-    <script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.print.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/pdfmake.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/vfs_fonts.js"></script>
-
-    <!-- SweetAlert -->
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
-    <script>
-
-        $(document).ready(function () {
-            $('#pageLoader').show();
-
-            // Allow TODAY + PAST only (Restrict future)
-            // let today = new Date().toISOString().split("T")[0];
-            // document.getElementById("reportDate").setAttribute("max", today);
-            // document.getElementById("reportDate").value = today;
-
-
-
-            // document.getElementById("zonereportDate").value = today;
-            // document.getElementById("zonereportDate").setAttribute("max", today);
-
-            // // When main report date changes, update zone date
-            // document.getElementById("reportDate").addEventListener("change", function () {
-            //     document.getElementById("zonereportDate").value = this.value;
-            // });
-
-            // // When zone date changes, update main date
-            // document.getElementById("zonereportDate").addEventListener("change", function () {
-            //     document.getElementById("reportDate").value = this.value;
-            // });
-
-            function getLocalDate(offsetDays = 0) {
-                const d = new Date();
-                d.setDate(d.getDate() + offsetDays);
-                return d.toLocaleDateString('en-CA'); // YYYY-MM-DD
-            }
-
-            // Today
-            let today = getLocalDate(0);
-
-            // Tomorrow (max limit)
-            let tomorrow = getLocalDate(1);
-
-            // Apply today as default, tomorrow as max
-            document.getElementById("reportDate").value = today;
-            document.getElementById("reportDate").setAttribute("max", tomorrow);
-
-            document.getElementById("zonereportDate").value = today;
-            document.getElementById("zonereportDate").setAttribute("max", tomorrow);
-
-            document.getElementById("zoneandshiftDate").value = today;
-            document.getElementById("zoneandshiftDate").setAttribute("max", tomorrow);
-
-            // Sync both fields
-            document.getElementById("reportDate").addEventListener("change", function () {
-                document.getElementById("zonereportDate").value = this.value;
-            });
-
-            document.getElementById("zonereportDate").addEventListener("change", function () {
-                document.getElementById("reportDate").value = this.value;
-            });
-            document.getElementById("zoneandshiftDate").addEventListener("change", function () {
-                document.getElementById("reportDate").value = this.value;
-            });
-
-
-
-
-            document.querySelector(".col-md-6 .card h5 strong").innerText =
-                "Zone wise Logistics Overview - Shift A";
-
-
-
-
-
-
-            $('#zoneDetailsTableoverall').DataTable({
-                dom: 'Bfrtip',
-                paging: false,
-                searching: false,
-                ordering: false,
-                info: false,
-                buttons: [
-                    {
-                        extend: 'excelHtml5',
-                        title: 'zoneDetailsoverall_Wise_Summary',
-                        text: 'Download Excel',
-                        className: 'btn btn-success btn-sm'
-                    },
-                    {
-                        extend: 'pdfHtml5',
-                        title: 'zoneDetailsoverall_Wise_Summary',
-                        text: 'Download PDF',
-                        className: 'btn btn-danger btn-sm',
-                        orientation: 'landscape',
-                        pageSize: 'A4'
-                    }
-                ]
-            });
-
-            $('#zoneDetailsTableoverview').DataTable({
-                dom: 'Bfrtip',
-                paging: false,
-                searching: false,
-                ordering: false,
-                info: false,
-                buttons: [
-                    {
-                        extend: 'excelHtml5',
-                        title: 'zonedetailswise_summary',
-                        text: 'Download Excel',
-                        className: 'btn btn-success btn-sm'
-                    },
-                    {
-                        extend: 'pdfHtml5',
-                        title: 'zonedetailswise_summary',
-                        text: 'Download PDF',
-                        className: 'btn btn-danger btn-sm',
-                        orientation: 'landscape',
-                        pageSize: 'A4'
-                    }
-                ]
-            });
-
-        });
-        //ak
-        function goToFeedback() {
-            window.location.href = "/commissionerreview/feedbackreport";
-        }
-
-        function goToDriverReport() {
-            window.location.href = "/commissionerreview/driverreport";
-        }
-
-
-
-
-
-
-        let shiftTable = null;  // global variable
-
-        function initShiftTable() {
-            if (!shiftTable) {
-                shiftTable = $('#shiftSummaryTable').DataTable({
-                    paging: false,
-                    searching: false,
-                    ordering: false,
-                    info: false,
-                    dom: 'Bfrtip',
-                    buttons: [
-                        {
-                            extend: 'excelHtml5',
-                            title: 'Shift_Wise_Report',
-                            text: 'Download Excel',
-                            className: 'btn btn-success btn-sm'
-                        },
-                        {
-                            extend: 'pdfHtml5',
-                            title: 'Shift_Wise_Report',
-                            text: 'Download PDF',
-                            className: 'btn btn-danger btn-sm',
-                            orientation: 'landscape',
-                            pageSize: 'A4'
-                        }
-                    ]
-                });
-            }
-        }
-
-
-        // Load today's date automatically
-        document.addEventListener("DOMContentLoaded", function () {
-            const today = new Date().toISOString().split("T")[0];
-            document.getElementById("reportDate").value = today;
-
-            initShiftTable();   // <-- ONLY ONE TIME
-            loadAbstractReport(today);
-        });
-
-
-        // Load data when date changes
-        document.getElementById("reportDate").addEventListener("change", function () {
-            loadAbstractReport(this.value);
-        });
-
-        // Fetch + Populate Table
-        function loadAbstractReport(date) {
-            if (!date) return;
-
-            fetch(`/commissionerreview/api/abstract?date=${date}`)
-                .then(res => res.json())
-                .then(json => {
-                    if (json.status === "success") {
-                        $('#pageLoader').hide();
-                        populateShiftTable(json.data);
-                    } else {
-                        alert("Error: " + json.message);
-                    }
-                })
-                .catch(err => console.error("Fetch Error:", err));
-        }
-
-        // old already used 
-        // function populateShiftTable(data) {
-        //     // Clear existing data in DataTable
-        //     shiftTable.clear();
-
-
-
-        //     data.forEach(row => {
-        //         let shiftButton = row.shift_name !== "Total"
-        //             ? `<button class="badge bg-info" 
-        //                 data-shiftid="${row.shiftid}" 
-        //                 data-shiftcode="${row.shift_code}"
-        //                 onclick="openShiftModal(this)">
-        //             ${row.shift_name}
-        //        </button>`
-        //             : `<strong>Total</strong>`;
-
-        //         let rowClass = row.shift_name === "Total" ? "table-info fw-bold" : "";
-
-        //         shiftTable.row.add([
-        //             shiftButton,
-        //             row.food_requested,
-        //             row.food_delivered,
-        //             row.overall_count,
-        //             `<span class="text-danger fw-bold">${row.present_count}</span>`,
-        //             row.absent_count,
-        //             `<span class="badge bg-danger">${row.food_shortfall}</span>`
-        //         ]);
-        //     });
-
-        //     shiftTable.draw(); // refresh table
-        // }
-
-        function populateShiftTable(data) {
-            // Clear existing data in DataTable
-            shiftTable.clear();
-
-
-
-            data.forEach(row => {
-                let shiftButton = row.shift_name !== "Total"
-                    ? `<button class="badge bg-info" 
-                        data-shiftid="${row.shiftid}" 
-                        data-shiftcode="${row.shift_name}"
-                        onclick="openShiftModal(this)">
-                    ${row.shift_name}
-               </button>`
-                    : `<strong>Total</strong>`;
-
-                let rowClass = row.shift_name === "Total" ? "table-info fw-bold" : "";
-
-                shiftTable.row.add([
-                    shiftButton,
-                    row.total_complement,
-                    row.weekly_off,
-                    row.planned_leave,
-                    `<span class="text-danger fw-bold">${row.present_count}</span>`,
-                    row.food_requested,
-                    row.food_delivered,
-                    `<span class="badge bg-danger">${row.food_shortfall}</span>`
-                ]);
-            });
-
-            shiftTable.draw(); // refresh table
-        }
-
-
-
-
-        function createExportButtons() {
-
-            // Remove previous buttons
-            document.getElementById("exportContainer").innerHTML = "";
-
-            new DataTable('#shiftSummaryTable', {
-                destroy: true,
-                paging: false,
-                searching: false,
-                ordering: false,
-                info: false,
-                retrieve: true,   // IMPORTANT
-                dom: 'Bfrtip',
-                buttons: [
-                    {
-                        extend: 'excelHtml5',
-                        title: 'Shift_Wise_Report',
-                        text: 'Download Excel',
-                        className: 'btn btn-success btn-sm'
-                    },
-                    {
-                        extend: 'pdfHtml5',
-                        title: 'Shift_Wise_Report',
-                        text: 'Download PDF',
-                        className: 'btn btn-danger btn-sm',
-                        orientation: 'landscape',
-                        pageSize: 'A4'
-                    }
-                ]
-            });
-        }
-
-
-
-
-
-        function createExportButtonsforZoneShift() {
-
-            // Remove previous buttons
-            document.getElementById("exportContainerzoneshift").innerHTML = "";
-
-            new DataTable('#zoneandshiftSummaryTable', {
-                destroy: true,
-                paging: false,
-                searching: false,
-                ordering: false,
-                info: false,
-                retrieve: true,   // IMPORTANT
-                dom: 'Bfrtip',
-                buttons: [
-                    {
-                        extend: 'excelHtml5',
-                        title: 'zoneandShift_Wise_Report',
-                        text: 'Download Excel',
-                        className: 'btn btn-success btn-sm'
-                    },
-                    {
-                        extend: 'pdfHtml5',
-                        title: 'ZoneandShift_Wise_Report',
-                        text: 'Download PDF',
-                        className: 'btn btn-danger btn-sm',
-                        orientation: 'landscape',
-                        pageSize: 'A4'
-                    }
-                ]
-            });
-        }
-
-
-
-        //// zone and shift summary
-        let zoneShiftTable = null; // Global variable
-
-        // Initialize Zone & Shift DataTable
-        function initZoneShiftTable() {
-            if (!zoneShiftTable) {
-                zoneShiftTable = $('#zoneandshiftSummaryTable').DataTable({
-                    paging: false,
-                    searching: false,
-                    ordering: false,
-                    info: false,
-                    dom: 'Bfrtip',
-                    buttons: [
-                        {
-                            extend: 'excelHtml5',
-                            title: 'Zone_Shift_Report',
-                            text: 'Download Excel',
-                            className: 'btn btn-success btn-sm'
-                        },
-                        {
-                            extend: 'pdfHtml5',
-                            title: 'Zone_Shift_Report',
-                            text: 'Download PDF',
-                            className: 'btn btn-danger btn-sm',
-                            orientation: 'landscape',
-                            pageSize: 'A4'
-                        }
-                    ]
-                });
-
-            }
-        }
-
-        // Load today's date automatically and default shift
-        document.addEventListener("DOMContentLoaded", function () {
-            const today = new Date().toISOString().split("T")[0];
-            document.getElementById("reportDate").value = today;
-
-            initShiftTable();       // Initialize shift summary table
-            initZoneShiftTable();   // Initialize zone-shift table
-
-            // Set default shift on page load
-            // Load default shift A
-            openShiftModal("Shift A");
-        });
-
-
-        // Reload zone-shift data when date changes
-        document.getElementById("reportDate").addEventListener("change", function () {
-            let shiftCode = document.getElementById("shiftName").innerText || 'A';
-            let shiftId;
-
-            switch (shiftCode.toUpperCase()) {
-                case 'A': shiftId = 1; break;
-                case 'B': shiftId = 2; break;
-                case 'C': shiftId = 3; break;
-                default: shiftId = 1;
-            }
-
-            loadZoneShiftReport(this.value, shiftId);
-        });
-
-        // Fetch zone & shift report data
-        function loadZoneShiftReport(date, shiftId) {
-            if (!date || !shiftId) return;
-
-            fetch(`/commissionerreview/api/zoneandshiftbasedreport?date=${date}&shiftId=${shiftId}`)
-                .then(res => res.json())
-                .then(json => {
-                    if (json.status === "success") {
-                        populateZoneShiftTable(json.data);
-                    } else {
-                        alert("Error: " + json.message);
-                    }
-                })
-                .catch(err => console.error("Fetch Error:", err));
-        }
-
-
-
-
-
-        // wardwise datatable 
-
-        function createExportButtonsforZoneWardwise() {
-
-            // Remove previous buttons
-            document.getElementById("exportContainerzonewardwise").innerHTML = "";
-
-            new DataTable('#zonewardwiseSummaryTable', {
-                destroy: true,
-                paging: false,
-                searching: false,
-                ordering: false,
-                info: false,
-                retrieve: true,   // IMPORTANT
-                dom: 'Bfrtip',
-                buttons: [
-                    {
-                        extend: 'excelHtml5',
-                        title: 'zoneandShift_Wise_Report',
-                        text: 'Download Excel',
-                        className: 'btn btn-success btn-sm'
-                    },
-                    {
-                        extend: 'pdfHtml5',
-                        title: 'ZoneandShift_Wise_Report',
-                        text: 'Download PDF',
-                        className: 'btn btn-danger btn-sm',
-                        orientation: 'landscape',
-                        pageSize: 'A4'
-                    }
-                ]
-            });
-        }
-
-
-
-
-
-
-        let wardwiseTable = null;
-
-        function fillAndInitWardwiseTable(data) {
-            const tbody = document.getElementById("zonewardwiseSummaryTableBody");
-
-            // Destroy DataTable if already initialized
-            if ($.fn.DataTable.isDataTable('#zonewardwiseSummaryTable')) {
-                $('#zonewardwiseSummaryTable').DataTable().destroy();
-            }
-
-            // Clear table body
-            tbody.innerHTML = "";
-
-            // Fill table body
-            if (!data || data.length === 0) {
-                tbody.innerHTML = `<tr><td colspan="6" class="text-center text-muted">No data available</td></tr>`;
-            } else {
-                data.forEach(row => {
-                    let highlight = row.ward === "TOTAL" ? `class="table-warning fw-bold"` : "";
-                    tbody.innerHTML += `
-                <tr ${highlight}>
-                    <td>${row.ward}</td>
-                    <td class="text-success fw-bold">${row.total_complement}</td>
-                    <td>${row.weekly_off}</td>
-                    <td>${row.planned_leave}</td>
-                    <td>${row.present_count}</td>
-                    <td>${row.food_requested}</td>
-                    <td>${row.food_delivered}</td>
-                    <td class="text-danger fw-bold">${row.food_shortfall}</td>
-                </tr>`;
-                });
-            }
-
-            // Initialize DataTable with export buttons
-            wardwiseTable = $('#zonewardwiseSummaryTable').DataTable({
-                paging: false,
-                searching: false,
-                ordering: false,
-                info: false,
-                destroy: true,
-                dom: 'Bfrtip',
-                buttons: [
-                    {
-                        extend: 'excelHtml5',
-                        title: 'Ward_Wise_Report',
-                        text: 'Download Excel',
-                        className: 'btn btn-success btn-sm'
-                    },
-                    {
-                        extend: 'pdfHtml5',
-                        title: 'Ward_Wise_Report',
-                        text: 'Download PDF',
-                        className: 'btn btn-danger btn-sm',
-                        orientation: 'landscape',
-                        pageSize: 'A4'
-                    }
-                ]
-            });
-
-            // Append export buttons to container
-            wardwiseTable.buttons().container().appendTo('#exportContainerzonewardwise');
-        }
-
-        document.addEventListener("click", function (e) {
-            if (e.target.classList.contains("zone-link")) {
-                const zone = e.target.getAttribute("data-zone");
-                const dateField = document.getElementById("reportDate");
-                const date = dateField ? dateField.value : "";
-
-                let shiftCode = document.getElementById("shiftName").innerText.trim();
-                let shiftId;
-                switch (shiftCode.toUpperCase()) {
-                    case 'A': shiftId = 1; break;
-                    case 'B': shiftId = 2; break;
-                    case 'C': shiftId = 3; break;
-                    default: shiftId = 1;
-                }
-
-                document.getElementById("selectedZone").innerText = zone;
-                const url = `/commissionerreview/api/wardwiseShiftReport?date=${date}&shiftId=${shiftId}&zone=${zone}`;
-
-                fetch(url)
-                    .then(res => res.json())
-                    .then(json => {
-                        if (json.status === "success") {
-                            // Fill tbody and initialize DataTable
-                            fillAndInitWardwiseTable(json.data);
-
-                            // Show modal
-                            const modal = new bootstrap.Modal(document.getElementById("wardModal"));
-                            modal.show();
-                        }
-                    })
-                    .catch(err => console.error("Modal Error:", err));
-            }
-        });
-
-
-
-
-        // Populate the zone & shift table old
-        // function populateZoneShiftTable(data) {
-        //     zoneShiftTable.clear();
-
-        //     data.forEach(row => {
-        //         let rowClass = row.zone === "TOTAL" ? "table-info fw-bold" : "";
-
-        //         let clickable = (row.zone !== "TOTAL")
-        //             ? `<a href="javascript:void(0)" class="zone-link" data-zone="${row.zone}">${row.zone}</a>`
-        //             : "<strong>Total</strong>";
-
-        //         zoneShiftTable.row.add([
-        //             clickable,
-        //             `<span class="text-success fw-bold">${row.present_count}</span>`,
-        //             row.absent_count,
-        //             row.food_requested,
-        //             row.food_delivered,
-        //             `<span class="badge bg-danger">${row.food_shortfall}</span>`
-        //         ]).nodes().to$().addClass(rowClass);
-        //     });
-
-        //     zoneShiftTable.draw();
-        // }
-
-        // new
-        function populateZoneShiftTable(data) {
-            zoneShiftTable.clear();
-
-            data.forEach(row => {
-                let rowClass = row.zone === "TOTAL" ? "table-info fw-bold" : "";
-
-                let clickable = (row.zone !== "TOTAL")
-                    ? `<a href="javascript:void(0)" class="zone-link" data-zone="${row.zone}">${row.zone}</a>`
-                    : "<strong>Total</strong>";
-
-                zoneShiftTable.row.add([
-                    clickable,
-                    `<span class="text-success fw-bold">${row.total_complement}</span>`,
-                    row.weekly_off,
-                    row.planned_leave,
-                    row.present_count,
-                    row.food_requested,
-                    row.food_delivered,
-                    `<span class="badge bg-danger">${row.food_shortfall}</span>`
-                ]).nodes().to$().addClass(rowClass);
-            });
-
-            zoneShiftTable.draw();
-        }
-
-
-
-
-        //// overall location wise report start
-
-        // Export buttons for Ward-wise report
-        function createExportButtonsforWardWiseReport() {
-            // Remove previous buttons
-            document.getElementById("exportContainerwardwise").innerHTML = "";
-
-            new DataTable('#wardwiseSummaryTable', {
-                destroy: true,
-                paging: false,
-                searching: false,
-                ordering: false,
-                info: false,
-                retrieve: true,   // IMPORTANT
-                dom: 'Bfrtip',
-                buttons: [
-                    {
-                        extend: 'excelHtml5',
-                        title: 'Ward_Wise_Report',
-                        text: 'Download Excel',
-                        className: 'btn btn-success btn-sm'
-                    },
-                    {
-                        extend: 'pdfHtml5',
-                        title: 'Ward_Wise_Report',
-                        text: 'Download PDF',
-                        className: 'btn btn-danger btn-sm',
-                        orientation: 'landscape',
-                        pageSize: 'A4'
-                    }
-                ]
-            });
-        }
-
-
-
-        // Initialize Ward-wise DataTable
-        function initWardTable() {
-            if (!wardTable) {
-                wardTable = $('#wardwiseSummaryTable').DataTable({
-                    paging: false,
-                    searching: false,
-                    ordering: false,
-                    info: false,
-                    dom: 'Bfrtip',
-                    buttons: [
-                        {
-                            extend: 'excelHtml5',
-                            title: 'Ward_Wise_Report',
-                            text: 'Download Excel',
-                            className: 'btn btn-success btn-sm'
-                        },
-                        {
-                            extend: 'pdfHtml5',
-                            title: 'Ward_Wise_Report',
-                            text: 'Download PDF',
-                            className: 'btn btn-danger btn-sm',
-                            orientation: 'landscape',
-                            pageSize: 'A4'
-                        }
-                    ]
-                });
-            }
-        }
-
-
-
-
-        // Load today's date and fetch Ward report on page load
-        document.addEventListener("DOMContentLoaded", function () {
-            const today = new Date().toISOString().split("T")[0];
-            document.getElementById("reportDate").value = today;
-
-            initWardTable();   // Initialize Ward-wise table
-            loadWardReport(today); // Load Ward data for today
-            showFoodMenu('Shift A');
-        });
-
-        // Reload Ward data when date changes
-        document.getElementById("reportDate").addEventListener("change", function () {
-            loadWardReport(this.value);
-        });
-
-
-
-        // Global variable for Ward table
-        let wardTable = null;
-        let wardData = []; // store full data from backend
-
-        // Fetch Ward-wise report from backend
-        function loadWardReport(date) {
-            if (!date) return;
-
-            fetch(`/commissionerreview/api/wardlocationreport?date=${date}`)
-                .then(res => res.json())
-                .then(json => {
-                    if (json.status === "success") {
-                        wardData = json.data;              // store raw data
-                        populateZoneDropdown(json.data);
-                        populateWardTable(json.data);
-                    } else {
-                        alert("Error: " + json.message);
-                    }
-                })
-                .catch(err => console.error("Fetch Error:", err));
-        }
-
-        function populateZoneDropdown(data) {
-            const zoneDropdown = document.getElementById("zoneFilter");
-
-            // Clear existing except “ALL”
-            zoneDropdown.innerHTML = `<option value="ALL">All Zones</option>`;
-
-            // Extract distinct zones, excluding "TOTAL"
-            const zones = [...new Set(
-                data
-                    .map(item => item.zone)
-                    .filter(z => z && z !== "TOTAL") // REMOVE TOTAL 🚀
-            )];
-
-            zones.forEach(zone => {
-                zoneDropdown.innerHTML += `<option value="${zone}">${zone}</option>`;
-            });
-        }
-
-
-        // old
-        // document.getElementById("zoneFilter").addEventListener("change", function () {
-        //     let selectedZone = this.value;
-
-        //     if (selectedZone === "ALL") {
-        //         populateWardTable(wardData); // show all rows
-        //     } else {
-        //         const filtered = wardData.filter(row => row.zone === selectedZone);
-        //         populateWardTable(filtered);
-        //     }
-        // });
-
-        document.getElementById("zoneFilter").addEventListener("change", function () {
-            let selectedZone = this.value;
-
-            if (selectedZone === "ALL") {
-
-                // All zones → DO NOT compute total, API already sent a TOTAL row
-                populateWardTable(wardData, false);
-
-            } else {
-
-                const filtered = wardData.filter(row => row.zone === selectedZone);
-
-                // Specific zone → NO backend total → compute JS total
-                populateWardTable(filtered, true);
-            }
-        });
-
-
-
-        function populateWardTable(data, showTotal) {
-            if (!wardTable) return;
-
-            wardTable.clear();
-
-            // Remove backend TOTAL row when filtering specific zone
-            if (showTotal === true) {
-                data = data.filter(r => r.zone !== "TOTAL");
-            }
-
-            // Add data rows
-            data.forEach(row => {
-                wardTable.row.add([
-                    row.zone,
-                    row.ward,
-                    row.location,
-                    `<span class="text-success fw-bold">${row.total_complement}</span>`,
-                    row.weekly_off,
-                    row.planned_leave,
-                    row.present_count,
-                    row.food_requested,
-                    row.food_delivered,
-                    `<span class="badge bg-danger">${row.food_shortfall}</span>`
-                ]);
-            });
-
-            // Only add JS total when selecting **specific zone**
-            if (showTotal === true) {
-
-                const total = {
-                    zone: "TOTAL",
-                    ward: "",
-                    location: "",
-                    total_complement: data.reduce((a, b) => a + (b.total_complement || 0), 0),
-                    weekly_off: data.reduce((a, b) => a + (b.weekly_off || 0), 0),
-                    planned_leave: data.reduce((a, b) => a + (b.planned_leave || 0), 0),
-                    present_count: data.reduce((a, b) => a + (b.present_count || 0), 0),
-                    food_requested: data.reduce((a, b) => a + (b.food_requested || 0), 0),
-                    food_delivered: data.reduce((a, b) => a + (b.food_delivered || 0), 0),
-                    food_shortfall: data.reduce((a, b) => a + (b.food_shortfall || 0), 0)
-                };
-
-                let tr = wardTable.row.add([
-                    `<strong>${total.zone}</strong>`,
-                    `<strong>${total.ward}</strong>`,
-                    "",
-                    `<strong class="text-success">${total.total_complement}</strong>`,
-                    `<strong>${total.weekly_off}</strong>`,
-                    `<strong>${total.planned_leave}</strong>`,
-                    `<strong>${total.present_count}</strong>`,
-                    `<strong>${total.food_requested}</strong>`,
-                    `<strong>${total.food_delivered}</strong>`,
-                    `<span class="badge bg-danger">${total.food_shortfall}</span>`
-                ]).draw().node();
-
-                tr.classList.add("table-info", "fw-bold");
-            }
-
-            wardTable.draw();
-            createExportButtonsforWardWiseReport();
-        }
-
-
-
-        // Populate the Ward-wise DataTable old
-        // function populateWardTable(data) {
-        //     if (!wardTable) return;
-
-        //     wardTable.clear();
-
-        //     data.forEach(row => {
-        //         let rowClass = row.ward === "TOTAL" ? "table-info fw-bold" : "";
-
-        //         wardTable.row.add([
-        //             row.zone,
-        //             row.ward,
-        //             row.location,
-        //             // row.ward === "TOTAL" ? `<strong>Total</strong>` : row.ward,
-
-
-        //             `<span class="text-success fw-bold">${row.total_complement}</span>`,
-        //             row.weekly_off,
-        //             row.planned_leave,
-        //             row.present_count,
-        //             row.food_requested,
-        //             row.food_delivered,
-        //             `<span class="badge bg-danger">${row.food_shortfall}</span>`
-        //         ]).nodes().to$().addClass(rowClass);
-        //     });
-
-        //     wardTable.draw();
-
-        //     // Create export buttons
-        //     createExportButtonsforWardWiseReport();
-        // }
-
-
-        //// overall location wise report end   
-
-
-
-        function openZoneModal(zoneNo) {
-
-            // Set modal title
-            document.getElementById("zoneNumber").innerText = zoneNo;
-
-            // Static 6 rows
-            let rows = [
-                { sno: 1, ward: "001", requested: 520, delivered: 510, shortfall: 10 },
-                { sno: 2, ward: "002", requested: 480, delivered: 470, shortfall: 10 },
-                { sno: 3, ward: "003", requested: 505, delivered: 495, shortfall: 10 },
-                { sno: 4, ward: "004", requested: 450, delivered: 440, shortfall: 10 },
-                { sno: 5, ward: "005", requested: 575, delivered: 560, shortfall: 15 },
-                { sno: 6, ward: "006", requested: 490, delivered: 485, shortfall: 5 }
-            ];
-
-            let tbody = document.getElementById("zoneWardBody");
-            tbody.innerHTML = "";
-
-            rows.forEach(row => {
-                tbody.innerHTML += `
-            <tr>
-               
-                <td>${row.ward}</td>
-                <td>${row.requested}</td>
-                <td>${row.delivered}</td>
-                <td class="text-danger fw-bold">${row.shortfall}</td>
-            </tr>
-        `;
-            });
-
-            // Destroy old DataTable if exists
-            if ($.fn.DataTable.isDataTable("#zoneWardTable")) {
-                $("#zoneWardTable").DataTable().destroy();
-            }
-
-            // Reinitialize with PDF + Excel buttons
-            setTimeout(() => {
-                $("#zoneWardTable").DataTable({
-                    dom: "Bfrtip",
-                    paging: false,
-                    searching: false,
-                    ordering: false,
-                    info: false,
-                    buttons: [
-                        {
-                            extend: 'excelHtml5',
-                            title: 'Zone_' + zoneNo + '_Ward_Report',
-                            className: 'btn btn-success btn-sm',
-                            text: 'Download Excel'
-                        },
-                        {
-                            extend: 'pdfHtml5',
-                            title: 'Zone_' + zoneNo + '_Ward_Report',
-                            className: 'btn btn-danger btn-sm',
-                            pageSize: 'A4',
-                            orientation: 'landscape',
-                            text: 'Download PDF'
-                        }
-                    ]
-                });
-            }, 200);
-
-            new bootstrap.Modal(document.getElementById("zoneModal")).show();
-        }
-
-
-
-
-
-
-        // Reset modal when closed
-        document.getElementById('shiftModal').addEventListener('hidden.bs.modal', function () {
-
-            // Destroy DataTable if exists
-            if ($.fn.DataTable.isDataTable("#shiftZoneTable")) {
-                $('#shiftZoneTable').DataTable().destroy();
-            }
-
-            // Clear rows
-            document.getElementById("shiftZoneBody").innerHTML = "";
-        });
-
-        const staticShiftData = {
-            "A": [
-                { zone: "Zone 1", present: 335, absent: 101, unplanned: 101, requested: 361, delivered: 333, shortfall: 28 },
-                { zone: "Zone 2", present: 400, absent: 110, unplanned: 105, requested: 380, delivered: 350, shortfall: 30 },
-                { zone: "Zone 3", present: 450, absent: 120, unplanned: 110, requested: 395, delivered: 370, shortfall: 22 }
-            ],
-            "B": [
-                { zone: "Zone 1", present: 320, absent: 140, unplanned: 120, requested: 360, delivered: 330, shortfall: 30 },
-                { zone: "Zone 2", present: 390, absent: 135, unplanned: 120, requested: 400, delivered: 380, shortfall: 25 }
-            ],
-            "C": [
-                { zone: "Zone 1", present: 310, absent: 150, unplanned: 130, requested: 350, delivered: 330, shortfall: 20 },
-                { zone: "Zone 2", present: 420, absent: 155, unplanned: 140, requested: 450, delivered: 420, shortfall: 30 }
-            ]
-        };
-
-
-        function showFoodMenu(shift) {
-            console.log(shift);
-            // Hide all sections
-            document.getElementById("shiftASection").style.display = "none";
-            document.getElementById("shiftBSection").style.display = "none";
-            document.getElementById("shiftCSection").style.display = "none";
-
-            // Show selected section
-            if (shift === 'Shift A') {
-                document.getElementById("shiftASection").style.display = "block";
-            } else if (shift === 'Shift B & C') {
-                document.getElementById("shiftBSection").style.display = "block";
-            } else if (shift === 'Shift C') {
-                document.getElementById("shiftCSection").style.display = "block";
-            }
-        }
-
-
-        // Function called when shift button is clicked
-
-        // Function called when shift button is clicked
-        function openShiftModal(buttonOrShift) {
-            const date = document.getElementById("reportDate").value;
-
-            let shiftId, shiftCode;
-
-            // Case 1: button element clicked
-            if (buttonOrShift instanceof HTMLElement) {
-                shiftId = buttonOrShift.getAttribute("data-shiftid");
-                shiftCode = buttonOrShift.getAttribute("data-shiftcode");
-                console.log(shiftId, shiftCode);
-            } else {
-                // Case 2: called with shift code or shiftId directly
-                // Convert to string to safely use toUpperCase()
-                shiftCode = String(buttonOrShift);
-
-                // Map shiftCode to shiftId if it's a letter
-                switch (shiftCode.toUpperCase()) {
-                    case 'A': shiftId = 1; break;
-                    case 'B': shiftId = 2; break;
-                    case 'C': shiftId = 3; break;
-                    default:
-                        // If shiftCode is actually a number string, use it directly
-                        shiftId = parseInt(shiftCode) || 1;
-                }
-            }
-            console.log(shiftId, shiftCode);
-
-            // Update header text
-            document.getElementById("shiftName").innerText = shiftCode;
-
-            console.log(shiftCode);
-            document.querySelector(".col-md-12 .card h5 strong").innerText =
-                "Zone wise Overview - " + shiftCode;
-
-
-            // SHOW FOOD MENU using shift_code
-            showFoodMenu(shiftCode);
-
-            // Fetch and render zone & shift data using shiftId
-            loadZoneShiftReport(date, shiftId);
-        }
-
-
-
-    </script>
-
-</body>
-
-</html>
\ No newline at end of file