From eae6a144061ce4d979cd9af8248cc8a3a4ccd8dc Mon Sep 17 00:00:00 2001
From: yoganandhank <yogalinking@gmail.com>
Date: Wed, 21 May 2025 12:03:00 +0530
Subject: [PATCH] added in mixed waste amount

---
 Dump20250423.sql                              |  383 ++++++
 .../DumpRegistrationAPIController.java        |  174 +++
 .../cdwaste/controller/MainController.java    |   75 ++
 backend/cdwaste/service/OfficerService.java   |  161 +++
 backend/cdwaste/service/SMSService.java       |   40 +
 frontend/cdwastecollect/lessoneton.html       |  430 +++++++
 frontend/cdwastecollect/officer.html          | 1122 +++++++++++++++++
 frontend/cdwastecollect/reports.html          |  411 ++++++
 8 files changed, 2796 insertions(+)
 create mode 100644 Dump20250423.sql
 create mode 100644 backend/cdwaste/controller/DumpRegistrationAPIController.java
 create mode 100644 backend/cdwaste/controller/MainController.java
 create mode 100644 backend/cdwaste/service/OfficerService.java
 create mode 100644 backend/cdwaste/service/SMSService.java
 create mode 100644 frontend/cdwastecollect/lessoneton.html
 create mode 100644 frontend/cdwastecollect/officer.html
 create mode 100644 frontend/cdwastecollect/reports.html

diff --git a/Dump20250423.sql b/Dump20250423.sql
new file mode 100644
index 0000000..2246b9a
--- /dev/null
+++ b/Dump20250423.sql
@@ -0,0 +1,383 @@
+-- MySQL dump 10.13  Distrib 8.0.40, for Win64 (x86_64)
+--
+-- Host: localhost    Database: dumpwastecollector
+-- ------------------------------------------------------
+-- Server version	8.0.40
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!50503 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `dumping_location`
+--
+
+DROP TABLE IF EXISTS `dumping_location`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `dumping_location` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `location` varchar(255) DEFAULT NULL,
+  `is_active` tinyint(1) DEFAULT '1',
+  `is_delete` tinyint(1) DEFAULT '0',
+  `cdate` datetime DEFAULT CURRENT_TIMESTAMP,
+  `quantity_id` varchar(20) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=101 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `dumping_location`
+--
+
+LOCK TABLES `dumping_location` WRITE;
+/*!40000 ALTER TABLE `dumping_location` DISABLE KEYS */;
+INSERT INTO `dumping_location` VALUES (1,'Kodungaiyur',1,0,'2025-03-25 15:24:21','2'),(2,'perungudi',1,0,'2025-03-25 15:24:21','2'),(3,'Buckingam canal road, Sathangadu, Thiruvottriyur. (Adjacent to lorry station, Zone-1)',1,0,'2025-04-03 16:13:19','1'),(4,'Unit-5, Kamaraj Salai (Near zonal office)',1,0,'2025-04-03 16:13:19','1'),(5,'CMDA Truck Terminal near Night Shelter (Back side of Madhavaram Bus Terminus)',1,0,'2025-04-03 16:13:19','1'),(6,'Kodungaiyur Dumping ground, Tondiarpet High Road (3rd gate)',1,0,'2025-04-03 16:13:19','1'),(7,'Part of old Cattle depot, Avadhanam Pappier Road, Choolai (Opposite to Corporation School)',1,0,'2025-04-03 16:13:19','1'),(8,'Part of old Cattle depot, Avadhanam Pappier Road, Choolai (Opposite to Corporation School)',0,1,'2025-04-03 16:13:19','1'),(9,'Vanagaram Road, Athipet dumping yard',1,0,'2025-04-03 16:13:19','1'),(10,'1st Main Road, Shenoy Nagar (Near Gajalakshmi Colony)',1,0,'2025-04-03 16:13:19','1'),(11,'Lloyds Colony (Near Corporation ITI Institute)',1,0,'2025-04-03 16:13:19','1'),(12,'Gurusiva Street, S.M Block, Jafferkhanpet, Kodambakkam (Near R-10 MGR Nagar Police Station)',1,0,'2025-04-03 16:13:19','1'),(13,'Nolambur Phase II, 2nd main road (Near Madhuravoyal Taluk office)',1,0,'2025-04-03 16:13:19','1'),(14,'Nandambakkam TPF near Adyar river bund in Dn - 158',1,0,'2025-04-03 16:13:19','1'),(15,'Velechery Main Road, Near to Gurunanak college, Velecherry Burial Ground',1,0,'2025-04-03 16:13:19','1'),(16,'200 Ft Radial Road, Perungudi Dumping Ground',1,0,'2025-04-03 16:13:19','1'),(17,'Gangaiamman Kovil Street extn., Karapakkam (Near to Tamilnadu Teacher Education University)',1,0,'2025-04-03 16:13:19','1'),(18,'Kodungaiyur',1,0,'2025-04-04 13:28:42','3'),(19,'perungudi',1,0,'2025-04-04 13:28:42','3'),(100,'aLL',0,1,'2025-04-04 13:28:42','1');
+/*!40000 ALTER TABLE `dumping_location` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `order_log`
+--
+
+DROP TABLE IF EXISTS `order_log`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `order_log` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `order_info` varchar(1000) DEFAULT NULL,
+  `order_id` varchar(45) DEFAULT NULL,
+  `ref_id` varchar(45) DEFAULT NULL,
+  `cdate` datetime DEFAULT CURRENT_TIMESTAMP,
+  `order_status` varchar(45) DEFAULT NULL,
+  `pay_attempt` int DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `order_log`
+--
+
+LOCK TABLES `order_log` WRITE;
+/*!40000 ALTER TABLE `order_log` DISABLE KEYS */;
+/*!40000 ALTER TABLE `order_log` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `payment`
+--
+
+DROP TABLE IF EXISTS `payment`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `payment` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `mobile_no` varchar(25) DEFAULT NULL,
+  `order_id` varchar(100) DEFAULT NULL,
+  `payment_id` varchar(100) DEFAULT NULL,
+  `paymentstatus` varchar(45) DEFAULT NULL,
+  `payment_date` datetime DEFAULT CURRENT_TIMESTAMP,
+  `ref_id` varchar(45) DEFAULT NULL,
+  `amount` double DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `payment`
+--
+
+LOCK TABLES `payment` WRITE;
+/*!40000 ALTER TABLE `payment` DISABLE KEYS */;
+/*!40000 ALTER TABLE `payment` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `payment_failure_log`
+--
+
+DROP TABLE IF EXISTS `payment_failure_log`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `payment_failure_log` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `payment_id` varchar(100) DEFAULT NULL,
+  `order_id` varchar(100) DEFAULT NULL,
+  `ref_id` varchar(45) DEFAULT NULL,
+  `reason` varchar(45) DEFAULT NULL,
+  `cdate` datetime DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `payment_failure_log`
+--
+
+LOCK TABLES `payment_failure_log` WRITE;
+/*!40000 ALTER TABLE `payment_failure_log` DISABLE KEYS */;
+/*!40000 ALTER TABLE `payment_failure_log` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `quantity_master`
+--
+
+DROP TABLE IF EXISTS `quantity_master`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `quantity_master` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `quantity` varchar(255) DEFAULT NULL,
+  `is_active` tinyint(1) DEFAULT '1',
+  `is_delete` tinyint(1) DEFAULT '0',
+  `cdate` datetime DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `quantity_master`
+--
+
+LOCK TABLES `quantity_master` WRITE;
+/*!40000 ALTER TABLE `quantity_master` DISABLE KEYS */;
+INSERT INTO `quantity_master` VALUES (1,'Less Than 1 Ton',1,0,'2025-03-25 15:26:18'),(2,'1 Ton to 20 Ton',1,0,'2025-03-25 15:26:18'),(3,'More Than 20 Ton',1,0,'2025-03-25 15:26:18');
+/*!40000 ALTER TABLE `quantity_master` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `refund_info`
+--
+
+DROP TABLE IF EXISTS `refund_info`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `refund_info` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `ref_id` varchar(255) DEFAULT NULL,
+  `refund_amt` double DEFAULT NULL,
+  `balance_amt` double DEFAULT NULL,
+  `pid` int DEFAULT NULL,
+  `refund_id` varchar(255) DEFAULT NULL,
+  `refund_status` varchar(100) DEFAULT NULL,
+  `cdate` datetime DEFAULT CURRENT_TIMESTAMP,
+  `r_desc` varchar(2000) DEFAULT NULL,
+  `rrn` varchar(55) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `refund_info`
+--
+
+LOCK TABLES `refund_info` WRITE;
+/*!40000 ALTER TABLE `refund_info` DISABLE KEYS */;
+/*!40000 ALTER TABLE `refund_info` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `vehicle_master`
+--
+
+DROP TABLE IF EXISTS `vehicle_master`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `vehicle_master` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `vehicle_name` varchar(255) DEFAULT NULL,
+  `is_active` tinyint(1) DEFAULT '1',
+  `is_delete` tinyint(1) DEFAULT '0',
+  `cdate` datetime DEFAULT CURRENT_TIMESTAMP,
+  `quantity_id` int DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `vehicle_master`
+--
+
+LOCK TABLES `vehicle_master` WRITE;
+/*!40000 ALTER TABLE `vehicle_master` DISABLE KEYS */;
+INSERT INTO `vehicle_master` VALUES (1,'GCC Service',1,0,'2025-04-03 22:01:45',1),(2,'GCC Authorized C&D Waste Collectors',1,0,'2025-04-03 22:01:45',2),(3,'Self Arranged Vehicles',1,0,'2025-04-03 22:01:45',1),(4,'GCC Service',1,0,'2025-04-04 13:18:37',2),(5,'Self Arranged Vehicles',1,0,'2025-04-04 13:18:37',2),(6,'GCC Authorized C&D Waste Collectors',1,0,'2025-04-04 13:18:37',3),(7,'Self Arranged Vehicles',1,0,'2025-04-04 13:18:37',3);
+/*!40000 ALTER TABLE `vehicle_master` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `wards`
+--
+
+DROP TABLE IF EXISTS `wards`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `wards` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `ward_name` varchar(50) DEFAULT NULL,
+  `is_active` tinyint(1) DEFAULT '1',
+  `is_delete` tinyint(1) DEFAULT '0',
+  `cdate` datetime DEFAULT CURRENT_TIMESTAMP,
+  `zone_id` int DEFAULT NULL,
+  `zone_name` varchar(45) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=144 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `wards`
+--
+
+LOCK TABLES `wards` WRITE;
+/*!40000 ALTER TABLE `wards` DISABLE KEYS */;
+INSERT INTO `wards` VALUES (1,'001',1,0,'2025-04-12 16:55:46',1,'01'),(2,'002',1,0,'2025-04-12 16:55:46',1,'01'),(3,'003',1,0,'2025-04-12 16:55:46',1,'01'),(4,'004',1,0,'2025-04-15 01:14:30',1,'01'),(5,'005',1,0,'2025-04-15 01:14:30',1,'01'),(6,'006',1,0,'2025-04-15 01:14:30',1,'01'),(7,'007',1,0,'2025-04-15 01:14:30',1,'01'),(8,'008',1,0,'2025-04-15 01:14:30',1,'01'),(9,'009',1,0,'2025-04-15 01:14:30',1,'01'),(10,'010',1,0,'2025-04-15 01:14:30',1,'01'),(11,'011',1,0,'2025-04-15 01:14:30',1,'01'),(12,'012',1,0,'2025-04-15 01:14:30',1,'01'),(13,'013',1,0,'2025-04-15 01:14:30',1,'01'),(14,'014',1,0,'2025-04-15 01:14:30',1,'01'),(15,'015',1,0,'2025-04-15 01:14:30',2,'02'),(16,'016',1,0,'2025-04-15 01:14:30',2,'02'),(17,'017',1,0,'2025-04-15 01:14:30',2,'02'),(18,'018',1,0,'2025-04-15 01:14:30',2,'02'),(19,'019',1,0,'2025-04-15 01:14:30',2,'02'),(20,'020',1,0,'2025-04-15 01:14:30',2,'02'),(21,'021',1,0,'2025-04-15 01:14:30',2,'02'),(22,'022',1,0,'2025-04-15 01:14:30',2,'02'),(23,'023',1,0,'2025-04-15 01:14:30',3,'03'),(24,'024',1,0,'2025-04-15 01:14:30',3,'03'),(25,'025',1,0,'2025-04-15 01:14:30',3,'03'),(26,'026',1,0,'2025-04-15 01:14:30',3,'03'),(27,'027',1,0,'2025-04-15 01:14:30',3,'03'),(28,'028',1,0,'2025-04-15 01:14:30',3,'03'),(29,'029',1,0,'2025-04-15 01:14:30',3,'03'),(30,'030',1,0,'2025-04-15 01:14:30',3,'03'),(31,'031',1,0,'2025-04-15 01:14:30',3,'03'),(32,'032',1,0,'2025-04-15 01:14:30',3,'03'),(33,'033',1,0,'2025-04-15 01:14:30',3,'03'),(34,'034',1,0,'2025-04-15 01:14:30',4,'04'),(35,'035',1,0,'2025-04-15 01:14:30',4,'04'),(36,'036',1,0,'2025-04-15 01:14:30',4,'04'),(37,'037',1,0,'2025-04-15 01:14:30',4,'04'),(38,'038',1,0,'2025-04-15 01:14:30',4,'04'),(39,'039',1,0,'2025-04-15 01:14:30',4,'04'),(40,'040',1,0,'2025-04-15 01:14:30',4,'04'),(41,'041',1,0,'2025-04-15 01:14:30',4,'04'),(42,'042',1,0,'2025-04-15 01:14:30',4,'04'),(43,'043',1,0,'2025-04-15 01:14:30',4,'04'),(44,'044',1,0,'2025-04-15 01:14:30',4,'04'),(45,'045',1,0,'2025-04-15 01:14:30',4,'04'),(46,'046',1,0,'2025-04-15 01:14:30',4,'04'),(47,'047',1,0,'2025-04-15 01:14:30',4,'04'),(48,'048',1,0,'2025-04-15 01:14:30',4,'04'),(49,'049',1,0,'2025-04-15 01:14:30',5,'04'),(50,'050',1,0,'2025-04-15 01:14:30',5,'05'),(51,'051',1,0,'2025-04-15 01:14:30',5,'05'),(52,'052',1,0,'2025-04-15 01:14:30',5,'05'),(53,'053',1,0,'2025-04-15 01:14:30',5,'05'),(54,'054',1,0,'2025-04-15 01:14:30',5,'05'),(55,'055',1,0,'2025-04-15 01:14:30',5,'05'),(56,'056',1,0,'2025-04-15 01:14:30',5,'05'),(57,'057',1,0,'2025-04-15 01:14:30',5,'05'),(58,'058',1,0,'2025-04-15 01:14:30',5,'05'),(59,'059',1,0,'2025-04-15 01:14:30',5,'05'),(60,'060',1,0,'2025-04-15 01:14:30',5,'05'),(61,'061',1,0,'2025-04-15 01:14:30',5,'05'),(62,'062',1,0,'2025-04-15 01:14:30',5,'05'),(63,'063',1,0,'2025-04-15 01:14:30',5,'05'),(64,'064',1,0,'2025-04-15 01:14:30',6,'06'),(65,'065',1,0,'2025-04-15 01:14:30',6,'06'),(66,'066',1,0,'2025-04-15 01:14:30',6,'06'),(67,'067',1,0,'2025-04-15 01:14:30',6,'06'),(68,'068',1,0,'2025-04-15 01:14:30',6,'06'),(69,'069',1,0,'2025-04-15 01:14:30',6,'06'),(70,'070',1,0,'2025-04-15 01:14:30',6,'06'),(71,'071',1,0,'2025-04-15 01:14:30',6,'06'),(72,'072',1,0,'2025-04-15 01:14:30',6,'06'),(73,'073',1,0,'2025-04-15 01:14:30',6,'06'),(74,'074',1,0,'2025-04-15 01:14:30',6,'06'),(75,'075',1,0,'2025-04-15 01:14:30',6,'06'),(76,'076',1,0,'2025-04-15 01:14:30',6,'06'),(77,'077',1,0,'2025-04-15 01:14:30',6,'06'),(78,'078',1,0,'2025-04-15 01:14:30',6,'06'),(79,'079',1,0,'2025-04-15 01:14:30',7,'07'),(80,'080',1,0,'2025-04-15 01:14:30',7,'07'),(81,'081',1,0,'2025-04-15 01:14:30',7,'07'),(82,'082',1,0,'2025-04-15 01:14:30',7,'07'),(83,'083',1,0,'2025-04-15 01:14:30',7,'07'),(84,'084',1,0,'2025-04-15 01:14:30',7,'07'),(85,'085',1,0,'2025-04-15 01:14:30',7,'07'),(86,'086',1,0,'2025-04-15 01:14:30',7,'07'),(87,'087',1,0,'2025-04-15 01:14:30',7,'07'),(88,'088',1,0,'2025-04-15 01:14:30',7,'07'),(89,'089',1,0,'2025-04-15 01:14:30',7,'07'),(90,'090',1,0,'2025-04-15 01:14:30',7,'07'),(91,'091',1,0,'2025-04-15 01:14:30',7,'07'),(92,'092',1,0,'2025-04-15 01:14:30',7,'07'),(93,'093',1,0,'2025-04-15 01:14:30',7,'07'),(94,'094',1,0,'2025-04-15 01:23:02',8,'08'),(95,'095',1,0,'2025-04-15 01:23:02',8,'08'),(96,'096',1,0,'2025-04-15 01:23:02',8,'08'),(97,'097',1,0,'2025-04-15 01:23:02',8,'08'),(98,'098',1,0,'2025-04-15 01:23:02',8,'08'),(99,'099',1,0,'2025-04-15 01:23:02',8,'08'),(100,'100',1,0,'2025-04-15 01:23:02',8,'08'),(101,'101',1,0,'2025-04-15 01:23:02',8,'08'),(102,'102',1,0,'2025-04-15 01:23:02',8,'08'),(103,'103',1,0,'2025-04-15 01:23:02',8,'08'),(104,'104',1,0,'2025-04-15 01:23:02',8,'08'),(105,'105',1,0,'2025-04-15 01:23:02',8,'08'),(106,'106',1,0,'2025-04-15 01:23:02',8,'08'),(107,'107',1,0,'2025-04-15 01:23:02',8,'08'),(108,'108',1,0,'2025-04-15 01:23:02',8,'08'),(109,'109',1,0,'2025-04-15 01:23:02',9,'09'),(110,'110',1,0,'2025-04-15 01:23:02',9,'09'),(111,'111',1,0,'2025-04-15 01:23:02',9,'09'),(112,'112',1,0,'2025-04-15 01:23:02',9,'09'),(113,'113',1,0,'2025-04-15 01:23:02',9,'09'),(114,'114',1,0,'2025-04-15 01:23:02',9,'09'),(115,'115',1,0,'2025-04-15 01:23:02',9,'09'),(116,'116',1,0,'2025-04-15 01:23:02',9,'09'),(117,'117',1,0,'2025-04-15 01:23:02',9,'09'),(118,'118',1,0,'2025-04-15 01:23:02',9,'09'),(119,'119',1,0,'2025-04-15 01:23:02',9,'09'),(120,'120',1,0,'2025-04-15 01:23:02',9,'09'),(121,'121',1,0,'2025-04-15 01:23:02',9,'09'),(122,'122',1,0,'2025-04-15 01:23:02',9,'09'),(123,'123',1,0,'2025-04-15 01:23:02',9,'09'),(124,'124',1,0,'2025-04-15 01:23:02',9,'09'),(125,'125',1,0,'2025-04-15 01:23:02',9,'09'),(126,'126',1,0,'2025-04-15 01:23:02',9,'09'),(127,'127',1,0,'2025-04-15 01:23:02',10,'10'),(128,'128',1,0,'2025-04-15 01:23:02',10,'10'),(129,'129',1,0,'2025-04-15 01:23:02',10,'10'),(130,'130',1,0,'2025-04-15 01:23:02',10,'10'),(131,'131',1,0,'2025-04-15 01:23:02',10,'10'),(132,'132',1,0,'2025-04-15 01:23:02',10,'10'),(133,'133',1,0,'2025-04-15 01:23:02',10,'10'),(134,'134',1,0,'2025-04-15 01:23:02',10,'10'),(135,'135',1,0,'2025-04-15 01:23:02',10,'10'),(136,'136',1,0,'2025-04-15 01:23:02',10,'10'),(137,'137',1,0,'2025-04-15 01:23:02',10,'10'),(138,'138',1,0,'2025-04-15 01:23:02',10,'10'),(139,'139',1,0,'2025-04-15 01:23:02',10,'10'),(140,'140',1,0,'2025-04-15 01:23:02',10,'10'),(141,'141',1,0,'2025-04-15 01:23:02',10,'10'),(142,'142',1,0,'2025-04-15 01:23:02',10,'10'),(143,NULL,1,0,'2025-04-15 01:23:02',NULL,'');
+/*!40000 ALTER TABLE `wards` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `waste_collection_charges`
+--
+
+DROP TABLE IF EXISTS `waste_collection_charges`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `waste_collection_charges` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `amount_type` varchar(45) DEFAULT NULL,
+  `amount` double DEFAULT NULL,
+  `is_active` tinyint(1) DEFAULT '1',
+  `is_delete` tinyint(1) DEFAULT '0',
+  `cdate` datetime DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `waste_collection_charges`
+--
+
+LOCK TABLES `waste_collection_charges` WRITE;
+/*!40000 ALTER TABLE `waste_collection_charges` DISABLE KEYS */;
+INSERT INTO `waste_collection_charges` VALUES (1,'Processing Charges per ton',800,1,0,'2025-04-04 11:12:18'),(2,'Waste Collection Charges per ton',2500,1,0,'2025-04-04 11:12:18');
+/*!40000 ALTER TABLE `waste_collection_charges` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `waste_collectors_request`
+--
+
+DROP TABLE IF EXISTS `waste_collectors_request`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `waste_collectors_request` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) DEFAULT NULL,
+  `mobile_no` varchar(15) DEFAULT NULL,
+  `zone` varchar(20) DEFAULT NULL,
+  `ward` varchar(20) DEFAULT NULL,
+  `waste_quantity_id` int DEFAULT NULL,
+  `dump_location_id` int DEFAULT NULL,
+  `waste_type_id` int DEFAULT NULL,
+  `vehicle_id` int DEFAULT NULL,
+  `upload_image_url` varchar(255) DEFAULT NULL,
+  `is_active` tinyint(1) DEFAULT '1',
+  `is_delete` tinyint(1) DEFAULT '0',
+  `cdate` datetime DEFAULT CURRENT_TIMESTAMP,
+  `payment_status` varchar(45) DEFAULT NULL,
+  `refid` varchar(50) DEFAULT NULL,
+  `actual_weight` varchar(45) DEFAULT NULL,
+  `payment_type` varchar(45) DEFAULT NULL,
+  `processing_charge` double DEFAULT NULL,
+  `waste_collection_charge` double DEFAULT NULL,
+  `total_charge` double DEFAULT NULL,
+  `payment_mobile_no` varchar(45) DEFAULT NULL,
+  `door_number` varchar(45) DEFAULT NULL,
+  `street_name` varchar(50) DEFAULT NULL,
+  `area` varchar(50) DEFAULT NULL,
+  `city` varchar(45) DEFAULT NULL,
+  `pincode` varchar(45) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `waste_collectors_request`
+--
+
+LOCK TABLES `waste_collectors_request` WRITE;
+/*!40000 ALTER TABLE `waste_collectors_request` DISABLE KEYS */;
+/*!40000 ALTER TABLE `waste_collectors_request` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `waste_type_master`
+--
+
+DROP TABLE IF EXISTS `waste_type_master`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `waste_type_master` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `waste_type` varchar(45) DEFAULT NULL,
+  `is_active` tinyint(1) DEFAULT '1',
+  `is_delete` tinyint(1) DEFAULT '0',
+  `cdate` datetime DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `waste_type_master`
+--
+
+LOCK TABLES `waste_type_master` WRITE;
+/*!40000 ALTER TABLE `waste_type_master` DISABLE KEYS */;
+INSERT INTO `waste_type_master` VALUES (1,'Concrete',1,0,'2025-04-03 17:10:17'),(2,'Wood & Plastic ',0,1,'2025-04-03 17:10:17'),(3,'Bricks and Mortars',1,0,'2025-04-03 17:10:17'),(4,'Mixed Waste',1,0,'2025-04-12 20:35:11');
+/*!40000 ALTER TABLE `waste_type_master` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `zones`
+--
+
+DROP TABLE IF EXISTS `zones`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `zones` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `zone_name` varchar(50) DEFAULT NULL,
+  `is_active` tinyint(1) DEFAULT '1',
+  `is_delete` tinyint(1) DEFAULT '0',
+  `cdate` datetime DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `zones`
+--
+
+LOCK TABLES `zones` WRITE;
+/*!40000 ALTER TABLE `zones` DISABLE KEYS */;
+INSERT INTO `zones` VALUES (1,'01',1,0,'2025-04-12 16:53:38'),(2,'02',1,0,'2025-04-12 16:53:38'),(3,'03',1,0,'2025-04-15 00:57:19'),(4,'04',1,0,'2025-04-15 00:57:19'),(5,'05',1,0,'2025-04-15 00:57:19'),(6,'06',1,0,'2025-04-15 00:57:19'),(7,'07',1,0,'2025-04-15 00:57:19'),(8,'08',1,0,'2025-04-15 00:57:19'),(9,'09',1,0,'2025-04-15 00:57:19'),(10,'10',1,0,'2025-04-15 00:57:19'),(11,'11',1,0,'2025-04-15 00:57:19'),(12,'12',1,0,'2025-04-15 00:57:19'),(13,'13',1,0,'2025-04-15 00:57:19'),(14,'14',1,0,'2025-04-15 00:57:19'),(15,'15',1,0,'2025-04-15 00:57:19');
+/*!40000 ALTER TABLE `zones` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2025-04-23 12:51:34
diff --git a/backend/cdwaste/controller/DumpRegistrationAPIController.java b/backend/cdwaste/controller/DumpRegistrationAPIController.java
new file mode 100644
index 0000000..cd42e59
--- /dev/null
+++ b/backend/cdwaste/controller/DumpRegistrationAPIController.java
@@ -0,0 +1,174 @@
+package in.gov.chennaicorporation.gccoffice.cdwaste.controller;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
+
+import in.gov.chennaicorporation.gccoffice.cdwaste.service.OfficerService;
+import in.gov.chennaicorporation.gccoffice.configuration.AppConfig;
+
+
+@RestController
+@RequestMapping("/gcc/api/dumpregistration")
+public class DumpRegistrationAPIController {
+
+	
+	@Autowired
+	private  OfficerService officerService;
+	
+    private final RestTemplate restTemplate;
+    private final AppConfig appConfig;
+
+    @Autowired
+    public DumpRegistrationAPIController(RestTemplate restTemplate, AppConfig appConfig) {
+        this.restTemplate = restTemplate;
+        this.appConfig = appConfig;
+    }
+    
+
+    
+    @GetMapping("/wastecollectorlist")
+    public ResponseEntity<String> getWasteCollectorList(
+            @RequestParam(required = false) Long mobileNo,
+            @RequestParam(required = false) Long refId) {
+
+        StringBuilder apiUrl = new StringBuilder(appConfig.dumpregister + "/dumpregistration/api/wastecollectorlist");
+
+        // If at least one param is present, append '?'
+        if (mobileNo != null || refId != null) {
+            apiUrl.append("?");
+        }
+
+        // Append parameters
+        List<String> params = new ArrayList<>();
+        if (mobileNo != null) {
+            params.add("mobileNo=" + mobileNo);
+        }
+        if (refId != null) {
+            params.add("refId=" + refId);
+        }
+
+        apiUrl.append(String.join("&", params));
+
+        try {
+            ResponseEntity<String> responseEntity = restTemplate.getForEntity(apiUrl.toString(), String.class);
+            return ResponseEntity.ok(responseEntity.getBody());
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .body("Failed to fetch data: " + e.getMessage());
+        }
+    }
+
+  @GetMapping("/getallcharges")
+  public ResponseEntity<String> getpaymentcharges() {
+      String apiUrl = appConfig.dumpregister + "/dumpregistration/dropdown/api/getallcharges";
+
+      try {
+          ResponseEntity<String> responseEntity = restTemplate.getForEntity(apiUrl, String.class);
+          return ResponseEntity.ok(responseEntity.getBody()); // Return the real response, not a fixed string
+      } catch (Exception e) {
+          return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+                  .body("Failed to fetch data: " + e.getMessage());
+      }
+  }
+  
+  
+  
+  @PostMapping("/saveWasteRequest")
+  public ResponseEntity<String> saveWasteRequest(@RequestBody Map<String, Object> payload) {
+      try {
+    	  officerService.saveRequestDetails(payload);
+          return ResponseEntity.ok("Saved successfully");
+      } catch (Exception e) {
+          e.printStackTrace();
+          return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Error saving request");
+      }
+  }
+  
+
+  
+  
+  @GetMapping("/getless1tonlist")
+  public ResponseEntity<String> getWasteCollectorLess1TonList() {
+      StringBuilder apiUrl = new StringBuilder(appConfig.dumpregister + "/dumpregistration/api/getless1tonlist");
+
+      try {
+          ResponseEntity<String> responseEntity = restTemplate.getForEntity(apiUrl.toString(), String.class);
+          return ResponseEntity.ok(responseEntity.getBody());
+      } catch (Exception e) {
+          return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+                  .body("Failed to fetch data: " + e.getMessage());
+      }
+  }
+
+  @GetMapping("/getless1tonlistbyId")
+  public ResponseEntity<String> getWasteCollectorLess1TonListbyId(@RequestParam(required = true) Long refId) {
+      if (refId == null) {
+          return ResponseEntity.badRequest().body("refId is required");
+      }
+
+      try {
+          String apiUrl = appConfig.dumpregister + "/dumpregistration/api/getless1tonlistbyid?refId=" + refId;
+
+          ResponseEntity<String> responseEntity = restTemplate.getForEntity(apiUrl, String.class);
+          return ResponseEntity.ok(responseEntity.getBody());
+
+      } catch (Exception e) {
+          return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+                  .body("Failed to fetch data: " + e.getMessage());
+      }
+  }
+
+
+  
+  @GetMapping("/getAllDetails")
+	public ResponseEntity<?> getAllRequestDetails(
+	        @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate fromDate,
+	        @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate toDate,
+	        @RequestParam(required = false) String wastequantity,
+	        @RequestParam(required = false) String zone) {
+	    try {
+
+	        List<Map<String, Object>> response = officerService.getAllRequestDetails(fromDate, toDate, wastequantity, zone);
+	        return ResponseEntity.ok(response);
+	    } catch (Exception e) {
+	        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+	                .body(Collections.singletonMap("error", "Failed to fetch data: " + e.getMessage()));
+	    }
+	}
+
+  
+  @GetMapping("/getquantity")
+	 public List<Map<String, Object>> getwastequantity() {
+	        return officerService.getAllwastequantity();
+	    }
+
+//fetch all zones
+
+	@GetMapping("/getzones")
+	public ResponseEntity<?> getAllZones() {
+	   try {
+	       List<Map<String, Object>> response = officerService.getZonesList();
+	       return ResponseEntity.ok(response);
+	   } catch (Exception e) {
+	       return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+	               .body(Collections.singletonMap("error", "Failed to fetch data: " + e.getMessage()));
+	   }
+	}
+    
+}
+
diff --git a/backend/cdwaste/controller/MainController.java b/backend/cdwaste/controller/MainController.java
new file mode 100644
index 0000000..e086376
--- /dev/null
+++ b/backend/cdwaste/controller/MainController.java
@@ -0,0 +1,75 @@
+package in.gov.chennaicorporation.gccoffice.cdwaste.controller;
+
+
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.client.RestTemplate;
+
+
+import in.gov.chennaicorporation.gccoffice.configuration.AppConfig;
+import in.gov.chennaicorporation.gccoffice.service.LoginUserInfo;
+
+@RequestMapping("/gcc/dumpregistration") 
+@Controller("dumpregistrationMainController")
+public class MainController {
+	
+	private final LoginUserInfo loginUserInfo;
+	private final RestTemplate restTemplate;
+	private final AppConfig appConfig;
+	
+	@Autowired
+    public MainController(RestTemplate restTemplate,LoginUserInfo loginUserInfo,
+    		AppConfig appConfig) {
+    	this.restTemplate = restTemplate;
+    	this.appConfig = appConfig;
+        this.loginUserInfo = loginUserInfo;     
+    }
+	
+	@GetMapping("/officer")
+	public String viewOfficer(Model model)
+	{	
+		String LoginUserId =  LoginUserInfo.getLoginUserId();
+		model.addAttribute("LoginUserId",LoginUserId);
+		
+		String UserRole = LoginUserInfo.getUserRole();
+		model.addAttribute("UserRole", UserRole);
+		
+        
+		return "modules/cdwastecollect/officer";
+	}
+	
+	
+	
+	@GetMapping("/lessthanoneton")
+	public String viewLessoneTonList(Model model)
+	{	
+		String LoginUserId =  LoginUserInfo.getLoginUserId();
+		model.addAttribute("LoginUserId",LoginUserId);
+		
+		String UserRole = LoginUserInfo.getUserRole();
+		model.addAttribute("UserRole", UserRole);
+		      
+		return "modules/cdwastecollect/lessoneton";
+	}
+	
+	
+	@GetMapping("/overallreport")
+	public String wasteCollectionReports(Model model)
+	{	 
+		String LoginUserId =  LoginUserInfo.getLoginUserId();
+		model.addAttribute("LoginUserId",LoginUserId);
+		
+		String UserRole = LoginUserInfo.getUserRole();
+		model.addAttribute("UserRole", UserRole);
+		return "modules/cdwastecollect/reports";
+	}
+	
+
+
+
+
+}
diff --git a/backend/cdwaste/service/OfficerService.java b/backend/cdwaste/service/OfficerService.java
new file mode 100644
index 0000000..9263538
--- /dev/null
+++ b/backend/cdwaste/service/OfficerService.java
@@ -0,0 +1,161 @@
+package in.gov.chennaicorporation.gccoffice.cdwaste.service;
+
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.client.RestTemplate;
+
+@Service
+public class OfficerService {
+	
+    @Autowired
+	private JdbcTemplate jdbcTemplate;
+    
+    @Autowired
+    private  RestTemplate restTemplate;
+    
+    @Autowired 
+    private SMSService smsService;
+	
+  @Autowired
+	public void setDataSourcemysql(@Qualifier("mysqlCDManagerSystemDataSource") DataSource dataSource) {		
+		this.jdbcTemplate = new JdbcTemplate(dataSource);	
+		}
+ 
+
+  @Transactional
+  public void saveRequestDetails(Map<String, Object> payload) {
+	    double actualWeight = Double.parseDouble(payload.get("actualWeight").toString());
+	    String paymentType = payload.get("paymentType").toString();
+		/*
+		 * double processingCharge =
+		 * Double.parseDouble(payload.get("processingCharge").toString()); double
+		 * wasteCharge = Double.parseDouble(payload.get("wasteCharge").toString());
+		 */
+	    
+	    double processingCharge = payload.get("processingCharge") != null
+	    	    ? Double.parseDouble(payload.get("processingCharge").toString())
+	    	    : 0.0;
+
+	    	double wasteCharge = payload.get("wasteCharge") != null
+	    	    ? Double.parseDouble(payload.get("wasteCharge").toString())
+	    	    : 0.0;
+	    double totalCharge = Double.parseDouble(payload.get("totalCharge").toString());
+	    String paymentMobNo = payload.get("paymentMobileNo") != null ? payload.get("paymentMobileNo").toString() : null;
+	    String refId = payload.get("refId") != null ? payload.get("refId").toString() : null;
+
+	    // ✅ Check if record exists
+	    String checkSql = "SELECT COUNT(*) FROM waste_collectors_request WHERE refid = ?";
+	    Integer count = jdbcTemplate.queryForObject(checkSql, new Object[]{refId}, Integer.class);
+
+	    if (count != null && count > 0) {
+	        // ✅ Update the existing record
+	        String updateSql = "UPDATE waste_collectors_request SET actual_weight = ?, payment_type = ?, processing_charge = ?, waste_collection_charge = ?, total_charge = ?, payment_mobile_no = ? WHERE refid = ?";
+	        jdbcTemplate.update(updateSql, actualWeight, paymentType, processingCharge, wasteCharge, totalCharge, paymentMobNo, refId);
+
+	        // ✅ Send WhatsApp message if payment type is 'generateLink' and mobile number is provided
+	        if ("generateLink".equalsIgnoreCase(paymentType) && paymentMobNo != null && !paymentMobNo.isBlank()) {
+	            sendWhatsappMessage(refId, actualWeight, totalCharge, paymentMobNo);
+	        }
+	    } else {
+	        throw new RuntimeException("No request found for Ref ID: " + refId);
+	    }
+	}
+
+
+  
+  public void sendWhatsappMessage(String refId, double actualWeight, double totalCharge, String mobileNumber) {
+	    try {
+	        String message = String.format(
+	            "Your request (Request ID: *%s*) has been processed. Please proceed with the payment.\n\nActual Weight: *%.0f kg*\nAmount Payable: *%.0f*",
+	            refId, actualWeight, totalCharge
+	        );
+
+	        String encodedMessage = URLEncoder.encode(message, StandardCharsets.UTF_8);
+	        String encodedHeader = URLEncoder.encode("C&D Waste Collection – Payment Request", StandardCharsets.UTF_8);
+	        String encodedFooter = URLEncoder.encode("Greater Chennai Corporation", StandardCharsets.UTF_8);
+
+	        String redirectUrlParam = URLEncoder.encode("dumpregistration/paymentform?requestId=" + refId, StandardCharsets.UTF_8);
+
+	        String apiUrl = "https://media.smsgupshup.com/GatewayAPI/rest?userid=2000233507" +
+	                        "&password=h2YjFNcJ" +
+	                        "&send_to=" + mobileNumber +
+	                        "&v=1.1&format=json&msg_type=TEXT&method=SENDMESSAGE" +
+	                        "&msg=" + encodedMessage +
+	                        "&isTemplate=true" +
+	                        "&header=" + encodedHeader +
+	                        "&footer=" + encodedFooter +
+	                        "&buttonUrlParam=" + redirectUrlParam;
+
+	        // Optional: log URL before hitting for debugging
+	        System.out.println("WhatsApp API URL: " + apiUrl);
+
+	        // Make API call
+	     //   restTemplate.getForObject(apiUrl, String.class);
+	        smsService.sendMsg(apiUrl);
+	    } catch (Exception e) {
+	        e.printStackTrace();
+	        // Optionally log or alert failure
+	    }
+	}
+
+
+  public List<Map<String, Object>> getAllRequestDetails(LocalDate fromDate, LocalDate toDate, String wastequantity, String zone) {
+      StringBuilder query = new StringBuilder(
+          "SELECT wcr.id, wcr.name, wcr.mobile_no, wcr.area, wcr.zone, qm.quantity, " +
+          "wtm.waste_type, dl.location, wcr.actual_weight, wcr.payment_status,wcr.waste_collection_charge, " +
+          "wcr.processing_charge, wcr.total_charge, DATE_FORMAT(wcr.cdate, '%d-%m-%Y') AS request_date, wcr.refid " +
+          "FROM waste_collectors_request wcr " +
+          "JOIN dumping_location dl ON wcr.dump_location_id = dl.id " +
+          "JOIN waste_type_master wtm ON wcr.waste_type_id = wtm.id " +
+          "JOIN quantity_master qm ON wcr.waste_quantity_id = qm.id " +
+          "WHERE wcr.cdate BETWEEN ? AND ?");
+
+      LocalDateTime fromDateTime = fromDate.atStartOfDay();
+      LocalDateTime toDateTime = toDate.atTime(LocalTime.MAX);
+
+      List<Object> params = new ArrayList<>();
+      params.add(fromDateTime);
+      params.add(toDateTime);
+
+      if (wastequantity != null && !wastequantity.isEmpty()) {
+          query.append(" AND qm.quantity = ?");
+          params.add(wastequantity);
+      }
+
+      if (zone != null && !zone.isEmpty()) {
+          query.append(" AND wcr.zone = ?");
+          params.add(zone);
+      }
+
+      return jdbcTemplate.queryForList(query.toString(), params.toArray());
+  }
+  
+  
+  
+  
+  public List<Map<String, Object>> getAllwastequantity() {
+      String sql = " SELECT id,quantity FROM quantity_master where is_active = 1 ";
+      return jdbcTemplate.queryForList(sql);
+  }
+
+  
+  public List<Map<String, Object>> getZonesList() {
+		String sql = " SELECT id,zone_name from zones where is_active = 1 ";
+		return jdbcTemplate.queryForList(sql);
+	}
+
+}
diff --git a/backend/cdwaste/service/SMSService.java b/backend/cdwaste/service/SMSService.java
new file mode 100644
index 0000000..a7e5a13
--- /dev/null
+++ b/backend/cdwaste/service/SMSService.java
@@ -0,0 +1,40 @@
+package in.gov.chennaicorporation.gccoffice.cdwaste.service;
+
+
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+@Service
+public class SMSService {
+    public String sendMsg(String msgUrl) {
+        System.out.println("Whatsapp URL :-"+msgUrl);
+
+        String response ="";
+        try{
+            HttpURLConnection connection =null;
+
+            URL url = new URL(msgUrl);
+            connection = (HttpURLConnection) url.openConnection();
+            connection.setRequestMethod("GET");
+
+            int responseCode = connection.getResponseCode();
+            response=responseCode+"";
+            System.out.println("Response Code: " + responseCode);
+
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
+        return response;
+    }
+    
+    public String sendSMS(String SMS_Url) {
+    	System.out.println("SMS URL:- "+ SMS_Url);
+        RestTemplate restTemplate = new RestTemplate();
+        String response =restTemplate.getForObject(SMS_Url,String.class);
+        return response;
+    }
+}
diff --git a/frontend/cdwastecollect/lessoneton.html b/frontend/cdwastecollect/lessoneton.html
new file mode 100644
index 0000000..5d8fd27
--- /dev/null
+++ b/frontend/cdwastecollect/lessoneton.html
@@ -0,0 +1,430 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head th:replace="~{fragments/modules/base/head :: head}">
+
+</head>
+<style> 
+ .required{
+	color: red;
+}
+.card-box {
+       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
+       	
+    }
+    
+@media (max-width: 768px) {
+    .card-box {
+        text-align: center;
+    }
+
+}
+
+	
+</style>
+<body>
+    <div class="wrapper">
+        <!-- Header -->
+        <header th:replace="~{fragments/modules/base/header :: header}"></header>
+
+        <div class="page-wrap">
+            <!-- Left Menu -->
+            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
+
+            <div class="main-content">
+                <div class="container-fluid">
+                    <div class="page-header">
+                        <div class="row align-items-end">
+                            <div class="col-lg-6">
+                                <div class="page-header-title">
+                                    <i class="fa fa-list-alt bg-blue"></i>
+                                    <div class="d-inline">
+                                        <h5>Less 1 Ton List</h5>
+                                        <span>C & N Manager System</span>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-lg-6">
+                                <nav class="breadcrumb-container" aria-label="breadcrumb">
+                                    <ol class="breadcrumb">
+                                        <li class="breadcrumb-item">
+                                            <a href="/gcc/index"><i class="ik ik-home"></i></a>
+                                        </li>
+                                        <li class="breadcrumb-item" aria-current="page">C & N Manager System</li>																		
+                                        <li class="breadcrumb-item active" aria-current="page">Less 1 Ton List</li>
+                                    </ol>
+                                </nav>
+                            </div>
+                        </div>
+                    </div>
+					
+	                <div class="row mt-4">
+	                	
+	                	<div class="col-md-12">
+                             <div class="card">
+                             	<div class="card-header">
+                             		<h3>Less 1 Ton List</h3>
+                             	</div>
+                             	
+<!--                           	<div class="row mt-3 ml-2">
+									    <div class="col-md-3">
+									    	<label for="startDate" class="form-label" style="font-size: medium;">From Date:</label>
+									        <input type="date" id="startDate" class="form-control" placeholder="Start Date" onclick="this.showPicker()">
+									    </div>
+									    <div class="col-md-3">
+									    	<label for="endDate" class="form-label" style="font-size: medium;">To Date:</label>
+									        <input type="date" id="endDate" class="form-control" placeholder="End Date" onclick="this.showPicker()">
+									    </div>
+									    <div class="col-md-3" style="margin-top: 30px;">
+									        <button id="searchBtn" class="btn btn-primary">Search</button>
+									        <button id="resetBtn" class="btn btn-secondary">Reset</button>
+									    </div>
+									</div> -->
+					   				
+					   				<div class="card-body">
+						
+                 							<table id="QaqcDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
+							                    <thead class="thead-dark">
+											      
+							                        <tr role="row">           
+					                            		<th class="text-center no-sort" style="text-align: center;">S.No</th>	
+					                            		<th class="text-center no-sort" style="text-align: center;">Reference ID</th>				                            
+							                            <th class="text-center no-sort" style="text-align: center;">Name</th>
+							                            <th class="text-center no-sort" style="text-align: center;">Request Date</th>
+							                            <th class="text-center no-sort" style="text-align: center;">Quantity</th>
+							                            <th class="text-center no-sort" style="text-align: center;">Mobile No</th>							                          
+							                            
+							                        </tr>
+							                    </thead>
+							                    <tbody>
+							                        
+							                    </tbody>
+							                </table>
+
+							 </div>
+                         </div> 
+					</div>	               	
+             						 					  
+			</div> 
+        </div>
+   
+  
+      </div>
+         <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
+</div>
+</div>
+
+<!-- Modal -->
+		<div class="modal fade" id="publicinfodetailsModal" tabindex="-1" role="dialog" aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
+			    <div class="modal-dialog modal-lg"  role="document">
+			        <div class="modal-content">
+			        
+			            <div class="modal-header">
+			            
+			                <h5 class="modal-title" id="detailsModalLabel">
+			                    Public Information (<span id="modalEmployeeCode"></span>)
+			                </h5>
+			                
+			                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+			                    <span aria-hidden="true">&times;</span>
+			                </button>
+			                
+			            </div>
+			            
+			            <div class="modal-body">
+			                <div class="row">
+			                    <!-- requester Name-->
+			                    <div class="col-md-6">
+			                        <label for="userName" class="form-label fw-bold">Name</label>
+			                        <input type="text" id="userName" class="form-control" readonly>
+			                    </div>
+			                    
+			
+			                    <!-- Phone Number -->
+			                    
+			                    <div class="col-md-6">
+			                        <label for="contactNumber" class="form-label fw-bold">Phone Number</label>
+			                        <input type="number" id="contactNumber" class="form-control" readonly>
+			                    </div>
+			
+			                    <!-- waste Selection -->
+			                    <div class="col-md-6">
+			                        <label for="wasteSelection" class="form-label fw-bold">Waste Selection</label>
+			                        <input type="text" id="wasteSelection" class="form-control" readonly>
+			                    </div>
+			
+			
+			                    <!-- vehicle Selection -->
+			                    <div class="col-md-6">
+			                        <label for="vehicleSelection" class="form-label fw-bold">Vehicle Selection </label>
+			                        <input type="text" id="vehicleSelection" class="form-control" readonly>
+			                    </div>
+			                    
+			                    <!-- Request Date -->
+			                    <div class="col-md-6">
+			                        <label for="requestDate" class="form-label fw-bold">Request Date </label>
+			                        <input type="text" id="requestDate" class="form-control" readonly>
+			                    </div>
+			                    
+			                    <!-- Zone -->
+			                    <div class="col-md-6">
+			                        <label for="zone" class="form-label fw-bold">Zone </label>
+			                        <input type="text" id="zone" class="form-control" readonly>
+			                    </div>
+			                    
+			                    <!-- Wards -->
+			                    <div class="col-md-6">
+			                        <label for="ward" class="form-label fw-bold">Ward </label>
+			                        <input type="text" id="ward" class="form-control" readonly>
+			                    </div>
+			                    
+			                    <!-- Waste Type -->
+			                    <div class="col-md-6">
+			                        <label for="wasteType" class="form-label fw-bold">Waste Type </label>
+			                        <input type="text" id="wasteType" class="form-control" readonly>
+			                    </div>
+			                    
+			                    <!-- Location -->
+			                    <div class="col-md-6">
+			                        <label for="location" class="form-label fw-bold">Location </label>
+			                        <input type="text" id="location" class="form-control" readonly>
+			                    </div>
+			                    
+			               
+						</div>
+				</div>
+				
+				<div class="modal-footer">
+				    <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+				</div>
+				
+
+			         </div>    
+			       </div>
+			    </div>
+
+
+	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
+
+    <script th:replace="~{fragments/modules/base/script :: script}"></script>
+        <!--  sweet alert -->
+	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+	
+
+	
+	<script type="text/javascript">	
+ 	 $(document).ready(function() {
+ 		 
+     	var table = $('#QaqcDatatable').DataTable({
+     		
+     		
+             dom: 'Bftip',
+             columnDefs: [
+                 { targets: 'no-sort', orderable: false }
+             ],
+             lengthMenu: [
+                 [50, 100, 200, 500, -1],
+                 ['50 rows', '100 rows', '200 rows', 'Show all']
+             ],
+             scrollY: '50vh',
+             fixedColumns: {
+                 left: 1,
+                 right: 1
+             },
+             buttons: [
+                 {
+                     extend: 'pageLength',
+                     className: 'btn btn-warning'
+                 },
+                 {
+                     title: 'Data export',
+                     extend: 'copyHtml5',
+                     text: 'Copy',
+                     className: 'btn btn-secondary',
+                     id: 'copyBtn'
+                 },
+                 {
+                     extend: 'excelHtml5',
+                     text: 'Excel',
+                     className: 'btn btn-secondary',
+                     id: 'excelBtn'
+                 },
+                 {
+                     extend: 'csvHtml5',
+                     text: 'CSV',
+                     className: 'btn btn-secondary',
+                     id: 'csvBtn'
+                 },
+                 {
+                     extend: 'pdfHtml5',
+                     text: 'PDF',
+                     className: 'btn btn-secondary',
+                     id: 'pdfBtn'
+                 }
+             ],
+             fixedHeader: true,
+             autoWidth: true,
+             responsive: true,
+             searching:true,
+             select: false,
+             processing: false
+         });
+
+     	
+     
+    	
+     	 // Initialize DataTable with export buttons
+		    const tableApiUrl = "/gcc/api/dumpregistration/getless1tonlist";
+     	 
+
+    // Fetch and Populate Table Data Function
+    
+     const fetchTableData = async (startDate = "", endDate = "") => {
+        try {
+            const params = new URLSearchParams();
+            if (startDate) params.append("startDate", startDate);
+            if (endDate) params.append("endDate", endDate);
+
+            const response = await fetch(`${tableApiUrl}?${params.toString()}`);
+            const tableData = await response.json();
+
+            // Update DataTable with new data
+            table.clear(); // Clear existing data
+            tableData.forEach((row, index) => {
+                table.row.add([
+                	
+                	`<div style="text-align: center;">${index + 1}</div>`,
+                	`<button  class="btn btn-success" data-ref_id="${row.refid}"  
+                	 onclick="fetchRequestDetails('${row.refid}')"  style="text-align: center;">${row.refid}</button>`,
+
+                    `<div style="text-align: center;">${row.name}</div>`,
+                    `<div style="text-align: center;">${row.request_date}</div>`,
+                    `<div style="text-align: center;">${row.quantity}</div>`,
+                    `<div style="text-align: center;">${row.mobile_no}</div>`,
+     
+                ]);
+                
+            });
+            table.draw(); // Redraw the DataTable with the updated data
+      
+        } catch (error) {
+            console.error("Error fetching table data:", error);
+        }
+           
+    };
+
+
+    // Example: Fetch Data initially without filters
+    fetchTableData();
+    
+
+ 
+ // ✅ This makes fetchRequestDetails globally available for the onclick
+    window.fetchRequestDetails = function (refId) {
+        console.log("refId", refId);
+
+        $.ajax({
+            url: '/gcc/api/dumpregistration/getless1tonlistbyId',
+            type: 'GET',
+            data: { refId: refId },
+            dataType: "json",
+            success: function (response) {
+                let details = null;
+
+                if (Array.isArray(response) && response.length > 0) {
+                    details = response[0];
+                } else if (response && typeof response === 'object') {
+                    details = response;
+                }
+
+                if (details) {
+                    $('#userName').val(details.name);
+                    $('#contactNumber').val(details.mobile_no);
+                    $('#wasteSelection').val(details.quantity);
+                    $('#vehicleSelection').val(details.vehicle_name);
+                    $('#requestDate').val(details.request_date);
+                    $('#zone').val(details.zone);
+                    $('#ward').val(details.ward);
+                    $('#wasteType').val(details.waste_type);
+                    $('#location').val(details.location);
+                    $('#modalEmployeeCode').text(details.refid);
+
+                    // ✅ Show the modal
+                    $('#publicinfodetailsModal').modal('show');
+                } else {
+                    Swal.fire({
+                        icon: 'info',
+                        title: 'No Data',
+                        text: 'No details found for the selected entry.',
+                        confirmButtonText: 'OK'
+                    });
+                }
+            },
+            error: function () {
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Error',
+                    text: 'Failed to fetch details. Please try again.',
+                    confirmButtonText: 'OK'
+                });
+            }
+        });
+    };
+
+
+
+/*     
+ // Event listener for From Date selection
+	   $("#startDate").on("change", function() {
+	       const startDate = $(this).val();  // Get the selected start date
+	       // Set the min value for To Date to be the selected From Date
+	       $("#endDate").attr("min", startDate);
+	   });
+
+	   // Event listener for To Date selection
+	   $("#endDate").on("change", function() {
+	       const endDate = $(this).val();  // Get the selected end date
+	       // Set the max value for From Date to be the selected To Date
+	       $("#startDate").attr("max", endDate);
+	   });
+
+		    // Search Button Click
+		   document.getElementById("searchBtn").addEventListener("click", () => {
+		    const startDate = document.getElementById("startDate").value;
+		    const endDate = document.getElementById("endDate").value;
+		
+		    //console.log("xsnskjx");
+		    console.log(startDate);
+		
+		    // Check if startDate or endDate is empty
+		    if (!startDate || !endDate) {
+		        Swal.fire({
+		            icon: "warning",
+		            title: "Incomplete Search",
+		            text: "Please select the Date Before searching",
+		            confirmButtonText: "OK",
+		        });
+		    } else {
+		        // Call fetchTableData if dates are provided
+		        fetchTableData(startDate, endDate);
+		    }
+		}); */
+
+		    // Reset Button Click
+		    document.getElementById("resetBtn").addEventListener("click", () => {
+		      
+ 		        window.location.reload();		        
+		    });
+
+
+            fetchTableData();
+		});
+ 	 
+
+	</script>
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/frontend/cdwastecollect/officer.html b/frontend/cdwastecollect/officer.html
new file mode 100644
index 0000000..bf0206a
--- /dev/null
+++ b/frontend/cdwastecollect/officer.html
@@ -0,0 +1,1122 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+
+<head th:replace="~{fragments/modules/base/head :: head}"></head>
+<style>
+
+/* .modal-body {
+    max-height: 70vh; 
+    overflow-y: auto; 
+    overflow-x: hidden; 
+    padding-right: 15px; 
+} */
+.request-box {
+	border: 1px solid #ddd;
+	background: white;
+	padding: 15px;
+	margin-bottom: 15px;
+	box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
+	width: 100%;
+}
+
+.request-info {
+	width: 100%;
+}
+
+table {
+	width: 100%;
+	border-collapse: collapse;
+	table-layout: fixed; /* Ensures equal column spacing */
+}
+
+td {
+	padding: 12px;
+	border: 1px solid #ddd;
+	text-align: left;
+	white-space: nowrap;
+}
+
+/* Ensure status button aligns with table width */
+.status-container {
+	display: flex;
+	justify-content: flex-end; /* Aligns button to the right */
+	padding: 10px;
+}
+
+.status-btn {
+	padding: 10px 20px;
+	border: none;
+	border-radius: 5px;
+	font-size: 14px;
+	cursor: pointer;
+	width: 150px;
+	text-align: center;
+}
+
+.pending {
+	background-color: #004085;
+	color: white;
+}
+
+.completed {
+	background-color: green;
+	color: white;
+}
+ 
+
+
+
+/* Make sure the container adjusts to screen size */
+@media ( min-width : 768px) {
+	.col-md-12 {
+		flex: 0 0 100%;
+		max-width: 100%;
+	}
+}
+
+td {
+  word-wrap: break-word;
+  white-space: normal;
+}
+</style>
+<body>
+
+	<!--[if lt IE 8]>
+            <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
+        <![endif]-->
+
+	<div class="wrapper">
+		<!-- header top menu Start -->
+		<header th:replace="~{fragments/modules/base/header :: header}"></header>
+		<!-- header top menu end -->
+
+		<div class="page-wrap">
+			<!--=============== Left Menu side Start ================-->
+			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
+			<!--=============== Left side End ================-->
+			<div class="main-content">
+				<div class="container-fluid">
+					<div class="page-header mb-2">
+						<div class="row align-items-end">
+							<div class="col-lg-8">
+								<div class="page-header-title">
+									<i class="fa fa-list-alt bg-blue"></i>
+									<div class="d-inline">
+										<h5>Officer</h5>
+										<span>C&D Management System</span>
+									</div>
+								</div>
+							</div>
+							<div class="col-lg-4">
+								<nav class="breadcrumb-container" aria-label="breadcrumb">
+									<ol class="breadcrumb">
+										<li class="breadcrumb-item"><a href="/gcc/index"><i
+												class="ik ik-home"></i></a></li>
+										<li class="breadcrumb-item" aria-current="page">C&D
+											Management System</li>
+										<li class="breadcrumb-item active" aria-current="page">Officer</li>
+									</ol>
+								</nav>
+							</div>
+						</div>
+					</div>
+					<h4 class="h4 text-right text-mute" style="font-size: 12px;">
+						Auto refresh in <font id="refresh-countdown">00</font> seconds
+					</h4>
+
+					<div class="row">
+
+						<div class="col-md-12">
+							<div class="card">
+
+								<div class="card-body">
+									<div class="page-header-title"
+										style="background-color: black; color: white; padding: 10px; border-radius: 5px;">
+										<h5 style="margin: 0; font-weight: bold;">Request
+											Information</h5>
+									</div>
+									<div class="container mt-5">
+										<div>
+											<h5 style="margin: 0; font-weight: bold;">Find the
+												Request Details</h5>
+											<hr>
+										</div>
+										<!-- Phone -->
+
+										<div class="row mb-3">
+											<div class="col-md-6">
+												<label class="form-label" for="searchInput">Mobile
+													No / Ref ID<span class="text-danger">*</span>
+												</label> <input type="text" id="searchInput" class="form-control"
+													placeholder="Enter Mobile No or Ref ID">
+											</div>
+
+											<div class="col-md-2 d-flex align-items-end">
+												<button class="btn btn-primary w-100" id="searchButton">Search</button>
+											</div>
+
+											<div class="col-md-2 d-flex align-items-end">
+												<button class="btn btn-secondary w-100" id="resetButton">Reset</button>
+											</div>
+										</div>
+
+									</div>
+								</div>
+							</div>
+						</div>
+
+						<div class="col-md-12" style="display: none;" id="infocard">
+							<div class="card">
+								<div class="card-block">
+									<div class="page-header-title"
+										style="background-color: black; color: white; padding: 10px; border-radius: 5px;">
+										<h5 style="margin: 0; font-weight: bold;">Public
+											Information</h5>
+										<hr>
+									</div>
+
+									<div class="container mt-5">
+										<!-- List of Array -->
+										<div class="row mb-3">
+											<div id="requestContainer"></div>
+										</div>
+
+									</div>
+								</div>
+							</div>
+
+						</div>
+
+					</div>
+
+
+				</div>
+
+			</div>
+
+			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
+
+		</div>
+	</div>
+
+	<!-- Modal -->
+	<div class="modal fade" id="returnretrieddetailsModal" tabindex="-1"
+		role="dialog" aria-labelledby="detailsModalLabel" aria-hidden="true"
+		data-bs-backdrop="static" data-bs-keyboard="false">
+		<div class="modal-dialog modal-lg" role="document">
+			<div class="modal-content">
+
+				<div class="modal-header">
+
+					<h5 class="modal-title" id="detailsModalLabel">
+						Public Information (<span id="modalEmployeeCode"></span>)
+					</h5>
+					
+					<input type="hidden" id="wastetypehidden">
+
+					<button type="button" class="close" data-bs-dismiss="modal"
+						aria-label="Close">
+						<span aria-hidden="true">&times;</span>
+					</button>
+
+				</div>
+
+				<div class="modal-body">
+					<div class="row">
+						<!-- requester Name-->
+						<div class="col-md-6">
+							<label for="publicName" class="form-label fw-bold">Name</label> <input
+								type="text" id="publicName" class="form-control" readonly>
+						</div>
+
+
+						<!-- Phone Number -->
+
+						<div class="col-md-6">
+							<label for="contactNumber" class="form-label fw-bold">Phone
+								Number</label> <input type="number" id="contactNumber"
+								class="form-control" readonly>
+						</div>
+
+						<!-- waste Selection -->
+						<div class="col-md-6">
+							<label for="wasteSelection" class="form-label fw-bold">Waste
+								Selection</label> <input type="text" id="wasteSelection"
+								class="form-control" readonly>
+						</div>
+
+
+						<!-- vehicle Selection -->
+						<div class="col-md-6">
+							<label for="vehicleSelection" class="form-label fw-bold">Vehicle
+								Selection </label> <input type="text" id="vehicleSelection"
+								class="form-control" readonly>
+						</div>
+
+					</div>
+
+
+					<!-- Left Side Form -->
+					<hr>
+					<div class="container">
+						<div class="row">
+							<!-- Left Side - Actual Weight -->
+							<div class="col-md-6">
+								<label for="actualWeight" class="form-label">Enter the
+									actual weight (In Kg) <span class="text-danger">*</span>
+								</label> <input type="number" class="form-control mb-2"
+									id="actualWeight" min="0" step="0.01" placeholder="Enter Here"
+									oninput="recalculateCharges()" />
+							</div>
+
+							<!-- Right Side - Payment Type -->
+							<div class="col-md-6">
+								<label class="form-label">Select the payment type <span
+									class="text-danger">*</span></label>
+								<div class="d-flex gap-2 mt-2">
+									<div
+										class="form-check flex-fill border rounded p-2 text-center">
+										<input class="form-check-input me-2" type="radio"
+											name="paymentType" id="generateLink" value="generateLink"
+											onchange="toggleMobileInput()"> <label
+											class="form-check-label" for="generateLink">Generate
+											link</label>
+									</div>
+									<div
+										class="form-check flex-fill border rounded p-2 text-center">
+										<input class="form-check-input me-2" type="radio"
+											name="paymentType" id="generateQR" value="generateQR"
+											onchange="toggleMobileInput()"> <label
+											class="form-check-label" for="generateQR">Generate QR
+											Code</label>
+									</div>
+								</div>
+
+								<!-- Mobile Number -->
+								<div class="col-md-6" id="mobileNumberContainer"
+									style="display: none;">
+									<label for="payment_mobile_no" class="form-label">Enter
+										Mobile Number <span class="text-danger">*</span>
+									</label> <input type="text" class="form-control" id="payment_mobile_no"
+										placeholder="Enter mobile number"
+										oninput="validatePhoneNumber(this)">
+								</div>
+								
+								
+							</div>
+
+						</div>
+						<!-- <div class="row"> -->
+						<!-- Payment Details Card -->
+						<div
+							class="col-md-6 mt-3 payment-details border rounded p-3 shadow-sm bg-light">
+
+							<h6>Payment Details</h6>
+							<hr />
+							<p id="processingCharges">
+								<strong>Processing Charges:</strong> Rs - <span
+									id="processingAmount"></span>
+							</p>
+							<p id="wasteCharges" style="display: none;">
+								<strong>Waste Collection Charges:</strong> Rs - <span
+									id="wasteAmount"></span>
+							</p>
+							<hr>
+							<p id="totalCharges" style="display: none;">
+								<strong>Total Charges:</strong> Rs - <span id="totalAmount"></span>
+							</p>
+
+						</div>
+
+						<!-- Buttons -->
+						<div class="col-md-12 text-center mt-4">
+							<button type="button" class="btn btn-primary me-3"
+								onclick="savePaymentDetailsFromModal()" id="submitbutton">Submit</button>
+							<button type="button" class="btn btn-outline-secondary"
+								data-bs-dismiss="modal">Cancel</button>
+						</div>
+						<!-- </div> -->
+					</div>
+
+				</div>
+
+
+			</div>
+		</div>
+	</div>
+
+	<!-- Modal box for Completed -->
+	<div class="modal fade" id="completeddetailsModal" tabindex="-1"
+		role="dialog" aria-labelledby="detailsModalLabel" aria-hidden="true"
+		data-bs-backdrop="static" data-bs-keyboard="false">
+		<div class="modal-dialog modal-lg" role="document">
+			<div class="modal-content">
+
+				<div class="modal-header">
+
+					<h5 class="modal-title" id="detailsModalLabel">
+						Public Information (<span id="modalEmployeeCodes"></span>)
+					</h5>
+
+					<button type="button" class="close" data-bs-dismiss="modal"
+						aria-label="Close">
+						<span aria-hidden="true">&times;</span>
+					</button>
+
+				</div>
+
+				<div class="modal-body">
+					<div class="row">
+						<!-- requester Name-->
+						<div class="col-md-6">
+							<label for="publicNames" class="form-label fw-bold">Name</label>
+							<input type="text" id="publicNames" class="form-control" readonly>
+						</div>
+
+
+						<!-- Phone Number -->
+
+						<div class="col-md-6">
+							<label for="contactNumbers" class="form-label fw-bold">Phone
+								Number</label> <input type="number" id="contactNumbers"
+								class="form-control" readonly>
+						</div>
+
+						<!-- waste Selection -->
+						<div class="col-md-6">
+							<label for="wasteSelections" class="form-label fw-bold">Waste
+								Selection</label> <input type="text" id="wasteSelections"
+								class="form-control" readonly>
+						</div>
+
+
+						<!-- vehicle Selection -->
+						<div class="col-md-6">
+							<label for="vehicleSelections" class="form-label fw-bold">Vehicle
+								Selection </label> <input type="text" id="vehicleSelections"
+								class="form-control" readonly>
+						</div>
+
+						<!-- Request Date -->
+						<div class="col-md-6">
+							<label for="requestDates" class="form-label fw-bold">Request
+								Date </label> <input type="text" id="requestDates" class="form-control"
+								readonly>
+						</div>
+					</div>
+
+					<!-- Left Side Form -->
+					<hr>
+					<div class="container">
+						<div class="row">
+							<!-- Left Side - Actual Weight -->
+							<div class="col-md-6">
+								<label for="completed_actualWeight" class="form-label">Enter the
+									actual weight (In ton) <span class="text-danger">*</span>
+								</label> <input type="number" class="form-control mb-2"
+									id="completed_actualWeight" placeholder="Enter Here"
+									oninput="recalculateCharges()" / readonly>
+							</div>
+
+							<!-- Right Side - Payment Type -->
+							<div class="col-md-6">
+								<label class="form-label">Select the payment type <span
+									class="text-danger">*</span></label>
+								<div class="d-flex gap-2 mt-2">
+									<div
+										class="form-check flex-fill border rounded p-2 text-center">
+										<input class="form-check-input me-2" type="radio"
+											name="paymentTypes" id="completed_generateLinks" readonly> <label
+											class="form-check-label" for="completed_generateLinks">Generate
+											link</label>
+									</div>
+									<div
+										class="form-check flex-fill border rounded p-2 text-center">
+										<input class="form-check-input me-2" type="radio"
+											name="paymentTypes" id="completed_generateQRs" readonly> <label
+											class="form-check-label" for="completed_generateQRs">Generate
+											QR Code</label>
+									</div>
+								</div>
+							</div>
+						</div>
+						<!-- Payment Details Card -->
+						<div
+							class="col-md-6 mt-3 payment-details border rounded p-3 shadow-sm bg-light">
+							<h6>Payment Details</h6>
+							<hr />
+							<p id="processingChargess">
+								<strong>Processing Charges:</strong> Rs - <span
+									id="processingAmounts"></span>
+							</p>
+							<p id="wasteChargess" style="display: none;">
+								<strong>Waste Collection Charges:</strong> Rs - <span
+									id="wasteAmounts"></span>
+							</p>
+							<p id="totalChargess" style="display: none;">
+								<strong>Total Charges:</strong> Rs - <span id="totalAmounts"></span>
+							</p>
+
+						</div>
+
+						<!-- Buttons -->
+						<div class="col-md-12 text-center mt-4">
+						
+						<button type="button" class="btn btn-primary me-3"
+						    onclick="downloadAcknowledgementViaAjax()" id="ACKDownloadbutton">
+						    Download Acknowledgement</button>
+							<button type="button" class="btn btn-outline-secondary"
+								data-bs-dismiss="modal">Cancel</button>
+						</div>
+						
+						
+					</div>
+
+				</div>
+
+			</div>
+		</div>
+	</div>
+
+	<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
+
+	<script th:replace="~{fragments/modules/base/script :: script}"></script>
+<!-- 	<script
+		src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script> -->
+	<script
+		src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script> 
+
+	<script type="text/javascript">
+        
+        
+        $(document).ready(function () {
+            // Initially hide the info card and request container
+            $("#requestContainer").hide();
+            $('#infocard').hide();
+            
+            function handleSearch() {
+                const inputValue = $("#searchInput").val().trim();
+
+                if (inputValue === "") {
+                    Swal.fire({
+                        icon: "warning",
+                        title: "Input Required",
+                        text: "Please enter a Mobile Number or Ref ID.",
+                        backdrop: true,
+                        allowOutsideClick: false
+                    });
+                    return;
+                }
+
+                // Determine if it's a mobile number (only digits, usually 10-digit) or refId
+                const isMobileNo = /^[6-9]\d{9}$/.test(inputValue);  // Basic mobile number check
+
+                const queryParams = {};
+                if (isMobileNo) {
+                    queryParams.mobileNo = inputValue;
+                } else {
+                    queryParams.refId = inputValue;
+                }
+
+                $.ajax({
+                    url: "/gcc/api/dumpregistration/wastecollectorlist",
+                    type: "GET",
+                    data: queryParams,
+                    dataType: "json",
+                    success: function (data) {
+                        console.log("registerdetails", data);
+                        if (Array.isArray(data) && data.length > 0) {
+                            renderRequests(data);
+                            $("#requestContainer").show();
+                            $("#infocard").show();
+                        } else {
+                            Swal.fire({
+                                icon: "warning",
+                                title: "No Data Found",
+                                text: "Mobile No or Refernce Id is  Not Availble",
+                                allowOutsideClick: false, // Disable clicking outside the modal to close it
+       		                    allowEscapeKey: false, // Disable escape key to close the modal
+       		                    allowEnterKey: false, // Disable enter key to close the modal	
+                            });
+                            $("#requestContainer").hide();
+                            $("#infocard").hide();
+                        }
+                    },
+                    error: function () {
+                        Swal.fire({
+                            icon: "error",
+                            title: "Server Error",
+                            text: "Failed to fetch data. Please try again later.",
+                            allowOutsideClick: false, // Disable clicking outside the modal to close it
+   		                    allowEscapeKey: false, // Disable escape key to close the modal
+   		                    allowEnterKey: false, // Disable enter key to close the modal	
+                        });
+                        $("#requestContainer").hide();
+                        $("#infocard").hide();
+                    }
+                });
+            }
+
+            // Button click
+            $("#searchButton").click(handleSearch);
+
+            // Enter key support
+            $("#searchInput").on("keydown", function (e) {
+                if (e.key === "Enter" || e.keyCode === 13) {
+                    handleSearch();
+                }
+            });
+
+            // Reset button
+            $("#resetButton").click(function () {
+                $("#searchInput").val("");
+                $("#requestContainer").hide();
+                $("#infocard").hide();
+            });
+
+            // Click Event for Search Button
+            $("#searchButton").click(handleSearch);
+
+            // Enter Key Event on Input Field
+            $("#phoneNumber").on("keydown", function (e) {
+                if (e.key === "Enter" || e.keyCode === 13) {
+                    handleSearch();
+                }
+            });
+
+            function renderRequests(data) {
+                const container = $("#requestContainer");
+                container.html(""); // Clear previous results
+
+                data.forEach(request => {
+                    const requestCard = `
+                        <div class="request-box mb-3 p-3 border rounded shadow-sm">
+                            <div class="request-info">
+                                
+                            <table class="table table-bordered" style="table-layout: fixed; width: 100%;">
+
+                                    <tr>
+                                        <td><strong>Reference ID :</strong> ${request.refid}</td>
+                                        <td><strong>Name :</strong> ${request.name}</td>
+                                    </tr>
+                                    <tr>
+                                        <td><strong>Zone :</strong> ${request.zone}</td>
+                                        <td><strong>Phone No :</strong> ${request.mobile_no}</td>
+                                    </tr>
+                                    <tr>
+                                   		 <td><strong>Quantity :</strong> ${request.quantity}</td>
+                                        <td><strong>Waste Type :</strong> ${request.waste_type}</td>
+                                    </tr>
+                                    <tr>
+                                   		 <td><strong>Request Date :</strong> ${request.request_date}</td>
+                                        <td><strong>Dump Location :</strong> ${request.location}</td>
+                                    </tr>
+                                    <tr>
+                                        <td><strong>Vehicle Selection :</strong> ${request.vehicle_name}</td>
+                                        <td><strong>Payment Status :</strong> ${request.payment_status}</td>
+                                    </tr>
+                                </table>
+                            </div>
+                            <div class="status-container text-end">
+                                <button class="btn btn-sm ${getStatusClass(request.payment_status)} status-btn" data-id="${request.refid}">
+                                    ${request.payment_status}
+                                </button>
+                            </div>
+                        </div>
+                    `;
+                    container.append(requestCard);
+                });
+            }
+
+            // Helper to assign status class based on payment status
+            function getStatusClass(status) {
+                switch (status.toUpperCase()) {
+                    case "COMPLETED": return "btn-success";
+                    case "PENDING": return "btn-warning";
+                    case "FAILED": return "btn-danger";
+                    default: return "btn-secondary";
+                }
+            }
+
+            // Reset Button Action
+            $("#resetButton").click(function () {
+                location.href = "/gcc/dumpregistration/officer";
+            });
+        });
+        
+        
+        
+        
+        
+        
+        $(document).ready(function () {
+
+            $(document).on('click', '.status-btn', function () {
+                const status = $(this).text().trim();
+                const refId = $(this).data("id");
+
+                if (status === "PENDING") {
+                    fetchRequestDetails(refId); // Show modal inside this
+                }
+                
+                if (status === "COMPLETED") {
+                	fetchCompletedRequestDetails(refId); // Show modal inside this
+                }
+            });
+
+            // Close buttons
+            $('.close, #back').click(function () {
+            	$('#completeddetailsModal').modal('hide');
+            });
+        });
+        
+        $('#returnretrieddetailsModal').on('show.bs.modal', function () {
+            $('#actualWeight').val(''); // Clear the value
+         // Clear text-based fields (charges display)
+            $('#processingAmount').text('');
+            $('#wasteAmount').text('');
+            $('#totalAmount').text('');
+
+            // Optionally hide the charges sections too (for fresh view)
+            $('#processingCharges').hide();
+            $('#wasteCharges').hide();
+            $('#totalCharges').hide();
+        });
+
+        
+        // charge of process and waste
+        function fetchRequestDetails(refId) {
+            console.log("refId", refId);
+
+            $.ajax({
+                url: '/gcc/api/dumpregistration/wastecollectorlist',
+                type: 'GET',
+                data: { refId: refId },
+                dataType: "json",
+                allowOutsideClick: false, // Disable clicking outside the modal to close it
+                allowEscapeKey: false, // Disable escape key to close the modal
+                allowEnterKey: false, // Disable enter key to close the modal
+                success: function (response) {
+                    if (response && response.length > 0) {
+                        const details = response[0];
+                        console.log("response:", details);
+                        
+                        console.log("details.waste_type.."+details.waste_type);
+
+                        $('#publicName').val(details.name);
+                        $('#contactNumber').val(details.mobile_no);
+                        $('#wasteSelection').val(details.quantity);
+                        $('#vehicleSelection').val(details.vehicle_name);
+                        $('#modalEmployeeCode').text(details.refid);
+                        $('#wastetypehidden').val(details.waste_type.trim());
+                        
+                        console.log("hidden waste type"+ $('#wastetypehidden').val().trim());
+
+                        // Fetch charges and calculate totals
+                        $.ajax({
+                            url: '/gcc/api/dumpregistration/getallcharges',
+                            type: 'GET',
+                            dataType: 'json',
+                            success: function (charges) {
+                                let processingRate = 0;
+                                let wasteRate = 0;
+                                let mixedWasteRate = 0;
+                                
+                                charges.forEach(charge => {
+                                    if (charge.amount_type === "Processing Charges per ton") {
+                                        processingRate = charge.amount;
+                                    } else if (charge.amount_type === "Waste Collection Charges per ton") {
+                                        wasteRate = charge.amount;
+                                    } else if (charge.amount_type === "Mixed Waste Charges per ton") {
+                                        mixedWasteRate = charge.amount;
+                                    }
+                                });
+
+                                const vehicleType = details.vehicle_id;
+                                const wasteType = details.waste_type; 
+                                const actualWeight = parseFloat($('#actualWeight').val() || 0); // Default to 0 if empty
+                                
+                                const processingTotal = (processingRate * actualWeight)/1000;
+                                const wasteTotal = (wasteRate * actualWeight)/1000;
+                                const totalAmount = (processingTotal + wasteTotal) ;
+                              
+                                
+                                
+                                if (wasteType === "Mixed Waste") {
+                                    const mixedWasteTotal = (mixedWasteRate * actualWeight) / 1000;
+
+                                    $('#processingCharges').hide(); // Hide processing
+                                    $('#wasteCharges').show(); // Show as waste
+                                    $('#wasteAmount').text(`${mixedWasteRate} x ${actualWeight} (/1000 In ton) = Rs ${mixedWasteTotal.toFixed(2)}`);
+                                    $('#totalAmount').text(`Rs ${mixedWasteTotal.toFixed(2)}`);
+                                    $('#totalCharges').show();
+                                    $('#returnretrieddetailsModal').modal('show');
+                                    return; // Exit early to skip rest of the logic
+                                }
+                                
+
+                                if (vehicleType === 4) {
+                                    $('#processingCharges').show();
+                                    $('#wasteCharges').show();
+                                    $('#processingAmount').text(`${processingRate} x ${actualWeight} (/1000 In ton) = Rs ${processingTotal.toFixed(2)}`);
+                                    $('#wasteAmount').text(`${wasteRate} x ${actualWeight} (/1000 In ton) = Rs ${wasteTotal.toFixed(2)}`);
+                                    $('#totalAmount').text(`Rs ${totalAmount.toFixed(2)}`);
+
+                                } else {
+                                    $('#processingCharges').show();
+                                    $('#wasteCharges').hide();
+                                    $('#processingAmount').text(`${processingRate} x ${actualWeight} (/1000 In ton) = Rs ${processingTotal.toFixed(2)}`);
+                                    $('#totalAmount').text(`Rs ${processingTotal.toFixed(2)}`);
+                                }
+
+                                $('#totalCharges').show(); // Make sure it's visible
+
+                                $('#returnretrieddetailsModal').modal('show');
+                            },
+                            error: function () {
+                                Swal.fire("Error", "Failed to fetch charge amounts.", "error");
+                            }
+                        });
+
+                    } else {
+                        Swal.fire({
+                            icon: 'info',
+                            title: 'No Data',
+                            text: 'No details found for the selected employee.',
+                            confirmButtonText: 'OK',
+                            allowOutsideClick: false, // Disable clicking outside the modal to close it
+   		                    allowEscapeKey: false, // Disable escape key to close the modal
+   		                    allowEnterKey: false, // Disable enter key to close the modal
+                        });
+                    }
+                },
+                error: function () {
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Error',
+                        text: 'Failed to fetch employee details. Please try again.',
+                        confirmButtonText: 'OK',
+                        allowOutsideClick: false, // Disable clicking outside the modal to close it
+	                    allowEscapeKey: false, // Disable escape key to close the modal
+	                    allowEnterKey: false, // Disable enter key to close the modal
+                    });
+                }
+            });
+        }
+        
+        
+        function recalculateCharges() {
+            const refId = $('#modalEmployeeCode').text();
+            if (refId) {
+                fetchRequestDetails(refId); // Recalculate with new weight
+            }
+        }
+        
+        
+        function savePaymentDetailsFromModal() {
+        	 const submitBtn = document.getElementById("submitbutton");
+        	    submitBtn.disabled = true; // Disable on first click
+        	
+            const refId = $("#modalEmployeeCode").text().trim();
+            if (!refId) {
+                Swal.fire("Error", "Reference ID missing. Cannot proceed.", "error");
+                return;
+            }
+            savePaymentDetails(refId);
+        }
+
+        
+        function toggleMobileInput() {
+            const selectedType = $("input[name='paymentType']:checked").val();
+            if (selectedType === "generateLink") {
+                $("#mobileNumberContainer").show();
+            } else {
+                $("#mobileNumberContainer").hide();
+                $("#payment_mobile_no").val(""); // Optional: clear input if not needed
+            }
+        }
+
+        
+        
+        $(document).ready(function () {
+            $("input[name='paymentType']").change(function () {
+                const selectedId = $(this).attr("id");
+
+                if (selectedId === "generateLink") {
+                    $("#mobileNumberContainer").show();
+                } else {
+                    $("#mobileNumberContainer").hide();
+                    $("#payment_mobile_no").val(""); // Clear mobile number if QR selected
+                }
+            });
+        });
+
+
+        function savePaymentDetails(refId) {
+        	
+            const submitBtn = document.getElementById("submitbutton");
+            const actualWeight = parseFloat($("#actualWeight").val());
+            const paymentType = $("input[name='paymentType']:checked").val(); 
+            const wasteType = $('#wastetypehidden').val(); // Read stored value
+            
+            console.log("wasteType",wasteType);
+
+            let paymentMobileNo = "";
+
+            const processingCharge = parseFloat(
+                ($("#processingAmount").text().split("Rs")[1] || "").trim()
+            );
+            const wasteChargeText = $("#wasteAmount").text();
+            const wasteCharge = wasteChargeText ? parseFloat((wasteChargeText.split("Rs")[1] || "").trim()) : 0;
+
+            const totalCharge = parseFloat(
+                ($("#totalAmount").text().split("Rs")[1] || "").trim()
+            );
+
+            if (isNaN(actualWeight) || actualWeight <= 0) {
+                Swal.fire("Invalid Weight", "Please enter a valid positive actual weight.", "warning");
+                submitBtn.disabled = false;
+               
+                return;
+            }
+
+            if (!paymentType) {
+                Swal.fire("Missing Payment Type", "Please select a payment type.", "warning");
+                submitBtn.disabled = false;
+                return;
+            }
+
+            if (paymentType === "generateLink") {
+                paymentMobileNo = $("#payment_mobile_no").val();
+                console.log("Input Value Raw:", document.getElementById("payment_mobile_no").value);
+                const mobileRegex = /^[6-9]\d{9}$/;
+
+                if (!mobileRegex.test(paymentMobileNo)) {
+                    Swal.fire("Invalid Mobile Number", "Please enter a valid 10-digit mobile number.", "warning");
+                    submitBtn.disabled = false;
+                    return;
+                }
+            }
+
+         // Modified validation for charges
+            if (wasteType != "Mixed Waste") {
+                if (isNaN(processingCharge) || isNaN(wasteCharge) || isNaN(totalCharge)) {
+                    Swal.fire("Missing Charges", "Processing or waste charges are missing.", "warning");
+                    submitBtn.disabled = false;
+                    return;
+                }
+            }
+
+            
+            submitBtn.disabled = true;
+            const payload = {
+                refId: refId, // should be a valid actual value, not ${request.refid}
+                actualWeight: actualWeight,
+                paymentType: paymentType,
+                paymentMobileNo: paymentMobileNo,
+                processingCharge: processingCharge,
+                wasteCharge: wasteCharge,
+                totalCharge: totalCharge
+            };
+
+            console.log("saved data ", payload);
+
+            fetch("/gcc/api/dumpregistration/saveWasteRequest", {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json"
+                },
+                body: JSON.stringify(payload)
+            })
+            .then(response => {
+                if (!response.ok) throw new Error("Network error");
+                return response.text();
+            })
+            .then(result => {
+		    Swal.fire({
+		        title: "Success",
+		        text: "Details saved successfully!",
+		        icon: "success",
+		        allowOutsideClick: false,
+		        allowEscapeKey: false,
+		        confirmButtonText: "OK"
+		    }).then(() => {
+		    	
+	            
+	            if (paymentType === "generateQR") {
+	                const url = `https://gccservices.in/dumpregistration/paymentform?requestId=${refId}`;
+	                //const url = `http://localhost:8077/dumpregistration/paymentform?requestId=${refId}`;
+	                window.open(url, '_blank');
+	            }
+	            location.reload();
+		    });
+		})
+
+            .catch(error => {
+                console.error("Save failed:", error);
+                Swal.fire("Error", "Something went wrong while saving!", "error");
+                submitBtn.disabled = false;
+            });
+        }
+
+
+        
+     	function validatePhoneNumber(input) {
+   		  // Remove any non-numeric characters using regex
+   		  input.value = input.value.replace(/[^0-9]/g, '');
+
+   		  // Limit the input to 10 digits
+   		  if (input.value.length > 10) {
+   		    input.value = input.value.slice(0, 10);
+   		  }
+   		}
+        
+        $("#actualWeight").on("input", function () {
+            if (this.value < 0) this.value = "";
+        });
+        
+        
+     // Handle submit button click
+        /* $(document).ready(function () {
+            $('#submitbutton').click(function () {
+                const refId = $('#modalEmployeeCode').text().trim();
+                if (!refId) {
+                    Swal.fire("Missing Reference ID", "Employee code is missing.", "warning");
+                    return;
+                }
+                savePaymentDetails(refId);
+            });
+        });  */
+     
+        function fetchCompletedRequestDetails(refId) {
+            console.log("refId", refId);
+
+            $.ajax({
+                url: '/gcc/api/dumpregistration/wastecollectorlist',
+                type: 'GET',
+                data: { refId: refId },
+                dataType: "json",
+                success: function (response) {
+                    if (response && response.length > 0) {
+                        const details = response[0];
+                        console.log("response:", details);
+
+                        $('#publicNames').val(details.name);
+                        $('#contactNumbers').val(details.mobile_no);
+                        $('#wasteSelections').val(details.quantity);
+                        $('#vehicleSelections').val(details.vehicle_name);
+                        $('#requestDates').val(details.request_date);
+                        $('#completed_actualWeight').val(details.actual_weight);
+                        $('#modalEmployeeCodes').text(details.refid);
+
+                        // ✅ Set refId to modal here
+                        $('#completeddetailsModal').data('refId', details.refid);
+                        $.ajax({
+                            url: '/gcc/api/dumpregistration/getallcharges',
+                            type: 'GET',
+                            dataType: 'json',
+                            success: function (charges) {
+                                let processingRate = 0;
+                                let wasteRate = 0;
+
+                                charges.forEach(charge => {
+                                    if (charge.amount_type === "Processing Charges per ton") {
+                                        processingRate = charge.amount;
+                                    } else if (charge.amount_type === "Waste Collection Charges per ton") {
+                                        wasteRate = charge.amount;
+                                    }
+                                });
+
+                                const vehicleType = details.vehicle_id;
+                                const actualWeight = parseFloat(details.actual_weight || 0);
+
+                                const processingTotal = (processingRate * actualWeight)/1000;
+                                const wasteTotal = (wasteRate * actualWeight)/1000;
+                                const totalAmount = processingTotal + wasteTotal;
+
+                                // Display the values
+                                $('#processingChargess').show();
+                                $('#processingAmounts').text(`${processingRate} x ${actualWeight} (/1000 In ton) = Rs ${processingTotal.toFixed(2)}`);
+
+                                if (vehicleType === 4) {
+                                    $('#wasteChargess').show();
+                                    $('#wasteAmounts').text(`${wasteRate} x ${actualWeight} (/1000 In ton) = Rs ${wasteTotal.toFixed(2)}`);
+                                    $('#totalChargess').show();
+                                    $('#totalAmounts').text(`Rs ${totalAmount.toFixed(2)}`);
+                                } else {
+                                    $('#wasteChargess').hide();
+                                    $('#totalChargess').show();
+                                    $('#totalAmounts').text(`Rs ${processingTotal.toFixed(2)}`);
+                                }
+                            },
+                            error: function () {
+                                Swal.fire("Error", "Failed to fetch charge amounts.", "error");
+                            }
+                        });
+
+                        // Set payment type radio as readonly and checked
+                        const paymentType = details.payment_type.toUpperCase();
+                        if (paymentType === 'GENERATELINK' || paymentType === 'LINK') {
+                            $('#completed_generateLinks').prop('checked', true).prop('disabled', true);
+                            $('#completed_generateQRs').prop('checked', false).prop('disabled', true);
+                        } else if (paymentType === 'GENERATEQR' || paymentType === 'QR') {
+                            $('#completed_generateQRs').prop('checked', true).prop('disabled', true);
+                            $('#completed_generateLinks').prop('checked', false).prop('disabled', true);
+                        }
+
+                        // Disable actual weight and hide action button if payment completed
+                        if (details.payment_status === 'COMPLETED') {
+                            $('#completed_actualWeight').prop('readonly', true);
+                            $('input[name="paymentType"]').prop('disabled', true);
+                            $('.btn.btn-outline-secondary').text('Close'); // Change Cancel to Close
+                        } else {
+                            $('#actualWeight').prop('readonly', false);
+                            $('input[name="paymentType"]').prop('disabled', false);
+                            $('.btn.btn-primary').show(); // Show Submit
+                            $('.btn.btn-outline-secondary').text('Cancel');
+                        }
+
+                        $('#completeddetailsModal').modal('show');
+                    } else {
+                        Swal.fire({
+                            icon: 'info',
+                            title: 'No Data',
+                            text: 'No details found for the selected employee.',
+                            confirmButtonText: 'OK'
+                        });
+                    }
+                },
+                error: function () {
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Error',
+                        text: 'Failed to fetch employee details. Please try again.',
+                        confirmButtonText: 'OK'
+                    });
+                }
+            });
+        }
+
+
+        
+        function downloadAcknowledgementViaAjax() {
+            const modal = $('#completeddetailsModal');
+            
+            // Retrieve the stored refId from the modal's data
+            const requestId = modal.data('refId');
+
+            console.log("Modal refId:", requestId); // ✅ Debugging
+
+            const link = document.createElement('a');
+           link.href = `https://gccservices.in/dumpregistration/paymentform?requestId=${requestId}`; // remove the `;` at the end
+           // link.href = `http://localhost:8077/dumpregistration/paymentform?requestId=${requestId}`; 
+            link.target = "_blank";
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link);
+        }
+
+        </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/frontend/cdwastecollect/reports.html b/frontend/cdwastecollect/reports.html
new file mode 100644
index 0000000..6e829bd
--- /dev/null
+++ b/frontend/cdwastecollect/reports.html
@@ -0,0 +1,411 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head th:replace="~{fragments/modules/base/head :: head}">
+
+</head>
+<style>
+
+</style>
+<body>
+	<div class="wrapper">
+
+		<!-- header top menu Start -->
+		<header th:replace="~{fragments/modules/base/header :: header}"></header>
+		<!-- header top menu end -->
+		<div class="page-wrap">
+			<!--=============== Left Menu side Start ================-->
+			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
+			<!--=============== Left side End ================-->
+
+
+			<div class="main-content">
+				<div class="container-fluid">
+					<div class="page-header mb-2">
+						<div class="row align-items-end">
+							<div class="col-lg-8">
+								<div class="page-header-title">
+									<i class="fa fa-list-alt bg-blue"></i>
+									<div class="d-inline">
+										<h5>Reports</h5>
+										<span>C&D Waste Collections Reports</span>
+									</div>
+								</div>
+							</div>
+							<div class="col-lg-4">
+								<nav class="breadcrumb-container" aria-label="breadcrumb">
+									<ol class="breadcrumb">
+										<li class="breadcrumb-item"><a href="/gcc/index"><i
+												class="ik ik-home"></i></a></li>
+										<li class="breadcrumb-item" aria-current="page">C&D Waste Collections Reports</li>
+										<li class="breadcrumb-item active" aria-current="page"> Reports</li>
+									</ol>
+								</nav>
+							</div>
+						</div>
+					</div>
+					
+					
+					<div class="row mt-4">
+						<div class="col-12">
+							<div class="card">
+								<div class="card-header">
+									<span style="font-size: medium;font-weight: bold;">Reports Filters</span>
+								</div>
+								<div class="card-body">
+									<div class="row">
+									
+									<div class="col-sm-2 mb-2">
+										<label for="startDate" class="form-label">From Date:<span class="text-danger">*</span></label>
+					                    <input type="date" id="startDate" class="form-control">
+									</div>
+										
+									<div class="col-sm-2 mb-2">
+										<label for="endDate" class="form-label" >To Date:<span class="text-danger">*</span></label>
+					                    <input type="date" id="endDate" class="form-control">
+									</div>
+										
+									<div class="col-sm-2 mb-2 ">
+										<label for="wastequantity" class="form-label">Select weight quantity<span class="text-danger">*</span>
+										</label> <select id="wastequantity" class="form-control">
+												
+											<!-- dynamically get the quantities -->
+										</select>
+									</div>
+						
+									<div class="col-sm-2 mb-2">
+										
+										<label for="zoneDropdown" class="form-label"> Select
+											Zone <span class="text-danger">*</span>
+										</label> <select id="zoneDropdown" class="form-control">
+											<option value="">Select Zone</option>
+											<!-- Zones will be loaded dynamically -->
+										</select>
+										
+									</div>
+				
+									<div class="row mt-4">
+										<div class="col-md-12 mb-2 d-flex justify-content-center">
+											<button type="submit" id="searchBtn" 
+												class="btn btn-primary mx-2">Search</button>
+
+											<button class="btn btn-danger mx-2" id="resetBtn" name="reset" type="button">Reset</button>
+
+										</div>
+									</div>
+									
+								</div>
+							</div>
+						</div>
+					</div>
+			
+			         <div class="col-md-12">
+							<div class="card">
+							<div class="card-header">
+								<span style="font-size: medium;font-weight: bold;">Reports List</span>
+							</div>
+							<div class="card-body">
+								<div class="table-responsive" >
+
+									<table id="ReportDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
+										<thead class="thead-dark">
+											<tr role="row">
+
+												<th class="text-center no-sort">S.No</th>
+												<th class="text-center">Request ID</th>
+												<th class="text-center">Request Date</th>
+												<th class="text-center">Name</th>
+												<th class="text-center">Mobile Number</th>
+												<th class="text-center">Area</th>
+												<th class="text-center">Zone</th>
+												<th class="text-center">Weight Quantity</th>
+												<th class="text-center">Waste Type</th>
+												<th class="text-center">Dumping Location</th>
+												<th class="text-center">Actual Weight</th>																														
+												<th class="text-center">Payment Status</th>
+												<th class="text-center">Total Amount</th>
+												
+												
+											</tr>
+										</thead>
+										<tbody>
+
+										</tbody>
+									</table>
+								</div>
+							</div>
+						 </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">Loading...</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>
+		</div>
+
+
+			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
+	
+	</div>
+</div>
+
+
+	<!-- in the code use to show the download different type microsoft -->
+
+	<!-- Include jQuery and Bootstrap JavaScript -->
+
+	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+
+	<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
+
+	<script th:replace="~{fragments/modules/base/script :: script}"></script>
+	<!--  sweet alert -->
+	<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+	<script type="text/javascript">
+	
+	
+	
+	 $(document).ready(function() {
+
+     	var table = $('#ReportDatatable').DataTable({
+             dom: 'Bftip',
+             columnDefs: [
+                 { targets: 'no-sort', orderable: false }
+             ],
+             lengthMenu: [
+                 [50, 100, 200, 500, -1],
+                 ['50 rows', '100 rows', '200 rows', 'Show all']
+             ],
+             scrollY: '80vh',
+             scrollX: true,
+             
+             buttons: [
+                 {
+                     extend: 'pageLength',
+                     className: 'btn btn-warning'
+                 },
+                 {
+                     title: 'Data export',
+                     extend: 'copyHtml5',
+                     text: 'Copy',
+                     className: 'btn btn-secondary',
+                     id: 'copyBtn'
+                 },
+                 {
+                     extend: 'excelHtml5',
+                     text: 'Excel',
+                     className: 'btn btn-secondary',
+                     id: 'excelBtn'
+                 },
+                 {
+                     extend: 'csvHtml5',
+                     text: 'CSV',
+                     className: 'btn btn-secondary',
+                     id: 'csvBtn'
+                 },
+                 {
+                     extend: 'pdfHtml5',
+                     text: 'PDF',
+                     className: 'btn btn-secondary',
+                     id: 'pdfBtn'
+                 }
+             ],
+             fixedHeader: true,
+             autoWidth: false,
+             scrollX: true, 
+             responsive: false,
+             paging:true,
+             searching: true,
+             select: false,
+             processing: false
+         });
+     	
+     // Event listener for From Date selection
+     
+     $(document).ready(function () {
+    const today = new Date();
+    const formattedToday = today.toISOString().split('T')[0];
+
+    // Get date 30 days ago
+    const pastDate = new Date();
+    pastDate.setDate(today.getDate() - 30);
+    const formattedPast = pastDate.toISOString().split('T')[0];
+
+    // Set default values and limits
+    $("#startDate").val(formattedPast);
+    $("#startDate").attr("max", formattedToday);
+    $("#endDate").val(formattedToday);
+    $("#endDate").attr("min", formattedPast);
+    $("#endDate").attr("max", formattedToday);
+
+    // Load quantities
+    $.ajax({
+        url: "/gcc/api/dumpregistration/getquantity",
+        type: "GET",
+        success: function (data) {
+            let quantityDropdown = $("#wastequantity");
+            quantityDropdown.empty().append("<option value=''>Select Quantity</option>");
+            $.each(data, function (index, item) {
+                quantityDropdown.append(`<option value="${item.quantity}">${item.quantity}</option>`);
+            });
+        },
+        error: function (xhr, status, error) {
+            console.error("Error fetching quantities:", error);
+        }
+    });
+
+    // Function to fetch and load data
+    function loadReportData() {
+        let startDate = $('#startDate').val();
+        let endDate = $('#endDate').val();
+        let zone = $('#zoneDropdown').val();
+        let wasteQuantity = $('#wastequantity').val();
+
+        const params = new URLSearchParams({
+            fromDate: startDate,
+            toDate: endDate
+        });
+
+        if (zone) {
+            params.append("zone", zone);
+        }
+
+        if (wasteQuantity) {
+            params.append("wastequantity", wasteQuantity);
+        }
+
+        $('#pageLoader').show();
+
+        $.ajax({
+            type: "GET",
+            url: `/gcc/api/dumpregistration/getAllDetails?${params.toString()}`,
+            contentType: "application/json",
+            success: function (response) {
+                $('#pageLoader').hide();
+
+                if (Array.isArray(response) && response.length > 0) {
+                    $('#ReportDatatable').DataTable({
+                    	destroy: true,
+                        searching: true,
+                        paging: true,
+                        info: true,
+                        autoWidth: true, // IMPORTANT: let you control column width
+                        scrollX: true,     // Enables horizontal scroll
+                        responsive: true, // Disable built-in responsive which hides columns
+                        data: response,
+                        columns: [
+                            { data: null, render: (data, type, row, meta) => meta.row + 1, className: 'text-center' },
+                            { data: 'refid', defaultContent: '-', className: 'text-center' },
+                            { data: 'request_date', defaultContent: '-', className: 'text-center' },
+                            { data: 'name', defaultContent: '-', className: 'text-center' },
+                            { data: 'mobile_no', defaultContent: '-', className: 'text-center' },
+                            { data: 'area', defaultContent: '-', className: 'text-center' },
+                            { data: 'zone', defaultContent: '-', className: 'text-center' },
+                            { data: 'quantity', defaultContent: '-', className: 'text-center' },
+                            { data: 'waste_type', defaultContent: '-', className: 'text-center' },
+                            { data: 'location', defaultContent: '-', className: 'text-center' },
+                            { data: 'actual_weight', defaultContent: '-', className: 'text-center' },
+                            { data: 'payment_status', defaultContent: '-', className: 'text-center' },
+                            { data: 'total_charge', defaultContent: '-', className: 'text-center' }
+                            
+                        ],
+                        dom: 'Bfrtip',
+                        buttons: [
+                            { extend: 'pageLength', className: 'btn btn-warning' },
+                            { extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary' },
+                            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
+                            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
+                            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
+                        ],
+                        columnDefs: [{ targets: 'no-sort', orderable: false }],
+                        lengthMenu: [
+                            [50, 100, 200, 500, -1],
+                            ['50 rows', '100 rows', '200 rows', 'Show all']
+                        ],
+                        scrollY: '80vh',
+                        scrollX: true,
+                        responsive: true
+                    });
+                } else {
+                    Swal.fire({
+                        icon: 'warning',
+                        title: 'No Data',
+                        text: 'No data available for the selected criteria.'
+                    });
+                }
+            },
+            error: function () {
+                $('#pageLoader').hide();
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Error',
+                    text: 'Something went wrong while fetching the data.'
+                });
+            }
+        });
+    }
+
+    // Bind search button to loadReportData
+    $('#searchBtn').on('click', function (e) {
+        e.preventDefault();
+
+        let startDate = $('#startDate').val();
+        let endDate = $('#endDate').val();
+
+        if (!startDate || !endDate) {
+            Swal.fire({
+                icon: 'warning',
+                title: 'Error',
+                text: 'Please Select Both From Date and To Date',
+                showConfirmButton: true,
+                timer: 3000
+            });
+            return;
+        }
+
+        loadReportData();
+    });
+
+    // Load data for the last 30 days on page load
+    loadReportData();
+});
+	
+});
+	 
+	 $('#resetBtn').click(function () {
+		    location.reload();
+		});
+
+
+	   
+	 // Load all zones
+	    $(document).ready(function () {
+	        $.ajax({
+	            url: '/gcc/api/dumpregistration/getzones',
+	            type: 'GET',
+	            success: function (zones) {
+	            	
+	  	                $.each(zones, function (index, zone) {
+	                    $('#zoneDropdown').append('<option value="' + zone.id + '">' + zone.zone_name + '</option>');
+	                });
+	            },
+	            error: function () {
+	                alert('Failed to load zones.');
+	            }
+	        });
+	    });
+	 
+	 
+	 
+	</script>
+
+</body>
+</html>
\ No newline at end of file