diff --git a/.DS_Store b/.DS_Store
index 7c63999..93e87c1 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/pom.xml b/pom.xml
index 4cdee00..36099c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,7 +130,7 @@
 	</dependencies>
 	
 <!-- Spring Cloud dependencies -->
-<!--
+   <!--
     <dependencyManagement>
         <dependencies>
             <dependency>
diff --git a/src/.DS_Store b/src/.DS_Store
index a56bd4c..3d88058 100644
Binary files a/src/.DS_Store and b/src/.DS_Store differ
diff --git a/src/main/.DS_Store b/src/main/.DS_Store
index 53fe4ec..51da7df 100644
Binary files a/src/main/.DS_Store and b/src/main/.DS_Store differ
diff --git a/src/main/java/.DS_Store b/src/main/java/.DS_Store
index 911bbd9..93d17d5 100644
Binary files a/src/main/java/.DS_Store and b/src/main/java/.DS_Store differ
diff --git a/src/main/java/in/.DS_Store b/src/main/java/in/.DS_Store
index 8c05ec3..1042b90 100644
Binary files a/src/main/java/in/.DS_Store and b/src/main/java/in/.DS_Store differ
diff --git a/src/main/java/in/gov/.DS_Store b/src/main/java/in/gov/.DS_Store
index f837ca3..4d1f422 100644
Binary files a/src/main/java/in/gov/.DS_Store and b/src/main/java/in/gov/.DS_Store differ
diff --git a/src/main/java/in/gov/chennaicorporation/.DS_Store b/src/main/java/in/gov/chennaicorporation/.DS_Store
index 5bc553a..f095c3e 100644
Binary files a/src/main/java/in/gov/chennaicorporation/.DS_Store and b/src/main/java/in/gov/chennaicorporation/.DS_Store differ
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/.DS_Store b/src/main/java/in/gov/chennaicorporation/gccoffice/.DS_Store
index 4fb5bef..651c30b 100644
Binary files a/src/main/java/in/gov/chennaicorporation/gccoffice/.DS_Store and b/src/main/java/in/gov/chennaicorporation/gccoffice/.DS_Store differ
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenter/service/CampaignReportService.java b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenter/service/CampaignReportService.java
index 36fde34..155d592 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenter/service/CampaignReportService.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenter/service/CampaignReportService.java
@@ -360,8 +360,8 @@ public class CampaignReportService {
 		      }
 
 		      // Fetch ordered fields data based on campaign_id, including data_id, agent_id, and call_status
-		      String query1 = "SELECT data_id, " + String.join(", ", fieldColumns) + ", agent_id, call_status,remarks " +
-		                      "FROM gcc_1913_campaign.upload_data WHERE campaign_id = ?";
+		      String query1 = "SELECT data_id, " + String.join(", ", fieldColumns) + ", agent_id, call_status,remarks,DATE(updated_date) as updated_date " +
+                      "FROM gcc_1913_campaign.upload_data WHERE campaign_id = ?";
 		      
 		      List<Map<String, Object>> orderedFieldsList = jdbcTemplate.queryForList(query1, campaignId);
 
@@ -464,6 +464,9 @@ public class CampaignReportService {
 		          String remarks = orderedFields.get("remarks") != null ? orderedFields.get("remarks").toString() : "-";
 		          finalMapping.put("Remarks", remarks);
 
+		          String up_date = orderedFields.get("updated_date") != null ? orderedFields.get("updated_date").toString() : "-";
+		          finalMapping.put("Updated_Date", up_date);
+		          
 		          resultList.add(finalMapping);
 		      }
 
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/.DS_Store b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/.DS_Store
index 8c23e3d..baa8a92 100644
Binary files a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/.DS_Store and b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/.DS_Store differ
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/ComplaintController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/ComplaintController.java
index e9b71f8..e87d869 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/ComplaintController.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/ComplaintController.java
@@ -625,7 +625,7 @@ public class ComplaintController {
 
 	        // 3. Construct external URL
 	        String externalUrl = String.format(
-	                "https://erp.chennaicorporation.gov.in/pgr/external/mobileservice?serviceId=getComplaintListWithImg" +
+	                "https://erp.chennaicorporation.gov.in/pgr/newmobileservice?serviceId=getComplaintListWithImg" +
 	                "&From_date=%s&To_date=%s&jsonResp=Yes&UserType=Public&Token=&PageIndex=null&Status=null&repYear=%d&MobileNo=%s",
 	                startDate, endDate, repYear, mobileNo
 	        );
@@ -669,5 +669,4 @@ public class ComplaintController {
 	    }
 	}
 
-
 }
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/FollowUpController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/FollowUpController.java
index 203dc5f..61ef3ff 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/FollowUpController.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/FollowUpController.java
@@ -1,10 +1,12 @@
 package in.gov.chennaicorporation.gccoffice.callcenterqaqc.controller;
 
+import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -73,5 +75,11 @@ public class FollowUpController {
 	        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Error");
 	    }
 	}
+	
+	@GetMapping("/getoffsubmittedcalls")
+	public List<Map<String, Object>> getFollowupSubmitDetails(@RequestParam int userId)
+	{
+		return followService.getFollowupSubmitDetails(userId);
+	}
 
 }
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/InprogresscallController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/InprogresscallController.java
index f356c9f..7077c28 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/InprogresscallController.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/InprogresscallController.java
@@ -86,5 +86,11 @@ public class InprogresscallController {
 	        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Error");
 	    }
 	}
+	
+	@GetMapping("/getinprogresssubmittedcalls")
+	public List<Map<String, Object>> getInprogressSubmitDetails(@RequestParam int userId)
+	{
+		return inprogresscallService.getInprogressSubmitDetails(userId);
+	}
 
 }
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/PublicFollowUpController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/PublicFollowUpController.java
index 2a68c04..57d1907 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/PublicFollowUpController.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/PublicFollowUpController.java
@@ -1,10 +1,12 @@
 package in.gov.chennaicorporation.gccoffice.callcenterqaqc.controller;
 
+import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -79,4 +81,9 @@ public class PublicFollowUpController {
 	    }
 	}
 
+	@GetMapping("/getpubsubmittedcalls")
+	public List<Map<String, Object>> getFollowupSubmitDetails(@RequestParam int userId)
+	{
+		return publicService.getFollowupSubmitDetails(userId);
+	}
 }
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/QaqcAPIController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/QaqcAPIController.java
index 87de00b..1e67a3b 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/QaqcAPIController.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/QaqcAPIController.java
@@ -77,7 +77,7 @@ public class QaqcAPIController {
         Map<String, Object> resultMap = new HashMap<>();
 
         try {
-            String url = "https://erp.chennaicorporation.gov.in/pgr/external/mobileservice?serviceId=getComplaintByID&ComplaintId=" 
+            String url = "https://erp.chennaicorporation.gov.in/pgr/newmobileservice?serviceId=getComplaintByID&ComplaintId=" 
                 + complaintNumber + "&imgUrlonly=yes";
             System.out.println("Request URL: " + url);
 
@@ -252,7 +252,7 @@ public class QaqcAPIController {
         String formattedFromDate = fromLocalDate.format(DateTimeFormatter.ofPattern("dd/MM/yyyy"));
         String formattedToDate = toLocalDate.format(DateTimeFormatter.ofPattern("dd/MM/yyyy"));
         
-        String url="https://erp.chennaicorporation.gov.in/pgr/external/mobileservice?serviceId=ms_dashboard_details&From_date="+formattedFromDate+"&To_date="+formattedToDate+"&jsonResp=Yes&Status="+status+"&isQcuser=Yes"+"&ComplaintType="+type+"&ComplaintGroupId="+group+"&compmode="+mode+"&Zoneid="+zone+"&RegionId="+region;
+        String url="https://erp.chennaicorporation.gov.in/pgr/newmobileservice?serviceId=ms_dashboard_details&From_date="+formattedFromDate+"&To_date="+formattedToDate+"&jsonResp=Yes&Status="+status+"&isQcuser=Yes"+"&ComplaintType="+type+"&ComplaintGroupId="+group+"&compmode="+mode+"&Zoneid="+zone+"&RegionId="+region;
 		System.out.println(url);
 		
 		RestTemplate restTemplate = new RestTemplate();
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/QaqcAdminSettingsController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/QaqcAdminSettingsController.java
deleted file mode 100644
index 7c7d3a5..0000000
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/QaqcAdminSettingsController.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package in.gov.chennaicorporation.gccoffice.callcenterqaqc.controller;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.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.callcenterqaqc.service.QaqcAdminSettingService;
-import in.gov.chennaicorporation.gccoffice.configuration.AppConfig;
-
-@RequestMapping("gcc/api/callcenterqaqc/adminsettings")
-@RestController
-public class QaqcAdminSettingsController {
-	
-	private final RestTemplate restTemplate;
-	private final AppConfig appConfig;
-	
-	
-	@Autowired  
-    public QaqcAdminSettingsController(RestTemplate restTemplate, AppConfig appConfig) {
-        this.restTemplate = restTemplate;
-        this.appConfig = appConfig;
-    }
-	
-	@Autowired
-	private QaqcAdminSettingService adminService;
-	
-	@PostMapping("/saveproductivity")
-	public ResponseEntity<Map<String, String>> saveproductivity(@RequestParam int productivity_count)
-	{
-		Map<String, String> response = new HashMap<>();
-		try {
-            
-            // Save task ID
-            int rowsInserted = adminService.saveProductivity(productivity_count);
-
-            if (rowsInserted > 0) {
-                response.put("status", "success");
-                response.put("message", "Productivity inserted successfully");
-                return ResponseEntity.ok(response);
-            }
-
-            response.put("status", "fail");
-            response.put("message", "Productivity not saved");
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response);  // Change to BAD_REQUEST for failure
-
-        }  catch (Exception e) {
-            // Logging the error
-            Logger.getLogger(getClass().getName()).log(Level.SEVERE, "Error saving task", e);
-            
-            response.put("status", "error");
-            response.put("message", "Failed to save productivity");
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
-        }
-	}
-	
-	
-	@PostMapping("/updateproductivity")
-	public ResponseEntity<Map<String, String>> updateProductivityById(@RequestBody Map<String, Integer> requestData)
-	{			Map<String, String> response = new HashMap<>();
-		try {
-            
-            // Save task ID
-	        int productivityCount = requestData.getOrDefault("productivity_count", 0); // Default to 0 if not provided
-	        int rowsUpdated = adminService.updateProductivity(productivityCount);
-
-	        
-            if (rowsUpdated > 0) {
-                response.put("status", "success");
-                response.put("message", "Productivity saved successfully");
-                return ResponseEntity.ok(response);
-            }
-
-            response.put("status", "fail");
-            response.put("message", "Productivity not saved");
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response);  // Change to BAD_REQUEST for failure
-
-        }  catch (Exception e) {
-            // Logging the error
-            Logger.getLogger(getClass().getName()).log(Level.SEVERE, "Error saving task", e);
-            
-            response.put("status", "error");
-            response.put("message", "Failed to save productivity");
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
-        }
-	}
-	
-	@GetMapping("/getproductivity")
-	public Integer getProductivity()
-	{
-		return adminService.getProductivity();
-	}
-	
-	@GetMapping("/getadminsettingcounts")
-	public List<Map<String, Object>> getadminsettingcounts()
-	{
-		return adminService.getAdminSettingCounts();
-				 
-	}
-	
-	@GetMapping("/assigncallingtype")
-	public List<Map<String, Object>> assigncallingtype()
-	{
-		return adminService.getAgentsForCallingtype();
-				 
-	}
-	
-	@PostMapping("/updateCallType") // Bulk update endpoint
-	public ResponseEntity<Map<String, String>> updateCallType(@RequestBody List<Map<String, Object>> selectedAgents) {
-					
-	    Map<String, String> response = new HashMap<>();
-
-	    try {
-	        int rowsUpdated = 0;
-	       
-	        // Loop through each selected agent and update their calling_type
-	        for (Map<String, Object> agent : selectedAgents) {
-	            String callingType = (String) agent.get("calling_type");
-
-	            // Parse agent_id to Integer if it's passed as a String
-	            int agentId = Integer.parseInt(agent.get("agent_id").toString());  // Ensure it's parsed as Integer
-
-	            // Update calling type for the agent
-	            rowsUpdated += adminService.updateCallType(callingType, agentId);
-	            
-	            
-	        }
-	        adminService.saveCallingTypeInSettings();
-
-	        if (rowsUpdated > 0) {
-	            response.put("status", "success");
-	            response.put("message", "Agents Assigned successfully");
-	            return ResponseEntity.ok(response);
-	        } else {
-	            response.put("status", "error");
-	            response.put("message", "No agents updated");
-	            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
-	        }
-	    } catch (Exception e) {
-	        response.put("status", "error");
-	        response.put("message", "Error occurred while updating calling types: " + e.getMessage());
-	        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
-	    }
-	}
-
-
-	
-}
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/QaqcCallsController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/QaqcCallsController.java
index 7e1c02b..f0e9627 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/QaqcCallsController.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/QaqcCallsController.java
@@ -126,7 +126,7 @@ public class QaqcCallsController {
 		Map<String, Object> resultMap = new HashMap<>();
 
 		try {
-			String url = "https://erp.chennaicorporation.gov.in/pgr/external/mobileservice?serviceId=getComplaintByID&ComplaintId="
+			String url = "https://erp.chennaicorporation.gov.in/pgr/newmobileservice?serviceId=getComplaintByID&ComplaintId="
 					+ complaintNumber + "&imgUrlonly=yes&isQcuser=Yes&jsonResp=Yes";
 			System.out.println("Request URL: " + url);
 
@@ -293,7 +293,7 @@ public class QaqcCallsController {
 //			System.out.println("Formatted Start Date: " + startDate);
 //			System.out.println("Formatted End Date: " + endDate);
 
-			String url = "https://erp.chennaicorporation.gov.in/pgr/external/mobileservice?serviceId=getComplaintListWithImg&From_date="
+			String url = "https://erp.chennaicorporation.gov.in/pgr/newmobileservice?serviceId=getComplaintListWithImg&From_date="
 					+ startDate + "&To_date=" + endDate
 					+ "&jsonResp=Yes&UserType=Public&Token=&PageIndex=null&Status=null&repYear=" + complaintYear
 					+ "&MobileNo=" + complaintMobileNumber;
@@ -389,6 +389,13 @@ public class QaqcCallsController {
 		return resultMap;
 	}
 
+	
+	@GetMapping("/getqcsubmittedcalls")
+	public List<Map<String, Object>> getSubmittedList(@RequestParam int userId)
+	{
+		return qaqcCallsService.getSubmitDetails(userId);
+	}
+	
 	/*
 	 * System.out.println("Computed Start Date: " + startDate);
 	 * System.out.println("Computed End Date: " + endDate);
@@ -396,7 +403,7 @@ public class QaqcCallsController {
 	 * System.out.println("Computed MobileNumber: " + complaintMobileNumber);
 	 * 
 	 * String url
-	 * ="https://erp.chennaicorporation.gov.in/pgr/external/mobileservice?serviceId=getComplaintListWithImg&From_date="
+	 * ="https://erp.chennaicorporation.gov.in/pgr/newmobileservice?serviceId=getComplaintListWithImg&From_date="
 	 * +startDate+"&To_date="+endDate+
 	 * "&jsonResp=Yes&UserType=Public&Token=&PageIndex=null&Status=null&repYear="+
 	 * complaintYear+"&MobileNo="+complaintMobileNumber;
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/QaqcPgrComplaintsMainController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/QaqcPgrComplaintsMainController.java
index bdeb694..cce6bdc 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/QaqcPgrComplaintsMainController.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/QaqcPgrComplaintsMainController.java
@@ -1,25 +1,37 @@
 package in.gov.chennaicorporation.gccoffice.callcenterqaqc.controller;
 
+import java.util.List;
+import java.util.Map;
+
+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 in.gov.chennaicorporation.gccoffice.callcenterqaqc.service.QaqcAgentsService;
 import in.gov.chennaicorporation.gccoffice.service.LoginUserInfo;
 
 @RequestMapping("/gcc/callcenterqaqccomplaintsregistration") 
 @Controller("callCenterQaQcComplaintsRegistrationController")
 public class QaqcPgrComplaintsMainController {
 	
+	@Autowired
+	private QaqcAgentsService agentsService;
+	
 	@GetMapping("/pgrcomplaint")
 	public String viewPGRpage(Model model) {
 		String loginUserId = LoginUserInfo.getLoginUserId();
 	    int userId = Integer.parseInt(loginUserId);
 	    
 	    model.addAttribute("LoginUserId", loginUserId);
+	    model.addAttribute("userId",userId);
 	    model.addAttribute("agent_name", LoginUserInfo.getCurrentUserDetails().getUsername());
 	    model.addAttribute("UserRole", LoginUserInfo.getUserRole());
 	    
+	    List<Map<String, Object>> agent=agentsService.getAgentName(userId);
+	    model.addAttribute("agent", agent);
+	    
 	    return "modules/callcenterqaqc/pgrcomplaints";
 	}
 
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/SocialMediaApiController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/SocialMediaApiController.java
index d746efb..8f5c962 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/SocialMediaApiController.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/SocialMediaApiController.java
@@ -101,7 +101,7 @@ public class SocialMediaApiController {
 		Map<String, Object> resultMap = new HashMap<>();
 
         try {
-            String url = "https://erp.chennaicorporation.gov.in/pgr/external/mobileservice?serviceId=getComplaintByID&ComplaintId=" 
+            String url = "https://erp.chennaicorporation.gov.in/pgr/newmobileservice?serviceId=getComplaintByID&ComplaintId=" 
                 + complaintNumber + "&imgUrlonly=yes";
             System.out.println("Request URL: " + url);
 
@@ -251,7 +251,8 @@ public class SocialMediaApiController {
             @RequestParam String status,
             @RequestParam String group,
             @RequestParam String type,          
-            @RequestParam String zone) {
+            @RequestParam String zone,
+            @RequestParam String region) {
 		Map<String, Object> response = new HashMap<>();
 
 		try {
@@ -265,10 +266,12 @@ public class SocialMediaApiController {
         
         String encoded_mode=URLEncoder.encode(mode, StandardCharsets.UTF_8.toString()).replace("+", "%20");
         
-        //String url="https://erp.chennaicorporation.gov.in/pgr/external/mobileservice?serviceId=ms_dashboard_details&From_date="+formattedFromDate+"&To_date="+formattedToDate+"&jsonResp=Yes&Status="+status+"&isQcuser=Yes"+"&ComplaintType="+type+"&ComplaintGroupId="+group+"&compmode="+encoded_mode+"&Zoneid="+zone;
+        //String url="https://erp.chennaicorporation.gov.in/pgr/newmobileservice?serviceId=ms_dashboard_details&From_date="+formattedFromDate+"&To_date="+formattedToDate+"&jsonResp=Yes&Status="+status+"&isQcuser=Yes"+"&ComplaintType="+type+"&ComplaintGroupId="+group+"&compmode="+encoded_mode+"&Zoneid="+zone;
         
-        String url="https://erp.chennaicorporation.gov.in/pgr/external/mobileservice?serviceId=ms_dashboard_details&From_date="+formattedFromDate+"&To_date="+formattedToDate+"&jsonResp=Yes&Status="+status+"&isQcuser=Yes"+"&ComplaintType="+type+"&ComplaintGroupId="+group+"&compmode="+mode+"&Zoneid="+zone;
+        //String url="https://erp.chennaicorporation.gov.in/pgr/newmobileservice?serviceId=ms_dashboard_details&From_date="+formattedFromDate+"&To_date="+formattedToDate+"&jsonResp=Yes&Status="+status+"&isQcuser=Yes"+"&ComplaintType="+type+"&ComplaintGroupId="+group+"&compmode="+mode+"&Zoneid="+zone;
 
+        String url="https://erp.chennaicorporation.gov.in/pgr/newmobileservice?serviceId=ms_dashboard_details&From_date="+formattedFromDate+"&To_date="+formattedToDate+"&jsonResp=Yes&Status="+status+"&isQcuser=Yes"+"&ComplaintType="+type+"&ComplaintGroupId="+group+"&compmode="+mode+"&Zoneid="+zone+"&RegionId="+region;
+        
 		System.out.println(url);
 		
 		RestTemplate restTemplate = new RestTemplate();
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/SocialMediaController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/SocialMediaController.java
deleted file mode 100644
index c0792c9..0000000
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/controller/SocialMediaController.java
+++ /dev/null
@@ -1,346 +0,0 @@
-package in.gov.chennaicorporation.gccoffice.callcenterqaqc.controller;
-
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeParseException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.client.RestTemplate;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import in.gov.chennaicorporation.gccoffice.callcenterqaqc.service.SocialMediaService;
-import in.gov.chennaicorporation.gccoffice.configuration.AppConfig;
-
-@RequestMapping("gcc/api/callcenterqaqc/socialmedia")
-@RestController
-public class SocialMediaController {
-
-	private final RestTemplate restTemplate;
-	private final AppConfig appConfig;
-	
-	@Autowired
-	public SocialMediaService socialservice;
-	
-	@Autowired  
-    public SocialMediaController(RestTemplate restTemplate, AppConfig appConfig) {
-        this.restTemplate = restTemplate;
-        this.appConfig = appConfig;
-    }
-	
-	@PostMapping("/update")
-	@ResponseBody
-	public ResponseEntity<String> updateCallDetails(@RequestParam("complaintNumber") String complaintNumber,			
-			@RequestParam("userId") String userId,@RequestParam("action") String action,@RequestParam("remarks") String remarks
-			) {
-		try {
-			System.out.println("Updating Complaint Number: " + complaintNumber);
-			System.out.println("userId= " + userId);
-			System.out.println("action= " + action);
-			System.out.println("remarks="+remarks);
-			int updated_agent = Integer.parseInt(userId);
-			System.out.println("updated_agent: " + updated_agent);
-			if(remarks.isEmpty())
-			{
-				remarks="N/A";
-			}
-			
-			String erp_name=socialservice.getErpusernamebyId(userId);			
-			if (erp_name.isEmpty()) {
-				return ResponseEntity.ok("erpname");
-			}
-			
-			if ("COMPLETED".equals(action) || "REOPEN".equals(action))
-			{	
-				boolean statusUpdated =ChangeStatusInErp(complaintNumber,action,remarks,erp_name);
-				System.out.println("statusUpdated="+statusUpdated); 
-				
-				if (!statusUpdated)
-				{
-					return ResponseEntity.ok("error");
-				} 
-			}
-			Map<String, Object> details =getDetailsByComplaintNumber(complaintNumber);
-			int rowInserted=socialservice.uploadComplaintDetailsInLogs(details,action,remarks,updated_agent);
-			if(rowInserted!=1)
-			{
-				return ResponseEntity.ok("save");
-			}	
-			return ResponseEntity.ok("Success");
-		} catch (Exception e) {
-			e.printStackTrace();
-			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Error");
-		}
-	}
-	
-	public  Map<String, Object> getDetailsByComplaintNumber(String complaintNumber) {
-		
-		Map<String, Object> resultMap = new HashMap<>();
-
-        try {
-            String url = "https://erp.chennaicorporation.gov.in/pgr/external/mobileservice?serviceId=getComplaintByID&ComplaintId=" 
-                + complaintNumber + "&imgUrlonly=yes";
-            System.out.println("Request URL: " + url);
-
-            ResponseEntity<String> responseEntity = restTemplate.getForEntity(url, String.class);
-
-            if (responseEntity.getStatusCode().is2xxSuccessful()) {
-                String responseBody = responseEntity.getBody();
-                System.out.println("Response Body: " + responseBody);
-
-                ObjectMapper mapper = new ObjectMapper();
-                JsonNode rootNode = mapper.readTree(responseBody);
-
-                JsonNode complaintDetails = rootNode.path(0).path("ComplaintListHistory").path(0);
-                
-                String registerDate=complaintDetails.path("complaintopendate").asText("N/A");
-                System.out.println("registerdate====="+registerDate);
-                
-                String formattedDate = "N/A"; // Default value if parsing fails
-
-                if (!registerDate.equals("N/A") && !registerDate.isEmpty()) {
-                    try {
-                        // Parse the input date string
-                        SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S");
-                        Date date = inputFormat.parse(registerDate);
-
-                        // Format the date to dd-MM-yyyy
-                        SimpleDateFormat outputFormat = new SimpleDateFormat("dd-MM-yyyy");
-                        formattedDate = outputFormat.format(date);
-                    } catch (Exception e) {
-                        e.printStackTrace(); // Log exception for debugging
-                    }
-                }
-
-                if (!complaintDetails.isMissingNode()) {
-                    // Existing fields
-                    resultMap.put("complaintid", complaintDetails.path("complaintid").asText("N/A"));
-                    resultMap.put("complaintdate", formattedDate);
-                    resultMap.put("complainantName", complaintDetails.path("CustomerName").asText("N/A"));
-                    resultMap.put("mobileNumber", complaintDetails.path("CustomerMobile").asText("N/A"));
-                    resultMap.put("complaintType", complaintDetails.path("complainttype").asText("N/A"));
-                    resultMap.put("description", complaintDetails.path("complaintdetails").asText("N/A"));
-                    resultMap.put("currentStatus", complaintDetails.path("complaintcurrentstatus").asText("N/A"));
-                    resultMap.put("Street", complaintDetails.path("Street").asText("N/A"));
-                    resultMap.put("Area", complaintDetails.path("Area").asText("N/A"));
-                    resultMap.put("Landmark", complaintDetails.path("Landmark").asText("N/A"));
-                    resultMap.put("Location", complaintDetails.path("Location").asText("N/A"));
-                    resultMap.put("Zone", complaintDetails.path("Zone").asText("N/A"));
-                    resultMap.put("Division", complaintDetails.path("Division").asText("N/A"));
-                    resultMap.put("OfficialMobile", complaintDetails.path("OfficialMobile").asText("N/A"));
-                    resultMap.put("gender", complaintDetails.path("GENDER").asText("N/A"));
-                    resultMap.put("deptname",complaintDetails.path("DEPT_NAME").asText("N/A"));
-                    resultMap.put("compmode", complaintDetails.path("COMP_MODE").asText("N/A"));
-                    resultMap.put("Officialname", complaintDetails.path("Officialname").asText("N/A"));
-
-                 
-                }
-            } else {
-                resultMap.put("error", "Failed to retrieve complaint details.");
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            resultMap.put("error", "Error processing request");
-        }
-
-        return resultMap;
-    }
-
-	
-	public boolean ChangeStatusInErp(String complaintNumber,String action ,String remarks,String erp_name) {
-	    String baseUrl = "https://erp.chennaicorporation.gov.in/pgr/external/mobileservice?";
-	    String status = "";
-	    
-	   	    	 	       
-	   //String Erpname ="QAops1";
-	  
-	    try {
-	        // Encode parameters
-	        String encodedComplaintNumber = URLEncoder.encode(complaintNumber, StandardCharsets.UTF_8.toString()).replace("+", "%20");
-	        String encodedRemarks = URLEncoder.encode(remarks, StandardCharsets.UTF_8.toString()).replace("+", "%20");
-	        String encodedErpname = URLEncoder.encode(erp_name, StandardCharsets.UTF_8.toString()).replace("+", "%20");
-	        
-	     // Determine status based on action
-	        if ("COMPLETED".equals(action)) {
-	            status = "11";
-	        } else if ("REOPEN".equals(action)) {	        	
-	            status = "9";
-	        } else {
-	            return false; // Invalid action, return false
-	        }
-
-	        // Construct the URL
-	        String urlString = baseUrl
-	                + "serviceId=UpdateComplaint"
-	                + "&ComplaintId=" + encodedComplaintNumber
-	                + "&Message=" + encodedRemarks
-	                + "&UserType=Official"
-	                + "&Status=" + status
-	                + "&Comp_Image="
-	                + "&erp_username=" + encodedErpname;
-
-	        System.out.println("ERP Hitting URL="+urlString);
-
-	        // Send the request
-	        return sendRequest(urlString);
-	       // return true;
-	    } catch (Exception e) {
-	        e.printStackTrace();
-	        return false;
-	    }
-	}
-
-
-	private boolean sendRequest(String urlString) {
-	    try {
-	        URL url = new URL(urlString);
-	        URLConnection urlcon = url.openConnection();
-	        InputStream stream = urlcon.getInputStream();
-	        StringBuilder responseBuilder = new StringBuilder();
-	        int i;
-	        while ((i = stream.read()) != -1) {
-	            responseBuilder.append((char) i);
-	        }
-	        stream.close();
-
-	        // Parse the response
-	        String response = responseBuilder.toString();
-	        System.out.println("Raw Response: " + response);
-
-	        // Check ResultStatus in the response
-	        if (response.contains("\"ResultStatus\": true")) {
-	            System.out.println("ResultStatus is true in the response.");
-	            return true;
-	        } else {
-	            System.out.println("ResultStatus is false or not present in the response.");
-	            return false;
-	        }
-	    } catch (Exception e) {
-	        e.printStackTrace();
-	        return false;
-	    }
-	}
-	
-	@GetMapping("/getsocialmediacomps")
-    public Map<String, Object> viewSocialMediaData(
-            @RequestParam String startDate,
-            @RequestParam String endDate,
-            @RequestParam String status,
-            @RequestParam String group,
-            @RequestParam String type,          
-            @RequestParam String zone) {
-		Map<String, Object> response = new HashMap<>();
-
-		try {
-			
-        LocalDate fromLocalDate = LocalDate.parse(startDate, DateTimeFormatter.ISO_DATE);
-        LocalDate toLocalDate = LocalDate.parse(endDate, DateTimeFormatter.ISO_DATE);
-        String formattedFromDate = fromLocalDate.format(DateTimeFormatter.ofPattern("dd/MM/yyyy"));
-        String formattedToDate = toLocalDate.format(DateTimeFormatter.ofPattern("dd/MM/yyyy"));
-        
-        String mode="SOCIAL MEDIA";
-        
-        String encoded_mode=URLEncoder.encode(mode, StandardCharsets.UTF_8.toString()).replace("+", "%20");
-        
-        //String url="https://erp.chennaicorporation.gov.in/pgr/external/mobileservice?serviceId=ms_dashboard_details&From_date="+formattedFromDate+"&To_date="+formattedToDate+"&jsonResp=Yes&Status="+status+"&isQcuser=Yes"+"&ComplaintType="+type+"&ComplaintGroupId="+group+"&compmode="+encoded_mode+"&Zoneid="+zone;
-        
-        String url="https://erp.chennaicorporation.gov.in/pgr/external/mobileservice?serviceId=ms_dashboard_details&From_date="+formattedFromDate+"&To_date="+formattedToDate+"&jsonResp=Yes&Status="+status+"&isQcuser=Yes"+"&ComplaintType="+type+"&ComplaintGroupId="+group+"&compmode="+mode+"&Zoneid="+zone;
-
-		System.out.println(url);
-		
-		RestTemplate restTemplate = new RestTemplate();
-
-		// Fetch response as String
-		ResponseEntity<String> responses = restTemplate.getForEntity(url, String.class);
-		String rawResponse = responses.getBody();
-
-		// Preprocess response to remove invalid characters if needed
-		if (rawResponse != null) {
-			//rawResponse = rawResponse.replaceAll("\"\"", "\""); // Replace double-double quotes
-			//rawResponse = rawResponse.replaceAll("(?<![,{])\"R", "\"R"); // Example: Fix missing commas
-		}
-		ObjectMapper objectMapper = new ObjectMapper();
-		Map<String, Object> responseMap = objectMapper.readValue(rawResponse, Map.class);
-		List<Map<String, Object>> details = (List<Map<String, Object>>) responseMap.get("Details");
-        //System.out.println(details);
-        if (details == null) {
-        	response.put("status", "nodata");
-            response.put("message", "No Data, please change criteria");
-        }
-        else {
-        	response.put("status", "success");
-            response.put("details", details);
-        }
-        
-		}
-		catch (Exception e) {
-			response.put("status", "error");
-	        response.put("message", "An error occurred while fetching data.");
-	        e.printStackTrace();
-		}
-        
-        return response;
-    }
-	
-	@GetMapping("/socialmediacompletedlist")
-    public Map<String, Object> viewSocialMediaCompletedData(
-            @RequestParam String startDate,
-            @RequestParam String endDate,  @RequestParam String status,                 
-            @RequestParam String zone) {
-		
-		System.out.printf("==================="+startDate,endDate,zone);
-		Map<String, Object> response = new HashMap<>();
-
-		try {
-			
-        LocalDate fromLocalDate = LocalDate.parse(startDate, DateTimeFormatter.ISO_DATE);
-        LocalDate toLocalDate = LocalDate.parse(endDate, DateTimeFormatter.ISO_DATE);
-        String formattedFromDate = fromLocalDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-        String formattedToDate = toLocalDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-        
-        List<Map<String, Object>> details= socialservice.getdetails(formattedFromDate,formattedToDate,status,zone);
-        if(details==null)
-        {
-        	response.put("status", "nodata");
-	        response.put("message", "No data for Selected filter");
-        }
-        else {
-        	response.put("status", "success");
-        	response.put("details", details);
-        }
-		}
-		catch (DateTimeParseException e) {
-	        response.put("status", "error");
-	        response.put("message", "Invalid date format. Please use 'yyyy-MM-dd'.");
-	        e.printStackTrace();
-	    }
-		catch (Exception e) {
-			response.put("status", "error");
-	        response.put("message", "An error occurred while fetching data.");
-	        e.printStackTrace();
-		}
-        
-        return response;
-    }
-	
-}
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/service/ComplaintService.java b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/service/ComplaintService.java
index 4574f24..1f0299d 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/service/ComplaintService.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/service/ComplaintService.java
@@ -8,15 +8,30 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
+import javax.sql.DataSource;
+
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.apache.naming.java.javaURLContextFactory;
+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.web.client.RestTemplate;
 
 @Service
 public class ComplaintService {
 
-	private final String baseUrl = "https://erp.chennaicorporation.gov.in/pgr/external/mobileservice";
+	@Autowired
+	private JdbcTemplate jdbcTemplate;
+	
+	@Autowired
+	 public void setDataSource(@Qualifier("mysql1913QAQCDataSource") DataSource dataSource) {
+		 this.jdbcTemplate = new JdbcTemplate(dataSource);
+	 }
+	
+	private final String baseUrl = "https://erp.chennaicorporation.gov.in/pgr/newmobileservice";
 
 	public String fetchComplaintCategories() {
 		RestTemplate restTemplate = new RestTemplate();
@@ -62,6 +77,19 @@ public class ComplaintService {
 		}
 	}
 
+	public int saveInLogs(String mobileNo, String complaintNo,String userId) {
+		
+		 int agent_id;
+		    try {
+		        agent_id = Integer.parseInt(userId);
+		    } catch (NumberFormatException e) {
+		        return 0;
+		    }
+
+		    String sql = "INSERT INTO pgr_complaint_reg (user_mobile_num, complaint_number, agent_id) VALUES (?, ?, ?)";
+		    return jdbcTemplate.update(sql, mobileNo, complaintNo, agent_id);
+	}
+
 
 
 }
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/service/FollowUpService.java b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/service/FollowUpService.java
index 1711ef1..02dc3ef 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/service/FollowUpService.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/service/FollowUpService.java
@@ -68,6 +68,58 @@ public class FollowUpService {
 	  //System.out.println("Rows Updated in upload data: " + rowsUpdated); 
 	  }
 	
+	@Transactional
+    public int uploadComplaintDetailsInLogs(Map<String, Object> logDetails, String action,  String complaintNumber, String remainderDate) {
+    	//System.out.println("Complaint Details: " + logDetails);
+	    // Extract other field values from complaintDetails
+	    int qaqcid = (int) logDetails.get("qaqc_id");
+	    String ccategory = logDetails.get("call_category").toString();
+	    String personName = logDetails.get("complaint_person_name").toString();
+	    String personMobNo = logDetails.get("complaint_mobilenumber").toString();
+	    String complaintDate = logDetails.get("complaint_date").toString();
+	    String cType = logDetails.get("complaint_type").toString();
+	    String cMode = logDetails.get("complaint_mode").toString();
+	    String department = logDetails.get("department").toString();
+	    String cGroup = logDetails.get("complaint_group").toString();
+	    String officialName = logDetails.get("official_name").toString();
+	    String officialMobileNum = logDetails.get("official_mobilenum").toString();
+	    String callStatus = logDetails.get("call_status").toString();
+	    String remarks = logDetails.get("remarks").toString();
+	    int agentId = (int) logDetails.get("agent_id");
+	    int updated_agent=(int)logDetails.get("updated_agent");
+	    boolean isProcessed = (boolean)logDetails.get("is_processed");
+	    LocalDateTime currentDate = LocalDateTime.now();
+
+	    // Determine which table to insert into based on the action
+	    if (action.equals("FOLLOWUP")) {
+	    	
+	    			
+	    	String query ="INSERT INTO gcc_1913_qaqc.qaqc_followup_call_logs (qaqc_id, call_category, agent_id, complaint_number, complaint_date,complaint_person_name, "
+                    + "complaint_mobilenumber, complaint_type, complaint_mode, department, complaint_group, official_name,remainder_date, official_mobilenum, call_status, remarks,updated_agent) "
+                    + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?)";
+	    	
+
+	    	int rowsAffected = jdbcTemplate.update(query, qaqcid, ccategory, agentId, complaintNumber, complaintDate,personName,
+               personMobNo, cType, cMode, department, cGroup, officialName,remainderDate, officialMobileNum, callStatus, remarks,
+               updated_agent);
+	    	//System.out.println("Rows Updated in qaqc_followup_call_logs : " + rowsAffected); 
+	    } 
+	    
+	    String query1 = "INSERT INTO gcc_1913_qaqc.qaqc_call_logs (qaqc_id, call_category, agent_id, complaint_number,complaint_date, complaint_person_name, "
+                + "complaint_mobilenumber, complaint_type, complaint_mode, department, complaint_group, official_name, official_mobilenum, call_status, remarks, is_processed,updated_agent) "
+                + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?)";
+
+	    int rowsAffected1 = jdbcTemplate.update(query1, qaqcid, ccategory, agentId, complaintNumber,complaintDate, personName,
+           personMobNo, cType, cMode, department, cGroup, officialName, officialMobileNum, callStatus, remarks,
+           isProcessed,updated_agent);
+   
+	    //System.out.println("Rows Updated in qaqc_call_logs: " + rowsAffected1);
+	        
+	    return rowsAffected1;
+	    
+	}
+
+	/*
 	@Transactional
     public int uploadComplaintDetailsInLogs(Map<String, Object> logDetails, String action,  String complaintNumber, String remainderDate) {
     	//System.out.println("Complaint Details: " + logDetails);
@@ -135,7 +187,7 @@ public class FollowUpService {
 	        return rowsAffected + rowsAffected1;
 	    }
 	}
-	
+	*/
 
 	public List<Map<String, Object>> getCallHistory(String complaintNumber)
 	{
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/service/QaqcAgentAssignService.java b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/service/QaqcAgentAssignService.java
index 22720cd..02be9b1 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/service/QaqcAgentAssignService.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/service/QaqcAgentAssignService.java
@@ -164,7 +164,7 @@ public class QaqcAgentAssignService {
         // Step 4: Save upload data
         if (!"officialfollowup".equalsIgnoreCase(status) && !"publicfollowup".equalsIgnoreCase(status))
         {
-			String url="https://erp.chennaicorporation.gov.in/pgr/external/mobileservice?serviceId=ms_dashboard_details&From_date="+formattedFromDate+"&To_date="+formattedToDate+"&jsonResp=Yes&Status="+status+"&isQcuser=Yes"+"&ComplaintType="+type+"&ComplaintGroupId="+group+"&compmode="+mode+"&Zoneid="+zone+"&RegionId="+region;
+			String url="https://erp.chennaicorporation.gov.in/pgr/newmobileservice?serviceId=ms_dashboard_details&From_date="+formattedFromDate+"&To_date="+formattedToDate+"&jsonResp=Yes&Status="+status+"&isQcuser=Yes"+"&ComplaintType="+type+"&ComplaintGroupId="+group+"&compmode="+mode+"&Zoneid="+zone+"&RegionId="+region;
 			System.out.println("url=="+url);
 	        boolean isSaved = processAndSaveDetails(url, qaqcId, agents, status,assignedIDList, mode);
 	        if (!isSaved) {
@@ -197,13 +197,15 @@ public class QaqcAgentAssignService {
 	        String formattedFromDate = formattedDate.format(outputFormatter);
 	        if (!"officialfollowup".equalsIgnoreCase(status))
 	        {
-		        String sqlQuery = "SELECT * FROM gcc_1913_qaqc.qaqc_followup_call_logs WHERE remainder_date = ? AND call_status='FOLLOWUP' AND call_category IN ('CLOSED','PUBLICFOLLOWUP')";
-		        return jdbcTemplate.queryForList(sqlQuery, formattedFromDate);
+		        //String sqlQuery = "SELECT * FROM gcc_1913_qaqc.qaqc_followup_call_logs WHERE remainder_date = ? AND call_status='FOLLOWUP' AND call_category IN ('CLOSED','PUBLICFOLLOWUP')";
+	        	String sqlQuery = "SELECT * FROM gcc_1913_qaqc.qaqc_followup_call_logs WHERE remainder_date = ? AND call_status='FOLLOWUP' AND call_category IN ('CLOSED','PUBLICFOLLOWUP') AND isactive=1";
+	        	return jdbcTemplate.queryForList(sqlQuery, formattedFromDate);
 	        }
 	        else
 	        {
-	        	String sqlQuery = "SELECT * FROM gcc_1913_qaqc.qaqc_followup_call_logs WHERE remainder_date = ? AND call_status='FOLLOWUP' AND call_category NOT IN ('CLOSED','PUBLICFOLLOWUP')";
-		        return jdbcTemplate.queryForList(sqlQuery, formattedFromDate);
+	        	//String sqlQuery = "SELECT * FROM gcc_1913_qaqc.qaqc_followup_call_logs WHERE remainder_date = ? AND call_status='FOLLOWUP' AND call_category NOT IN ('CLOSED','PUBLICFOLLOWUP')";
+	        	String sqlQuery = "SELECT * FROM gcc_1913_qaqc.qaqc_followup_call_logs WHERE remainder_date = ? AND call_status='FOLLOWUP' AND call_category NOT IN ('CLOSED','PUBLICFOLLOWUP') AND isactive=1";
+	        	return jdbcTemplate.queryForList(sqlQuery, formattedFromDate);
 	        }
 
 	    } catch (DateTimeParseException e) {
@@ -211,6 +213,98 @@ public class QaqcAgentAssignService {
 	    }
 	}
 
+	@Transactional
+	public boolean processAndSaveFollowupDetails(int qaqc_id, List<Map<String, Object>> agents, String status,
+			String fromdate) {
+		try {
+
+			List<Map<String, Object>> detail = getfollowupdata(fromdate, status);
+			
+
+			int index = 0;
+			
+			
+			for (Map<String, Object> agent : agents) {
+				int remainingDataCountForAgent = Integer.parseInt(agent.get("callsPerAgent").toString());
+				// System.out.println(remainingDataCountForAgent);
+				int currentAgentId = Integer.parseInt(agent.get("agentId").toString());
+				// System.out.println(agent.get("agentName").toString());
+
+				for (int i = 0; i < remainingDataCountForAgent && index < detail.size(); i++, index++) {
+					// System.out.println(i +" "+index);
+					// Save the current complaint details with the current agent_id
+					Integer isactive_id=(Integer) detail.get(index).get("id");
+					
+					String complaintNumber = (String) detail.get(index).get("complaint_number");
+					String complaintDate = (String) detail.get(index).get("complaint_date");
+					String complanitPersonName = (String) detail.get(index).get("complaint_person_name");
+					String complaintPersonMobileNum = (String) detail.get(index).get("complaint_mobilenumber");
+					String complaintType = (String) detail.get(index).get("complaint_type");
+					String complaintMode = (String) detail.get(index).get("complaint_mode");
+					String department = (String) detail.get(index).get("department");
+					String complaintGroup = (String) detail.get(index).get("complaint_group");
+					String officerName = (String) detail.get(index).get("official_name");
+					String officerMobileNumber = (String) detail.get(index).get("official_mobilenum");
+
+					String status3 = status.toUpperCase();
+
+					// Insert into the database
+					String insertQuery = "INSERT INTO gcc_1913_qaqc.qaqc_upload_data (qaqc_id, call_category, complaint_number, complaint_date,complaint_person_name, complaint_mobilenumber, complaint_type, complaint_mode, department, complaint_group, official_name, official_mobilenum, agent_id) VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+					// jdbcTemplate.update(insertQuery, qaqc_id,status3
+					// ,complaintNumber,complaintDate, complanitPersonName,
+					// complaintPersonMobileNum, complaintType, complaintMode, department,
+					// complaintGroup, officerName, officerMobileNumber, currentAgentId);
+					KeyHolder keyHolder = new GeneratedKeyHolder();
+
+					jdbcTemplate.update(connection -> {
+						PreparedStatement ps = connection.prepareStatement(insertQuery,
+								Statement.RETURN_GENERATED_KEYS);
+						ps.setInt(1, qaqc_id);
+						ps.setString(2, status3);
+						ps.setString(3, complaintNumber);
+						ps.setString(4, complaintDate);
+						ps.setString(5, complanitPersonName);
+						ps.setString(6, complaintPersonMobileNum);
+						ps.setString(7, complaintType);
+						ps.setString(8, complaintMode);
+						ps.setString(9, department);
+						ps.setString(10, complaintGroup);
+						ps.setString(11, officerName);
+						ps.setString(12, officerMobileNumber);
+						ps.setInt(13, currentAgentId);
+						return ps;
+					}, keyHolder);
+					Number generatedDataId = keyHolder.getKey();
+
+					if (generatedDataId != null) {
+						long dataId = generatedDataId.longValue();
+						// System.out.println("followdataId=="+dataId);
+						// Use the dataId in the next insert for qaqc_upload_data_history
+						String sql = "INSERT INTO gcc_1913_qaqc.qaqc_upload_data_history "
+								+ "(qaqc_id, call_category, complaint_number, complaint_date, complaint_person_name, complaint_mobilenumber, complaint_type, complaint_mode, department, complaint_group, official_name, official_mobilenum, agent_id, data_id) "
+								+ "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+
+						jdbcTemplate.update(sql, qaqc_id, status3, complaintNumber, complaintDate, complanitPersonName,
+								complaintPersonMobileNum, complaintType, complaintMode, department, complaintGroup,
+								officerName, officerMobileNumber, currentAgentId, dataId);
+					}
+					
+					//System.out.println("isactive_id===="+isactive_id);
+					
+					String upsql2 = "UPDATE gcc_1913_qaqc.qaqc_followup_call_logs set isactive=0 where id=?";
+					jdbcTemplate.update(upsql2, isactive_id);
+
+				}
+			}
+			return true;
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}
+	}
+
+	/*
 	@Transactional
 	public boolean processAndSaveFollowupDetails(int qaqc_id, List<Map<String, Object>> agents,String status,String fromdate) {
 	    try {
@@ -288,7 +382,8 @@ public class QaqcAgentAssignService {
 	        return false;
 	    }
 	}
-	 
+	 */
+	/*
 	@Transactional
 	public boolean processAndSaveDetails(String url, int qaqc_id, List<Map<String, Object>> agents,String status,List<Map<String, Object>> assignedIDList, String mode) {
 	    try {
@@ -529,10 +624,418 @@ public class QaqcAgentAssignService {
 	        return false;
 	    }
 	 }
+	*/
 	
+	@Transactional
+	public boolean processAndSaveDetails(String url, int qaqc_id, List<Map<String, Object>> agents, String status,
+			List<Map<String, Object>> assignedIDList, String mode) {
+		try {
+
+			RestTemplate restTemplate = new RestTemplate();
+
+			// Fetch response as String
+			ResponseEntity<String> response = restTemplate.getForEntity(url, String.class);
+			String rawResponse = response.getBody();
+
+			// Preprocess response to remove invalid characters if needed
+			if (rawResponse != null) {
+//				rawResponse = rawResponse.replaceAll("\"\"", "\""); // Replace double-double quotes
+//				rawResponse = rawResponse.replaceAll("(?<![,{])\"R", "\"R"); // Example: Fix missing commas
+
+			}
+
+			// Log raw response
+			// System.out.println("Raw Response: " + rawResponse);
+
+			// Parse JSON
+			ObjectMapper objectMapper = new ObjectMapper();
+			Map<String, Object> responseMap = objectMapper.readValue(rawResponse, Map.class);
+
+			// Target the specific field where double-double quotes might appear
+			String targetField = "Address"; // Replace with the actual field name
+			if (responseMap.containsKey(targetField)) {
+				String fieldValue = (String) responseMap.get(targetField);
+				if (fieldValue != null && fieldValue.contains("\"\"")) {
+					// Clean double-double quotes in the field value
+					fieldValue = fieldValue.replaceAll("\"\"", "\"");
+					responseMap.put(targetField, fieldValue); // Update the field with cleaned value
+				}
+			}
+
+			// Extract "Details" array from the response
+			List<Map<String, Object>> details = (List<Map<String, Object>>) responseMap.get("Details");
+			// System.out.println(details);
+			if (details == null) {
+				System.err.println("No 'Details' found in the response.");
+				return false; // Or handle as per your requirement
+			}
+			if (mode.isEmpty() || mode.isBlank() || mode == null) {
+				details = details.stream().filter(map -> !map.get("Complaint Mode").equals("SOCIAL MEDIA"))
+						.collect(Collectors.toList());
+			}
+
+			// Apply filtering based on the status value
+			if ("withdraw".equalsIgnoreCase(status)) {
+				// Keep only records where "Current Status" is "Completed"
+				//details = details.stream().filter(entry -> "Completed".equals(entry.get("Current Status"))).toList(); 
+				details = details.stream()
+					    .filter(entry -> "Completed".equals(entry.get("Current Status")))
+					    .collect(Collectors.toList());
+			} else {
+				// Remove records where "Current Status" is "Completed"
+				//details = details.stream().filter(entry -> !"Completed".equals(entry.get("Current Status"))).toList();
+				details = details.stream()
+					    .filter(entry -> !"Completed".equals(entry.get("Current Status")))
+					    .collect(Collectors.toList());
+			}
+
+			int index = 0;
+
+			List<Map<String, Object>> followupData = getFollowupData();
+			System.out.println("followupData=" + followupData);
+
+			List<Map<String, Object>> countDetails = new ArrayList<>();
+
+			for (Map<String, Object> agent : agents) {
+				int remainingDataCountForAgent = Integer.parseInt(agent.get("callsPerAgent").toString());
+				// System.out.println(remainingDataCountForAgent);
+				int currentAgentId = Integer.parseInt(agent.get("agentId").toString());
+				// System.out.println(agent.get("agentName").toString());
+
+				Map<String, Object> countResult = new HashMap<>();
+				int assignedCount = 0;
+
+				for (int i = 0; i < remainingDataCountForAgent && index < details.size(); i++, index++) {
+
+					//System.out.println("CHECK = " + index + " " + details.get(index).get("Complaint Mode"));
+					// System.out.println(i +" "+index);
+
+					String complaintNumber1 = (String) details.get(index).get("Complaint Number");
+					// System.out.println("complaintNumber = "+complaintNumber1);
+
+					Map<String, Object> result = followupData.stream()
+							.filter(map -> complaintNumber1.equals(map.get("complaint_number"))).findFirst()
+							.orElse(null);
+
+					String compnum = "";
+					String callstatus = "";
+					String callcat = "";
+					Integer isactive_id = 0;
+					Date calldate = null;
+					if (result != null) {
+						compnum = (String) result.get("complaint_number");
+						callstatus = (String) result.get("call_status");
+						calldate = (Date) result.get("remainder_date");
+						callcat = (String) result.get("call_category");						
+						isactive_id = (Integer) result.get("id");
+						
+					}
+
+					if (!compnum.equals("") && compnum.equals(complaintNumber1)) {
+						//System.out.println("1 if complaintNumber = " + complaintNumber1);
+						Date currentDate = new Date();
+
+						if (status.equalsIgnoreCase("CLOSED") || status.equalsIgnoreCase("PUBLICFOLLOWUP")) {
+
+							if ((callcat.equalsIgnoreCase("CLOSED") || callcat.equalsIgnoreCase("PUBLICFOLLOWUP"))
+									&& calldate.before(currentDate)) {							
+
+								//System.out.println("2 if complaintNumber = " + complaintNumber1);
+								String complaintDate = (String) details.get(index).get("Complaint Opened Date");
+								String complanitPersonName = (String) details.get(index).get("Complaint Person Name");
+								String complaintPersonMobileNum = (String) details.get(index)
+										.get("Complaint Person Number");
+								String complaintType = (String) details.get(index).get("Complaint Type");
+								String complaintMode = (String) details.get(index).get("Complaint Mode");
+								String department = (String) details.get(index).get("Department");
+								String complaintGroup = (String) details.get(index).get("Complaint Group");
+								String officerName = (String) details.get(index).get("Assign To");
+								String officerMobileNumber = (String) details.get(index).get("Official Contact Number");
+								String status1 = status.toUpperCase();
+
+								// Insert into the database
+								String insertQuery = "INSERT INTO gcc_1913_qaqc.qaqc_upload_data (qaqc_id, call_category, complaint_number,complaint_date, "
+										+ "complaint_person_name, complaint_mobilenumber, complaint_type, complaint_mode, department, complaint_group, official_name, "
+										+ "official_mobilenum, agent_id) VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+								// jdbcTemplate.update(insertQuery, qaqc_id, status1,
+								// complaintNumber1,complaintDate, complanitPersonName,
+								// complaintPersonMobileNum, complaintType, complaintMode, department,
+								// complaintGroup, officerName, officerMobileNumber, currentAgentId);
+
+								KeyHolder keyHolder = new GeneratedKeyHolder();
+
+								jdbcTemplate.update(connection -> {
+									PreparedStatement ps = connection.prepareStatement(insertQuery,
+											Statement.RETURN_GENERATED_KEYS);
+									ps.setInt(1, qaqc_id);
+									ps.setString(2, status);
+									ps.setString(3, complaintNumber1);
+									ps.setString(4, complaintDate);
+									ps.setString(5, complanitPersonName);
+									ps.setString(6, complaintPersonMobileNum);
+									ps.setString(7, complaintType);
+									ps.setString(8, complaintMode);
+									ps.setString(9, department);
+									ps.setString(10, complaintGroup);
+									ps.setString(11, officerName);
+									ps.setString(12, officerMobileNumber);
+									ps.setInt(13, currentAgentId);
+									return ps;
+								}, keyHolder);
+								// Retrieve the generated data_id
+								Number generatedDataId = keyHolder.getKey();
+								if (generatedDataId != null) {
+									long dataId = generatedDataId.longValue();
+
+									// System.out.println("dataId if=="+dataId);
+									// Use the dataId in the next insert for qaqc_upload_data_history
+									String sql = "INSERT INTO gcc_1913_qaqc.qaqc_upload_data_history "
+											+ "(qaqc_id, call_category, complaint_number, complaint_date, complaint_person_name, complaint_mobilenumber, complaint_type, complaint_mode, department, complaint_group, official_name, official_mobilenum, agent_id, data_id) "
+											+ "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+
+									jdbcTemplate.update(sql, qaqc_id, status1, complaintNumber1, complaintDate,
+											complanitPersonName, complaintPersonMobileNum, complaintType, complaintMode,
+											department, complaintGroup, officerName, officerMobileNumber,
+											currentAgentId, dataId);
+
+								}
+
+								assignedCount++;
+
+								String upsql = "UPDATE gcc_1913_qaqc.qaqc_followup_call_logs set isactive=0 where id=?";
+								jdbcTemplate.update(upsql, isactive_id);
+
+							}
+
+							if (callcat.equalsIgnoreCase("REDRESSED") || callcat.equalsIgnoreCase("OFFICIALFOLLOWUP")) {
+
+								//System.out.println("3 if complaintNumber = " + complaintNumber1);
+								String complaintDate = (String) details.get(index).get("Complaint Opened Date");
+								String complanitPersonName = (String) details.get(index).get("Complaint Person Name");
+								String complaintPersonMobileNum = (String) details.get(index)
+										.get("Complaint Person Number");
+								String complaintType = (String) details.get(index).get("Complaint Type");
+								String complaintMode = (String) details.get(index).get("Complaint Mode");
+								String department = (String) details.get(index).get("Department");
+								String complaintGroup = (String) details.get(index).get("Complaint Group");
+								String officerName = (String) details.get(index).get("Assign To");
+								String officerMobileNumber = (String) details.get(index).get("Official Contact Number");
+								String status1 = status.toUpperCase();
+
+								// Insert into the database
+								String insertQuery = "INSERT INTO gcc_1913_qaqc.qaqc_upload_data (qaqc_id, call_category, complaint_number,complaint_date, complaint_person_name, complaint_mobilenumber, complaint_type, complaint_mode, department, complaint_group, official_name, official_mobilenum, agent_id) VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+								// jdbcTemplate.update(insertQuery, qaqc_id, status1,
+								// complaintNumber1,complaintDate, complanitPersonName,
+								// complaintPersonMobileNum, complaintType, complaintMode, department,
+								// complaintGroup, officerName, officerMobileNumber, currentAgentId);
+
+								KeyHolder keyHolder = new GeneratedKeyHolder();
+
+								jdbcTemplate.update(connection -> {
+									PreparedStatement ps = connection.prepareStatement(insertQuery,
+											Statement.RETURN_GENERATED_KEYS);
+									ps.setInt(1, qaqc_id);
+									ps.setString(2, status);
+									ps.setString(3, complaintNumber1);
+									ps.setString(4, complaintDate);
+									ps.setString(5, complanitPersonName);
+									ps.setString(6, complaintPersonMobileNum);
+									ps.setString(7, complaintType);
+									ps.setString(8, complaintMode);
+									ps.setString(9, department);
+									ps.setString(10, complaintGroup);
+									ps.setString(11, officerName);
+									ps.setString(12, officerMobileNumber);
+									ps.setInt(13, currentAgentId);
+									return ps;
+								}, keyHolder);
+								// Retrieve the generated data_id
+								Number generatedDataId = keyHolder.getKey();
+								if (generatedDataId != null) {
+									long dataId = generatedDataId.longValue();
+
+									// System.out.println("dataId if=="+dataId);
+									// Use the dataId in the next insert for qaqc_upload_data_history
+									String sql = "INSERT INTO gcc_1913_qaqc.qaqc_upload_data_history "
+											+ "(qaqc_id, call_category, complaint_number, complaint_date, complaint_person_name, complaint_mobilenumber, complaint_type, complaint_mode, department, complaint_group, official_name, official_mobilenum, agent_id, data_id) "
+											+ "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+
+									jdbcTemplate.update(sql, qaqc_id, status1, complaintNumber1, complaintDate,
+											complanitPersonName, complaintPersonMobileNum, complaintType, complaintMode,
+											department, complaintGroup, officerName, officerMobileNumber,
+											currentAgentId, dataId);
+
+								}
+
+								assignedCount++;
+
+								String upsql1 = "UPDATE gcc_1913_qaqc.qaqc_followup_call_logs set isactive=0 where id=?";
+								jdbcTemplate.update(upsql1, isactive_id);
+							}
+
+						}
+
+						else if (status.equalsIgnoreCase("REDRESSED") || status.equalsIgnoreCase("OFFICIALFOLLOWUP")) {
+
+							if ((callcat.equalsIgnoreCase("REDRESSED") || callcat.equalsIgnoreCase("OFFICIALFOLLOWUP"))
+									&& calldate.before(currentDate)) {
+
+								//System.out.println("2 if complaintNumber = " + complaintNumber1);
+								String complaintDate = (String) details.get(index).get("Complaint Opened Date");
+								String complanitPersonName = (String) details.get(index).get("Complaint Person Name");
+								String complaintPersonMobileNum = (String) details.get(index)
+										.get("Complaint Person Number");
+								String complaintType = (String) details.get(index).get("Complaint Type");
+								String complaintMode = (String) details.get(index).get("Complaint Mode");
+								String department = (String) details.get(index).get("Department");
+								String complaintGroup = (String) details.get(index).get("Complaint Group");
+								String officerName = (String) details.get(index).get("Assign To");
+								String officerMobileNumber = (String) details.get(index).get("Official Contact Number");
+								String status1 = status.toUpperCase();
+
+								// Insert into the database
+								String insertQuery = "INSERT INTO gcc_1913_qaqc.qaqc_upload_data (qaqc_id, call_category, complaint_number,complaint_date, complaint_person_name, complaint_mobilenumber, complaint_type, complaint_mode, department, complaint_group, official_name, official_mobilenum, agent_id) VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+								// jdbcTemplate.update(insertQuery, qaqc_id, status1,
+								// complaintNumber1,complaintDate, complanitPersonName,
+								// complaintPersonMobileNum, complaintType, complaintMode, department,
+								// complaintGroup, officerName, officerMobileNumber, currentAgentId);
+
+								KeyHolder keyHolder = new GeneratedKeyHolder();
+
+								jdbcTemplate.update(connection -> {
+									PreparedStatement ps = connection.prepareStatement(insertQuery,
+											Statement.RETURN_GENERATED_KEYS);
+									ps.setInt(1, qaqc_id);
+									ps.setString(2, status);
+									ps.setString(3, complaintNumber1);
+									ps.setString(4, complaintDate);
+									ps.setString(5, complanitPersonName);
+									ps.setString(6, complaintPersonMobileNum);
+									ps.setString(7, complaintType);
+									ps.setString(8, complaintMode);
+									ps.setString(9, department);
+									ps.setString(10, complaintGroup);
+									ps.setString(11, officerName);
+									ps.setString(12, officerMobileNumber);
+									ps.setInt(13, currentAgentId);
+									return ps;
+								}, keyHolder);
+								// Retrieve the generated data_id
+								Number generatedDataId = keyHolder.getKey();
+								if (generatedDataId != null) {
+									long dataId = generatedDataId.longValue();
+
+									// System.out.println("dataId if=="+dataId);
+									// Use the dataId in the next insert for qaqc_upload_data_history
+									String sql = "INSERT INTO gcc_1913_qaqc.qaqc_upload_data_history "
+											+ "(qaqc_id, call_category, complaint_number, complaint_date, complaint_person_name, complaint_mobilenumber, complaint_type, complaint_mode, department, complaint_group, official_name, official_mobilenum, agent_id, data_id) "
+											+ "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+
+									jdbcTemplate.update(sql, qaqc_id, status1, complaintNumber1, complaintDate,
+											complanitPersonName, complaintPersonMobileNum, complaintType, complaintMode,
+											department, complaintGroup, officerName, officerMobileNumber,
+											currentAgentId, dataId);
+
+								}
+
+								assignedCount++;
+
+								String upsql2 = "UPDATE gcc_1913_qaqc.qaqc_followup_call_logs set isactive=0 where id=?";
+								jdbcTemplate.update(upsql2, isactive_id);
+
+							}
+
+						}
+
+					} else {
+						//System.out.println("else complaintNumber = " + complaintNumber1);
+						String complaintDate2 = (String) details.get(index).get("Complaint Opened Date");
+						String complanitPersonName2 = (String) details.get(index).get("Complaint Person Name");
+						String complaintPersonMobileNum2 = (String) details.get(index).get("Complaint Person Number");
+						String complaintType2 = (String) details.get(index).get("Complaint Type");
+						String complaintMode2 = (String) details.get(index).get("Complaint Mode");
+						String department2 = (String) details.get(index).get("Department");
+						String complaintGroup2 = (String) details.get(index).get("Complaint Group");
+						String officerName2 = (String) details.get(index).get("Assign To");
+						String officerMobileNumber2 = (String) details.get(index).get("Official Contact Number");
+						String status2 = status.toUpperCase();
+
+						// Insert into the database
+						String insertQuery = "INSERT INTO gcc_1913_qaqc.qaqc_upload_data (qaqc_id, call_category, complaint_number,complaint_date, complaint_person_name, complaint_mobilenumber, complaint_type, complaint_mode, department, complaint_group, official_name, official_mobilenum, agent_id) VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+						// jdbcTemplate.update(insertQuery, qaqc_id, status2,
+						// complaintNumber1,complaintDate2, complanitPersonName2,
+						// complaintPersonMobileNum2, complaintType2, complaintMode2, department2,
+						// complaintGroup2, officerName2, officerMobileNumber2, currentAgentId);
+						KeyHolder keyHolder = new GeneratedKeyHolder();
+						jdbcTemplate.update(connection -> {
+							PreparedStatement ps = connection.prepareStatement(insertQuery,
+									Statement.RETURN_GENERATED_KEYS);
+							ps.setInt(1, qaqc_id);
+							ps.setString(2, status2);
+							ps.setString(3, complaintNumber1);
+							ps.setString(4, complaintDate2);
+							ps.setString(5, complanitPersonName2);
+							ps.setString(6, complaintPersonMobileNum2);
+							ps.setString(7, complaintType2);
+							ps.setString(8, complaintMode2);
+							ps.setString(9, department2);
+							ps.setString(10, complaintGroup2);
+							ps.setString(11, officerName2);
+							ps.setString(12, officerMobileNumber2);
+							ps.setInt(13, currentAgentId);
+							return ps;
+						}, keyHolder);
+						Number generatedDataId = keyHolder.getKey();
+
+						if (generatedDataId != null) {
+							long dataId2 = generatedDataId.longValue();
+							// System.out.println("dataId2 else=="+dataId2);
+							// Use the dataId in the next insert for qaqc_upload_data_history
+							String sql = "INSERT INTO gcc_1913_qaqc.qaqc_upload_data_history "
+									+ "(qaqc_id, call_category, complaint_number, complaint_date, complaint_person_name, complaint_mobilenumber, complaint_type, complaint_mode, department, complaint_group, official_name, official_mobilenum, agent_id, data_id) "
+									+ "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+
+							jdbcTemplate.update(sql, qaqc_id, status2, complaintNumber1, complaintDate2,
+									complanitPersonName2, complaintPersonMobileNum2, complaintType2, complaintMode2,
+									department2, complaintGroup2, officerName2, officerMobileNumber2, currentAgentId,
+									dataId2);
+						}
+
+						assignedCount++;
+					}
+				}
+
+				countResult.put("assignedCount", assignedCount);
+				countResult.put("qaqc_id", qaqc_id);
+				countResult.put("agent_id", currentAgentId);
+				countDetails.add(countResult);
+			}
+			for (Map<String, Object> assgn : assignedIDList) {
+
+				for (Map<String, Object> count : countDetails) {
+
+					if (((int) assgn.get("agent_id")) == ((int) count.get("agent_id"))) {
+						int assignedid = (int) assgn.get("assigned_id");
+						int agentid = (int) assgn.get("agent_id");
+						int assignedCount = (int) count.get("assignedCount");
+						String sql = "UPDATE agent_assigned SET data_count = ? WHERE assigned_id = ? and agent_id = ?";
+						jdbcTemplate.update(sql, assignedCount, assignedid, agentid);
+					}
+				}
+			}
+
+			return true;
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}
+	}
+
 	private List<Map<String, Object>> getFollowupData() {
 		
-		 String sqlQuery ="select complaint_number, remainder_date, call_status from qaqc_followup_call_logs";
+		 //String sqlQuery ="select complaint_number, remainder_date, call_status from qaqc_followup_call_logs";
+		 String sqlQuery = "select id, call_category,complaint_number, remainder_date, call_status from qaqc_followup_call_logs where isactive=1";
 		  	  
 		 return jdbcTemplate.queryForList(sqlQuery); 
 	}
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/service/QaqcService.java b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/service/QaqcService.java
index a4f7d90..e5a706f 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/service/QaqcService.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/service/QaqcService.java
@@ -112,7 +112,7 @@ public class QaqcService {
 	        return jdbcTemplate.queryForList(sql, params.toArray());
 	    }
 
-
+/*
 
 	    public Map<String, Long> countFollowUpsByDateAndStatus(LocalDate today, String followupStatus) {
 	    	String sqlNotClosed = "SELECT COUNT(*) FROM qaqc_followup_call_logs " +
@@ -130,6 +130,23 @@ public class QaqcService {
 			
 			return result;
 	    }
+	    */
+	    public Map<String, Long> countFollowUpsByDateAndStatus(LocalDate today, String followupStatus) {
+	    	String sqlNotClosed = "SELECT COUNT(*) FROM qaqc_followup_call_logs " +
+                    "WHERE call_status = ? AND DATE(remainder_date) = ? AND call_category NOT IN ('CLOSED','PUBLICFOLLOWUP')";
+	    	
+	    	String sqlClosed = "SELECT COUNT(*) FROM qaqc_followup_call_logs " +
+		"WHERE call_status = ? AND DATE(remainder_date) = ? AND call_category IN ('CLOSED','PUBLICFOLLOWUP')";
+			
+			long countNotClosed = jdbcTemplate.queryForObject(sqlNotClosed, new Object[]{followupStatus, today}, Long.class);
+			long countClosed = jdbcTemplate.queryForObject(sqlClosed, new Object[]{followupStatus, today}, Long.class);
+			
+			Map<String, Long> result = new HashMap<>();
+			result.put("officialfollowup", countNotClosed);
+			result.put("publicfollowup", countClosed);
+			
+			return result;
+	    }
 	    
 
 	    public List<Map<String, Object>> getUnattendedlist(Integer ucount) {
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/service/StatusCountService.java b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/service/StatusCountService.java
index c1e4120..04030ae 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/service/StatusCountService.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/callcenterqaqc/service/StatusCountService.java
@@ -32,7 +32,7 @@ public class StatusCountService {
     }
 
     public Map<String, Object> fetchComplaintCounts(String fromDate, String toDate, String compType, String zoneName, String compMode, String compGroup, String region) {
-    	//https://erp.chennaicorporation.gov.in/pgr/external/mobileservice?serviceId=common_api&jsonResp=Yes&subService=dashboardAbs&fromDate=&toDate=&compType=&zoneName=&compMode=&compGroup=
+    	//https://erp.chennaicorporation.gov.in/pgr/newmobileservice?serviceId=common_api&jsonResp=Yes&subService=dashboardAbs&fromDate=&toDate=&compType=&zoneName=&compMode=&compGroup=
     	String apiUrl;
         if ("SOCIAL MEDIA".equalsIgnoreCase(compMode)) {
     	
@@ -99,7 +99,7 @@ public class StatusCountService {
             //System.out.println(fromDate);
             //System.out.println(toDate);
             
-			String url="https://erp.chennaicorporation.gov.in/pgr/external/mobileservice?serviceId=ms_dashboard_details&From_date="+fromDate+"&To_date="+toDate+"&jsonResp=Yes&Status=closed&isQcuser=Yes&ComplaintType="+compType+"&ComplaintGroupId="+compGroup+"&compmode="+compMode+"&Zoneid="+zoneName+"&RegionId="+region;
+			String url="https://erp.chennaicorporation.gov.in/pgr/newmobileservice?serviceId=ms_dashboard_details&From_date="+fromDate+"&To_date="+toDate+"&jsonResp=Yes&Status=closed&isQcuser=Yes&ComplaintType="+compType+"&ComplaintGroupId="+compGroup+"&compmode="+compMode+"&Zoneid="+zoneName+"&RegionId="+region;
 			System.out.println("url==="+url);			
 			RestTemplate restTemplate = new RestTemplate();
 			ResponseEntity<String> response1 = restTemplate.getForEntity(url, String.class);
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/configuration/AppConfig.java b/src/main/java/in/gov/chennaicorporation/gccoffice/configuration/AppConfig.java
index 83e380b..35813d0 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/configuration/AppConfig.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/configuration/AppConfig.java
@@ -18,9 +18,10 @@ public class AppConfig {
 	public String petRegistration = "http://117.232.67.158:8061";
 	public String garbageCollection = "http://117.232.67.158:8067"; //117.232.67.158
 	public String cdwastecollectors = "http://117.232.67.158:8071";
-	public String qaqcurl="https://erp.chennaicorporation.gov.in/pgr/external/mobileservice?";
+	public String qaqcurl="https://erp.chennaicorporation.gov.in/pgr/newmobileservice?";
 	public String attendanceReport = "http://117.232.67.158:8076";
 	public String dumpregister = "https://gccservices.in";
+	public String mobileservice="https://gccservices.in";
 	public String gccappsMysqlPassword = "";
 	
     @Bean
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/configuration/DataSourceConfig.java b/src/main/java/in/gov/chennaicorporation/gccoffice/configuration/DataSourceConfig.java
index 7589526..cf2c382 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/configuration/DataSourceConfig.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/configuration/DataSourceConfig.java
@@ -308,7 +308,6 @@ public class DataSourceConfig {
 		return dataSource;
 	}
 
-	
 	//////////////////////////////(For gcc_c_d_waste_web) ////////////////////////
 	@Bean(name = "mysqlCDManagerSystemDataSource")
 	public DataSource mysqlCDManagerSystemDataSource() {
@@ -331,6 +330,26 @@ public class DataSourceConfig {
 		return dataSource;
 	}
 
+	//////////////////////////////(For gcc_c_d_waste_web) ////////////////////////
+	@Bean(name = "mysqlGccStreetVendorDataSource")
+	public DataSource mysqlGccStreetVendorDataSource() { 
+		DriverManagerDataSource dataSource = new DriverManagerDataSource();
+		dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+		dataSource.setUrl("jdbc:mysql://"+host+"/gcc_street_vendor");
+		dataSource.setUsername("root");
+		dataSource.setPassword(dbpassword);
+	return dataSource;
+	}
+	//////////////////////////////(For vending committe) ////////////////////////
+	@Bean(name = "mysqlVendingCommitteDataSource")
+	public DataSource mysqlVendingCommitteDataSource() {
+		DriverManagerDataSource dataSource = new DriverManagerDataSource();
+		dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+		dataSource.setUrl("jdbc:mysql://"+host+"/vendingcommitte");
+		dataSource.setUsername("root");
+		dataSource.setPassword(dbpassword);
+	return dataSource;
+	}
 	////////////////////////////// ORACLE ////////////////////////
     @Bean(name = "oracleDataSource")
     public DataSource oracleDataSource() {
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/m_petition/service/Petition.java b/src/main/java/in/gov/chennaicorporation/gccoffice/m_petition/service/Petition.java
index 6a65d94..1d5b2af 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/m_petition/service/Petition.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/m_petition/service/Petition.java
@@ -109,7 +109,10 @@ public class Petition {
 	        String datePattern = year + "-" + month + "-%"; // Example: "2025-02-%"
 	        
 	        // Corrected SQL query using the proper date format
-	        String sqlQuery = "SELECT * FROM petition WHERE (`isactive`=1 AND `isdelete`=0) AND DATE(cdate) LIKE ?";
+	        String sqlQuery = "SELECT p.*, pt.name as petition_type_name FROM petition p "
+	        		+ "LEFT JOIN petition_master.petition_types pt ON pt.petition_type_id = p.petition_type "
+	        		+ "WHERE (p.`isactive`=1 AND p.`isdelete`=0) AND DATE(p.cdate) LIKE ?";
+	        
 	        
 	        // Execute the query with the date pattern as parameter
 	        List<Map<String, Object>> result = jdbcTemplate.queryForList(sqlQuery, datePattern);
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/nulm/.DS_Store b/src/main/java/in/gov/chennaicorporation/gccoffice/nulm/.DS_Store
index 09c4e42..f7769b7 100644
Binary files a/src/main/java/in/gov/chennaicorporation/gccoffice/nulm/.DS_Store and b/src/main/java/in/gov/chennaicorporation/gccoffice/nulm/.DS_Store differ
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/pensioner/.DS_Store b/src/main/java/in/gov/chennaicorporation/gccoffice/pensioner/.DS_Store
new file mode 100644
index 0000000..218c415
Binary files /dev/null and b/src/main/java/in/gov/chennaicorporation/gccoffice/pensioner/.DS_Store differ
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/pensioner/controller/.DS_Store b/src/main/java/in/gov/chennaicorporation/gccoffice/pensioner/controller/.DS_Store
new file mode 100644
index 0000000..3d00a87
Binary files /dev/null and b/src/main/java/in/gov/chennaicorporation/gccoffice/pensioner/controller/.DS_Store differ
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/pensioner/controller/DashboardApiController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/pensioner/controller/DashboardApiController.java
index 5d08abb..c6971a8 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/pensioner/controller/DashboardApiController.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/pensioner/controller/DashboardApiController.java
@@ -1,241 +1,149 @@
-package in.gov.chennaicorporation.gccoffice.pensioner.controller;
-
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import in.gov.chennaicorporation.gccoffice.pensioner.service.DashboardApiService;
-@RestController
-public class DashboardApiController {
-	@Autowired
-    private DashboardApiService dashboardApiService;
-
-	@GetMapping("/dashboard")
-	@ResponseBody
-	public List<Map<String, Object>> getDashboardData() {
-		
-	    return dashboardApiService.fetchCategoryCounts();
-	}
-	/*@GetMapping("/dashboardsearch")
-	@ResponseBody
-	public List<Map<String, Object>> fetchDashboardData(
-	        @RequestParam(required = false) String startdate,
-	        @RequestParam(required = false) String enddate) {
-	    System.out.println("Endpoint hit with startdate: " + startdate + ", enddate: " + enddate);
-	    try {
-	        return dashboardApiService.fetchCategorysearchCounts(startdate, enddate);
-	    } catch (Exception e) {
-	        e.printStackTrace(); // Print fetchCategoryCounts stack trace to the logs
-	        throw e; // Rethrow the exception to propagate the 500 error
-	    }
-	}
-	@GetMapping("/categoryCounts")
-    public List<Map<String, Object>> getCategoryCounts() {
-        return dashboardApiService.fetchCategoryCounts();
-    }
-	
-	
-	@GetMapping("/getEmpNoByFileName")
-    public List<Map<String, Object>> getEmployeeDetails(@RequestParam("file_id") String FileId) {
-		System.out.println("before fetch");
-        return dashboardApiService.getEmployeeDetails(FileId);
-    }
-	  @GetMapping("/stageWiseCounts")
-	    public ResponseEntity<List<Map<String, Object>>> getStageWiseCounts() {
-	        List<Map<String, Object>> stageWiseCounts = dashboardApiService.getStageWiseCounts();
-	        return ResponseEntity.ok(stageWiseCounts);
-	    }*/
-	  
-	  @GetMapping("/getDepartments")
-		@ResponseBody
-		public List<Map<String, Object>> getDepartment() {
-		    return dashboardApiService.getDepartment();
-		}
-	  @GetMapping("/getEmpNoByFileName")
-	    public List<Map<String, Object>> getEmployeeDetails(@RequestParam("file_id") String FileId) {
-			System.out.println("before fetch");
-	        return dashboardApiService.getEmployeeDetails(FileId);
-	    }
-	  
-	  
-	  //department
-	 
-	  @GetMapping("/deparmentdashboard")
-		@ResponseBody
-		public List<Map<String, Object>> getDepartmentDashboardData(@RequestParam(required = false) String deptId) {
-			System.out.println("deptid"+ deptId);
-		    return dashboardApiService.DepartmenfetchCategoryCounts(deptId);
-		}
-	  
-	  
-	 /* @GetMapping("/deparmentcategoryCounts")
-	    public List<Map<String, Object>> getDepartmenCategoryCounts(@RequestParam(required = false) String deptId) {
-	        return dashboardApiService.DepartmenfetchCategoryCounts(deptId);
-	    }
-	  //DepartmentstageWiseCounts
-	  
-	  @GetMapping("/DepartmentstageWiseCounts")
-	    public ResponseEntity<List<Map<String, Object>>> getDepartmentStageWiseCounts(@RequestParam(required = false) String deptId) {
-	        List<Map<String, Object>> stageWiseCounts = dashboardApiService.getDepartmentStageWiseCounts(deptId);
-	        return ResponseEntity.ok(stageWiseCounts);
-	    }*/
-
-
-	  @GetMapping("/stageWiseCounts")
-	  public ResponseEntity<List<Map<String, Object>>> getDepartmentStageWiseCounts(
-	          @RequestParam(required = false) String deptId,
-	          @RequestParam(required = false) String startDate,
-	          @RequestParam(required = false) String endDate) {
-		  
-		  if(startDate.isEmpty())
-		  {
-			  startDate=null;
-		  }
-		  if(endDate.isEmpty())
-		  {
-			  endDate=null;
-		  }
-	      List<Map<String, Object>> stageWiseCounts = dashboardApiService.getStageWiseCounts(deptId, startDate, endDate);
-	      return ResponseEntity.ok(stageWiseCounts);
-	  }
-	  @GetMapping("/categoryCounts")
-	  public List<Map<String, Object>> getDepartmenCategoryCounts(
-	          @RequestParam(required = false) String deptId,
-	          @RequestParam(required = false) String startDate,
-	          @RequestParam(required = false) String endDate) {
-		  
-		  if(startDate.isEmpty())
-		  {
-			  startDate=null;
-		  }
-		  if(endDate.isEmpty())
-		  {
-			  endDate=null;
-		  }
-		  
-	      return dashboardApiService.fetchchartCategoryCounts(deptId, startDate, endDate);
-	  }
-
-		@GetMapping("/dashboardsearch")
-		@ResponseBody
-		public List<Map<String, Object>> fetchDeparmentDashboardData(
-		        @RequestParam(required = false) String startdate,
-		        @RequestParam(required = false) String enddate,@RequestParam(required = false) String deptId) {
-			if(deptId.isEmpty())
-			  {
-				  deptId=null;
-			  }
-			  
-		    System.out.println("Endpoint hit with startdate: " + startdate + ", enddate: " + enddate);
-		    try {
-		        return dashboardApiService.fetchCategorysearchCounts(startdate, enddate,deptId);
-		    } catch (Exception e) {
-		        e.printStackTrace(); // Print fetchCategoryCounts stack trace to the logs
-		        throw e; // Rethrow the exception to propagate the 500 error
-		    }
-		}
-	
-//pension
-		
-		  @GetMapping("/pensiondashboard")
-			@ResponseBody
-			public List<Map<String, Object>> getPensionDashboardData(@RequestParam(required = false) String deptId) {
-				System.out.println("deptid"+ deptId);
-			    return dashboardApiService.DepartmenfetchCategoryCounts(deptId);
-		  }
-		 /* @GetMapping("/pensiondashboardsearch")
-			@ResponseBody
-			public List<Map<String, Object>> fetchpensionDashboardData(
-			        @RequestParam(required = false) String startdate,
-			        @RequestParam(required = false) String enddate,@RequestParam(required = false) String deptId) {
-			  
-			  if(deptId.isEmpty())
-			  {
-				  deptId=null;
-			  }
-			  
-			  
-			    System.out.println("Endpoint hit with startdate: " + startdate + ", enddate: " + enddate);
-			    try {
-			        return dashboardApiService.fetchDeparmentCategorysearchCounts(startdate, enddate,deptId);
-			    } catch (Exception e) {
-			        e.printStackTrace(); // Print fetchCategoryCounts stack trace to the logs
-			        throw e; // Rethrow the exception to propagate the 500 error
-			    }
-			}*/
-		  
-		  
-		 /* @GetMapping("/pensioncategoryCounts")
-		  public List<Map<String, Object>> getpensionCategoryCounts(
-		          @RequestParam(required = false) String deptId,
-		          @RequestParam(required = false) String startDate,
-		          @RequestParam(required = false) String endDate) {
-			  
-			  if(startDate.isEmpty())
-			  {
-				  startDate=null;
-			  }
-			  if(endDate.isEmpty())
-			  {
-				  endDate=null;
-			  }
-			  
-		      return dashboardApiService.DepartmenfetchDepartmentCategoryCounts(deptId, startDate, endDate);
-		  }*/
-		  
-		  
-		 /* @GetMapping("/pensionstageWiseCounts")
-		  public ResponseEntity<List<Map<String, Object>>> getpensionStageWiseCounts(
-		          @RequestParam(required = false) String deptId,
-		          @RequestParam(required = false) String startDate,
-		          @RequestParam(required = false) String endDate) {
-			  
-			  if(startDate.isEmpty())
-			  {
-				  startDate=null;
-			  }
-			  if(endDate.isEmpty())
-			  {
-				  endDate=null;
-			  }
-		      List<Map<String, Object>> stageWiseCounts = dashboardApiService.getDepartmentStageWiseCounts(deptId, startDate, endDate);
-		      return ResponseEntity.ok(stageWiseCounts);
-		  }*/
-		  
-		  @GetMapping("/fetchEmpDetails")
-		    public List<Map<String, Object>> getEmpDetails(@RequestParam(required = false) String Empcode) {
-			  System.out.println("checking");
-			  System.out.println(Empcode);
-			  
-		        return dashboardApiService.getEmpDetails(Empcode);
-		    }
-		    
-		    @GetMapping("/fetchPensionEmpDetails")
-		    public List<Map<String, Object>> getPensionEmpDetails(@RequestParam(required = false) String Empcode) {
-			  System.out.println("checking");
-			  System.out.println(Empcode);
-			  
-		        return dashboardApiService.getPensionEmpDetails(Empcode);
-		    }
-		    
-		    
-		    @GetMapping("/fetchTempDetails")
-		    public List<Map<String, Object>> getTempEmpDetails(@RequestParam(required = false) String tempId) {
-			  System.out.println("checking");
-			  System.out.println(tempId);
-			  
-		        return dashboardApiService.getTempEmpDetails(tempId);
-		    }
-		    
-		
-			
-
-}
+package in.gov.chennaicorporation.gccoffice.pensioner.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import in.gov.chennaicorporation.gccoffice.pensioner.service.DashboardApiService;
+
+@RequestMapping("/gcc/api/pensionerdashboard")
+@RestController
+public class DashboardApiController {
+	@Autowired
+    private DashboardApiService dashboardApiService;
+
+	@GetMapping("/dashboard")
+	//@ResponseBody
+	public List<Map<String, Object>> getDashboardData() {
+		
+	    return dashboardApiService.fetchCategoryCounts();
+	}
+	
+	  
+	  @GetMapping("/getDepartments")
+		//@ResponseBody
+		public List<Map<String, Object>> getDepartment() {
+		    return dashboardApiService.getDepartment();
+		}
+	  
+	  @GetMapping("/getEmpNoByFileName")
+	    public List<Map<String, Object>> getEmployeeDetails(@RequestParam("file_id") String FileId) {
+			//System.out.println("before fetch");
+	        return dashboardApiService.getEmployeeDetails(FileId);
+	    }
+	  
+	  
+	  //department
+	 
+	  @GetMapping("/departmentdashboard") 
+		//@ResponseBody
+		public List<Map<String, Object>> getDepartmentDashboardData(@RequestParam(required = false) String deptId) {
+			//System.out.println("deptid"+ deptId);
+		    return dashboardApiService.DepartmenfetchCategoryCounts(deptId);
+		}
+	  
+	  
+	
+
+
+	  @GetMapping("/stageWiseCounts")
+	  public ResponseEntity<List<Map<String, Object>>> getDepartmentStageWiseCounts(
+	          @RequestParam(required = false) String deptId,
+	          @RequestParam(required = false) String startDate,
+	          @RequestParam(required = false) String endDate) {
+		  
+		  if(startDate.isEmpty())
+		  {
+			  startDate=null;
+		  }
+		  if(endDate.isEmpty())
+		  {
+			  endDate=null;
+		  }
+	      List<Map<String, Object>> stageWiseCounts = dashboardApiService.getStageWiseCounts(deptId, startDate, endDate);
+	    
+	      return ResponseEntity.ok(stageWiseCounts);
+	  }
+	  
+	  @GetMapping("/categoryCounts")
+	  public List<Map<String, Object>> getDepartmenCategoryCounts(
+	          @RequestParam(required = false) String deptId,
+	          @RequestParam(required = false) String startDate,
+	          @RequestParam(required = false) String endDate) {
+		  
+		  if(startDate.isEmpty())
+		  {
+			  startDate=null;
+		  }
+		  if(endDate.isEmpty())
+		  {
+			  endDate=null;
+		  }
+		  
+	      return dashboardApiService.fetchchartCategoryCounts(deptId, startDate, endDate);
+	  }
+
+		@GetMapping("/dashboardsearch")
+		//@ResponseBody
+		public List<Map<String, Object>> fetchDeparmentDashboardData(
+		        @RequestParam(required = false) String startdate,
+		        @RequestParam(required = false) String enddate,@RequestParam(required = false) String deptId) {
+			if(deptId.isEmpty())
+			  {
+				  deptId=null;
+			  }
+			  
+		    //System.out.println("Endpoint hit with startdate: " + startdate + ", enddate: " + enddate);
+		    try {
+		        return dashboardApiService.fetchCategorysearchCounts(startdate, enddate,deptId);
+		    } catch (Exception e) {
+		        e.printStackTrace(); // Print fetchCategoryCounts stack trace to the logs
+		        throw e; // Rethrow the exception to propagate the 500 error
+		    }
+		}
+	
+//pension
+		
+		  @GetMapping("/pensiondashboard")
+			//@ResponseBody
+			public List<Map<String, Object>> getPensionDashboardData(@RequestParam(required = false) String deptId) {
+				//System.out.println("deptid"+ deptId);
+			    return dashboardApiService.DepartmenfetchCategoryCounts(deptId);
+		  }
+		
+		  
+		  @GetMapping("/fetchEmpDetails")
+		    public List<Map<String, Object>> getEmpDetails(@RequestParam(required = false) String Empcode) {
+			  //System.out.println("checking");
+			  //System.out.println(Empcode);
+			  
+		        return dashboardApiService.getEmpDetails(Empcode);
+		    }
+		    
+		    @GetMapping("/fetchPensionEmpDetails")
+		    public List<Map<String, Object>> getPensionEmpDetails(@RequestParam(required = false) String Empcode) {
+			  //System.out.println("checking");
+			  //System.out.println(Empcode);
+			  
+		        return dashboardApiService.getPensionEmpDetails(Empcode);
+		    }
+		    
+		    
+		    @GetMapping("/fetchTempDetails")
+		    public List<Map<String, Object>> getTempEmpDetails(@RequestParam(required = false) String tempId) {
+			 // System.out.println("checking");
+			 // System.out.println(tempId);
+			  
+		        return dashboardApiService.getTempEmpDetails(tempId);
+		    }
+		    
+		
+			
+
+}
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/pensioner/service/DepartmentReceivedService.java b/src/main/java/in/gov/chennaicorporation/gccoffice/pensioner/service/DepartmentReceivedService.java
index 9873dea..de4a0f1 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/pensioner/service/DepartmentReceivedService.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/pensioner/service/DepartmentReceivedService.java
@@ -97,23 +97,32 @@ public class DepartmentReceivedService {
                 int rowsUpdated2 = jdbcTemplate.update(benefitQuery, empNo, tempId, file_pending, pension_number, ledger_number, benefit_pension, benefit_pension_amount, benefit_dcrg, benefit_dcrg_amount, benefit_commutation, benefit_commutation_amount);
             }
 
-            if ("yes".equalsIgnoreCase(benefit_dcrg)) {
-            	            
-                
-            	filestatus = CheckFieldsInDept(tempId) ? (CheckFieldsInPensioner(tempId)  ? getFileStatus.getFileStatus11Id() : getFileStatus.getFileStatus10Id() ) : getFileStatus.getFileStatus9Id(); 
-            	
-                file_entry_type="FILE_COMPLETED";
-            }                       
-            else if("no".equalsIgnoreCase(benefit_dcrg) || "no".equalsIgnoreCase(benefit_pension)){
-                	
-                	filestatus = getFileStatus.getFileStatus10Id();
-                    file_entry_type="PENSION_PARTIAL";
-             }
-            else if(benefit_dcrg==null)
-            {
-            	filestatus = getFileStatus.getFileStatus9Id();
-                file_entry_type="DEPARTMENT_PARTIAL";
-            }
+//          if ("yes".equalsIgnoreCase(benefit_dcrg)) {
+            
+            
+          	filestatus = CheckFieldsInDept(tempId) ? (CheckFieldsInPensioner(tempId)  ? getFileStatus.getFileStatus11Id() : getFileStatus.getFileStatus10Id() ) : getFileStatus.getFileStatus9Id(); 
+          	
+          	if(filestatus == 11) {
+          		file_entry_type="FILE_COMPLETED";
+          	}
+          	else if(filestatus == 10) {
+          		file_entry_type="PENSION_PARTIAL";
+          	}
+          	else {
+          		file_entry_type="DEPARTMENT_PARTIAL";
+          	}
+              
+//          }                       
+//          else if("no".equalsIgnoreCase(benefit_dcrg) || "no".equalsIgnoreCase(benefit_pension)){
+//              	
+//              	filestatus = getFileStatus.getFileStatus10Id();
+//                  file_entry_type="PENSION_PARTIAL";
+//           }
+//          else if(benefit_dcrg==null)
+//          {
+//          	filestatus = getFileStatus.getFileStatus9Id();
+//              file_entry_type="DEPARTMENT_PARTIAL";
+//          }
             	
            //getFileStatus.getFileStatus2Id();
              
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/pensioner/service/ReturnFromAuditService.java b/src/main/java/in/gov/chennaicorporation/gccoffice/pensioner/service/ReturnFromAuditService.java
index e4cdaac..59b0d50 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/pensioner/service/ReturnFromAuditService.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/pensioner/service/ReturnFromAuditService.java
@@ -141,7 +141,7 @@ public class ReturnFromAuditService {
 		            String designation = emp.get("designation").toString();
 		            String fileCategoryName = emp.get("file_category_name").toString();
 		            String pendingDuration=emp.get("pending_duration").toString();
-		            String pendingReason=emp.get("reason_for_pending").toString();
+		            String pendingReason=emp.get("reason_for_pending") != null ? emp.get("reason_for_pending").toString() : null;
 		            String sericeDeath = emp.get("service_death").toString();
 		            String relationshipDeceased = emp.get("relationship_deceased").toString();
 		            String sanctionedGis = emp.get("sanctioned_gis_amount").toString();		            
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/school/.DS_Store b/src/main/java/in/gov/chennaicorporation/gccoffice/school/.DS_Store
index 7e00811..c281653 100644
Binary files a/src/main/java/in/gov/chennaicorporation/gccoffice/school/.DS_Store and b/src/main/java/in/gov/chennaicorporation/gccoffice/school/.DS_Store differ
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/school/Controller/.DS_Store b/src/main/java/in/gov/chennaicorporation/gccoffice/school/Controller/.DS_Store
new file mode 100644
index 0000000..4bd73b2
Binary files /dev/null and b/src/main/java/in/gov/chennaicorporation/gccoffice/school/Controller/.DS_Store differ
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/school/Controller/BuildingAssetController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/school/Controller/BuildingAssetController.java
index 37160aa..fa13ee7 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/school/Controller/BuildingAssetController.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/school/Controller/BuildingAssetController.java
@@ -22,135 +22,138 @@ import in.gov.chennaicorporation.gccoffice.school.Service.SchoolPropertyService;
 public class BuildingAssetController {
 
 	private BuildingAssetService buildingAssetService;
-	
-	
+
 	@Autowired
 	public BuildingAssetController(BuildingAssetService buildingAssetService) {
 		this.buildingAssetService = buildingAssetService;
 	}
-	
+
 	// For Buildings
-		@PostMapping(value = "/saveBuildings")
-		public String saveBuildings(@RequestBody List<Map<String, Object>> buildingList) {
-		    try {
-		    	for(Map<String, Object> building : buildingList) {
-		    		String building_name = (String) building.get("building_name");
-		    		int total_floor = Integer.parseInt(building.get("total_floor").toString());
-		    		int building_material = Integer.parseInt(building.get("building_material").toString());
-		    		int roof_material = Integer.parseInt( building.get("roof_material").toString());
-		    		//int building_order = Integer.parseInt(building.get("building_order").toString());
-		    		int school_id = Integer.parseInt(building.get("school_id").toString());
-		    		int check_building = buildingAssetService.checkBuilding(building_name, school_id);
-		    		if(check_building==1) {
-		    			return "Building Name Alredy Exist";
-		    		} else if(check_building==5) {
-		    			return "error";
-		    		}
-		    	int building_id = buildingAssetService.saveBuildings(building_name, total_floor, building_material, roof_material,  school_id);
-		    	System.out.println("Hi");
-		    	for(int i=1; i<=total_floor; i++) {
-		    		Map<String, Object> floor = buildingAssetService.getFloor(i);
-		    				    		
-		    		String floor_name = (String) floor.get("content");
-		    		int floor_master_id = Integer.parseInt( floor.get("floor_master_id").toString());
-		    		buildingAssetService.saveFloor(floor_name, building_id, floor_master_id, school_id);
-		    		System.out.println("Saved Floor Master ID: " + floor_master_id);
-		    	}
-		    	}
-		    	return "Building Saved sucessfully";
-		    	} catch (Exception e) {
-		    		 e.printStackTrace();
-		    	        return "error";
-				}
-		    }
-		
-		// To Get Saved Buildings
-				@GetMapping("/getSavedBuildings")
-				public ResponseEntity<Map<String, Object>> getSavedBuildings(int school_id) {
-					try {
-						List<Map<String, Object>> data = buildingAssetService.getSavedBuildings(school_id);
-						int lastId=buildingAssetService.getLastBuildingOrder(school_id);
-						Map<String, Object> response = new HashMap<>();
-						if (data.size() != 0) {
-							response.put("status", "OK");
-							response.put("data", data);
-							response.put("lastId", lastId);
-						} else {
-							response.put("status", "Failed");
-							response.put("data", "No Data Found");
-							response.put("lastId", lastId);
-						}
-						return ResponseEntity.ok(response);
-					} catch (Exception e) {
-						// Log the exception details for debugging
-						e.printStackTrace();
-
-						// Provide a user-friendly error message
-						return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-								.body(Map.of("status", "Error", "message", "Error getting data: " + e.getMessage()));
-					}
+	@PostMapping(value = "/saveBuildings")
+	public String saveBuildings(@RequestBody List<Map<String, Object>> buildingList) {
+		try {
+			for (Map<String, Object> building : buildingList) {
+				String building_name = (String) building.get("building_name");
+				int total_floor = Integer.parseInt(building.get("total_floor").toString());
+				int building_material = Integer.parseInt(building.get("building_material").toString());
+				int roof_material = Integer.parseInt(building.get("roof_material").toString());
+				// int building_order =
+				// Integer.parseInt(building.get("building_order").toString());
+				int school_id = Integer.parseInt(building.get("school_id").toString());
+				int check_building = buildingAssetService.checkBuilding(building_name, school_id);
+				if (check_building == 1) {
+					return "Building Name Alredy Exist";
+				} else if (check_building == 5) {
+					return "error";
 				}
-			
-			// To Get floor Data by buildings
-			@GetMapping("/getFloorDetails")
-			public ResponseEntity<Map<String, Object>> getFloorDetails(int building_id) {
-				try {
-					List<Map<String, Object>> data = buildingAssetService.getFloorDetails(building_id);
-					Map<String, Object> response = new HashMap<>();
-					if (data.size() != 0) {
-						response.put("status", "OK");
-						response.put("data", data);
-					} else {
-						response.put("status", "Failed");
-						response.put("data", "No Data Found");
-					}
-					
-					return ResponseEntity.ok(response);
-				} catch (Exception e) {
-					// Log the exception details for debugging
-					e.printStackTrace();
-
-					// Provide a user-friendly error message
-					return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-							.body(Map.of("status", "Error", "message", "Error getting data: " + e.getMessage()));
+				int building_id = buildingAssetService.saveBuildings(building_name, total_floor, building_material,
+						roof_material, school_id);
+				System.out.println("Hi");
+				for (int i = 1; i <= total_floor; i++) {
+					Map<String, Object> floor = buildingAssetService.getFloor(i);
+
+					String floor_name = (String) floor.get("content");
+					int floor_master_id = Integer.parseInt(floor.get("floor_master_id").toString());
+					buildingAssetService.saveFloor(floor_name, building_id, floor_master_id, school_id);
+					System.out.println("Saved Floor Master ID: " + floor_master_id);
 				}
 			}
-			
-			
-			// For Room mapping --add room
-			/*
-			 * @PostMapping(value = "/saveRoom") public String saveRoom(@RequestBody
-			 * Map<String, Object> rooms) { try { int building_id = (int)
-			 * rooms.get("building_id"); int floors_id = (int) rooms.get("floors_id"); int
-			 * room_type = Integer.parseInt(rooms.get("room_type").toString());
-			 * 
-			 * String room_num = (String) rooms.get("room_num"); int school_id = (int)
-			 * rooms.get("school_id"); buildingAssetService.saveRoomDetails(room_type,
-			 * room_num, building_id, floors_id, school_id); return
-			 * "Rooms Mapped Sucessfully"; } catch (Exception e) { e.printStackTrace();
-			 * return "error"; } }
-			 */
-			
-			//vishnu save
-			@PostMapping(value = "/saveRoom")
-			public String saveRoom(@RequestBody Map<String, Object> rooms) {
-			    try {
-			        int building_id = Integer.parseInt(rooms.get("building_id").toString());
-			        int floors_id = Integer.parseInt(rooms.get("floors_id").toString());
-			        int room_type = Integer.parseInt(rooms.get("room_type").toString());
-			        String room_num = rooms.get("room_num").toString();
-			        int school_id = Integer.parseInt(rooms.get("school_id").toString());
-
-			        buildingAssetService.saveRoomDetails(room_type, room_num, building_id, floors_id, school_id);
-			        return "Rooms Mapped Sucessfully";
-			    } catch (Exception e) {
-			        e.printStackTrace();
-			        return "error";
-			    }
+			return "Building Saved sucessfully";
+		} catch (Exception e) {
+			e.printStackTrace();
+			return "error";
+		}
+	}
+
+	// To Get Saved Buildings
+	@GetMapping("/getSavedBuildings")
+	public ResponseEntity<Map<String, Object>> getSavedBuildings(int school_id) {
+		try {
+			List<Map<String, Object>> data = buildingAssetService.getSavedBuildings(school_id);
+			int lastId = buildingAssetService.getLastBuildingOrder(school_id);
+			Map<String, Object> response = new HashMap<>();
+			if (data.size() != 0) {
+				response.put("status", "OK");
+				response.put("data", data);
+				response.put("lastId", lastId);
+			} else {
+				response.put("status", "Failed");
+				response.put("data", "No Data Found");
+				response.put("lastId", lastId);
+			}
+			return ResponseEntity.ok(response);
+		} catch (Exception e) {
+			// Log the exception details for debugging
+			e.printStackTrace();
+
+			// Provide a user-friendly error message
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(Map.of("status", "Error", "message", "Error getting data: " + e.getMessage()));
+		}
+	}
+
+	// To Get floor Data by buildings
+	@GetMapping("/getFloorDetails")
+	public ResponseEntity<Map<String, Object>> getFloorDetails(int building_id) {
+		try {
+			List<Map<String, Object>> data = buildingAssetService.getFloorDetails(building_id);
+			Map<String, Object> response = new HashMap<>();
+			if (data.size() != 0) {
+				response.put("status", "OK");
+				response.put("data", data);
+			} else {
+				response.put("status", "Failed");
+				response.put("data", "No Data Found");
 			}
 
+			return ResponseEntity.ok(response);
+		} catch (Exception e) {
+			// Log the exception details for debugging
+			e.printStackTrace();
+
+			// Provide a user-friendly error message
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(Map.of("status", "Error", "message", "Error getting data: " + e.getMessage()));
+		}
+	}
+
+	// For Room mapping --add room
+	/*
+	 * @PostMapping(value = "/saveRoom") public String saveRoom(@RequestBody
+	 * Map<String, Object> rooms) { try { int building_id = (int)
+	 * rooms.get("building_id"); int floors_id = (int) rooms.get("floors_id"); int
+	 * room_type = Integer.parseInt(rooms.get("room_type").toString());
+	 * 
+	 * String room_num = (String) rooms.get("room_num"); int school_id = (int)
+	 * rooms.get("school_id"); buildingAssetService.saveRoomDetails(room_type,
+	 * room_num, building_id, floors_id, school_id); return
+	 * "Rooms Mapped Sucessfully"; } catch (Exception e) { e.printStackTrace();
+	 * return "error"; } }
+	 */
+
+	// vishnu save
+	@PostMapping(value = "/saveRoom")
+	public String saveRoom(@RequestBody Map<String, Object> rooms) {
+		try {
+			int building_id = Integer.parseInt(rooms.get("building_id").toString());
+			int floors_id = Integer.parseInt(rooms.get("floors_id").toString());
+			int room_type = Integer.parseInt(rooms.get("room_type").toString());
+			String room_num = rooms.get("room_num").toString();
+			int school_id = Integer.parseInt(rooms.get("school_id").toString());
 			
-			// For Edit Room mapping
+			String anganwadiUniqueNumber = rooms.get("anganwadiUniqueNumber") != null 
+				    ? rooms.get("anganwadiUniqueNumber").toString().trim() 
+				    : null;
+			Boolean anganwadi_check = rooms.get("anganwadi_check") != null ? Boolean.parseBoolean(rooms.get("anganwadi_check").toString()) : null;
+
+			return buildingAssetService.roomDetails(room_type, room_num, building_id, floors_id,anganwadiUniqueNumber, anganwadi_check, school_id);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return "error";
+		}
+	}
+
+	// For Edit Room mapping
 //			@PostMapping(value = "/editRoom")
 //			public String editRoom(@RequestBody Map<String, Object> rooms) {
 //				try {
@@ -167,458 +170,398 @@ public class BuildingAssetController {
 //					return "error";
 //				}
 //			}
-			
-			//vishnu edit room
-			@PostMapping(value = "/editRoom")
-			public String editRoom(@RequestBody Map<String, Object> rooms) {
-			    try {
-			        if (rooms.get("room_id") == null ||
-			            rooms.get("building_id") == null ||
-			            rooms.get("floors_id") == null ||
-			            rooms.get("room_type") == null ||
-			            rooms.get("room_num") == null ||
-			            rooms.get("school_id") == null) {
-
-			            return "Missing required fields";
-			        }
-
-			        int room_id = Integer.parseInt(rooms.get("room_id").toString());
-			        int building_id = Integer.parseInt(rooms.get("building_id").toString());
-			        int floors_id = Integer.parseInt(rooms.get("floors_id").toString());
-			        int room_type = Integer.parseInt(rooms.get("room_type").toString());
-			        String room_num = rooms.get("room_num").toString();
-			        int school_id = Integer.parseInt(rooms.get("school_id").toString());
-
-			        buildingAssetService.editRoom(room_type, room_num, building_id, floors_id, school_id, room_id);
-			        return "Rooms Edited Sucessfully";
-			    } catch (Exception e) {
-			        e.printStackTrace();
-			        return "error";
-			    }
+
+	// vishnu edit room
+	@PostMapping(value = "/editRoom")
+	public String editRoom(@RequestBody Map<String, Object> rooms) {
+		try {
+			if (rooms.get("room_id") == null || rooms.get("building_id") == null || rooms.get("floors_id") == null
+					|| rooms.get("room_type") == null || rooms.get("room_num") == null
+					|| rooms.get("school_id") == null) {
+
+				return "Missing required fields";
 			}
 
+			int room_id = Integer.parseInt(rooms.get("room_id").toString());
+			int building_id = Integer.parseInt(rooms.get("building_id").toString());
+			int floors_id = Integer.parseInt(rooms.get("floors_id").toString());
+			int room_type = Integer.parseInt(rooms.get("room_type").toString());
+			String room_num = rooms.get("room_num").toString();
+			int school_id = Integer.parseInt(rooms.get("school_id").toString());
+			String anganwadiUniqueNumber = rooms.get("anganwadiUniqueNumber") != null 
+				    ? rooms.get("anganwadiUniqueNumber").toString().trim() 
+				    : null;
+			
+			Boolean anganwadi_check = rooms.get("anganwadi_check") != null ? Boolean.parseBoolean(rooms.get("anganwadi_check").toString()) : null;
 
+			return buildingAssetService.editRoomsById(room_type, room_num, building_id, floors_id, school_id,anganwadiUniqueNumber,anganwadi_check, room_id);
 			
-			// For Delete Room mapping
-			/*@PostMapping(value = "/deleteRoom")
-			public String deleteRoom(@RequestParam int room_id, @RequestParam boolean is_delete) {
-				try {
-//						// from assets
-//						List<Map<String, Object>> assets = buildingAssetService.getAssets(room_id);
-//						if(!assets.isEmpty()) {
-//							for(Map<String, Object> asset : assets) {
-//								
-//							}
-//						}
-					buildingAssetService.deleteRoom(room_id, is_delete);
-					return "Rooms Edited Sucessfully";
-				} catch (Exception e) {
-					e.printStackTrace();
-					return "error";
-				}
-			}*/
+		} catch (Exception e) {
+			e.printStackTrace();
+			return "error";
+		}
+	}
+
+	// For Delete Room mapping
+	/*
+	 * @PostMapping(value = "/deleteRoom") public String deleteRoom(@RequestParam
+	 * int room_id, @RequestParam boolean is_delete) { try { // // from assets //
+	 * List<Map<String, Object>> assets = buildingAssetService.getAssets(room_id);
+	 * // if(!assets.isEmpty()) { // for(Map<String, Object> asset : assets) { // //
+	 * } // } buildingAssetService.deleteRoom(room_id, is_delete); return
+	 * "Rooms Edited Sucessfully"; } catch (Exception e) { e.printStackTrace();
+	 * return "error"; } }
+	 */
 //vishnu
-					
-						@GetMapping("/getBuildingbyid")
-						public ResponseEntity<Map<String, Object>> getSimpleBuilding(@RequestParam int building_id) {
-						    try {
-						        Map<String, Object> building = buildingAssetService.getSimpleBuildingById(building_id);
-						        if (building != null) {
-						            return ResponseEntity.ok(Map.of("status", "OK", "data", building));
-						        } else {
-						            return ResponseEntity.status(HttpStatus.NOT_FOUND)
-						                    .body(Map.of("status", "Failed", "message", "Building not found"));
-						        }
-						    } catch (Exception e) {
-						        e.printStackTrace();
-						        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-						                .body(Map.of("status", "Error", "message", "Something went wrong"));
-						    }
-						}
-						@GetMapping("/getAllMaterials")
-						public ResponseEntity<Map<String, Object>> getAllMaterials() {
-						    try {
-						        Map<String, List<Map<String, Object>>> materials = buildingAssetService.getAllMaterials();
-
-						        return ResponseEntity.ok(Map.of(
-						            "status", "OK",
-						            "buildingMaterials", materials.get("buildingMaterials"),
-						            "roofMaterials", materials.get("roofMaterials")
-						        ));
-						    } catch (Exception e) {
-						        e.printStackTrace();
-						        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-						            .body(Map.of("status", "Error", "message", "Failed to load material data"));
-						    }
-						}
-						@GetMapping("/getFloorsByBuildingId")
-						public ResponseEntity<Map<String, Object>> getFloorsByBuildingId(@RequestParam int buildingId) {
-						    try {
-						        List<Map<String, Object>> floors = buildingAssetService.getFloorsByBuildingId(buildingId);
-
-						        return ResponseEntity.ok(Map.of(
-						            "status", "OK",
-						            "floors", floors
-						        ));
-						    } catch (Exception e) {
-						        e.printStackTrace();
-						        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-						            .body(Map.of("status", "Error", "message", "Could not load floor list"));
-						    }
-						}
-						@PostMapping(value = "/deleteBuilding")
-						public String deleteBuilding(@RequestParam int building_id, @RequestParam boolean is_delete) {
-							
-								return buildingAssetService.executeDelete(building_id, is_delete);
-							
-						}
-						@PostMapping(value = "/deleteRoom")
-						public String deleteRoom(@RequestParam int room_id, @RequestParam boolean is_delete) {
-							try {
-									// from assets
-								List<Integer> asset_ID= buildingAssetService.getassetRoomID(room_id);
-								List<Map<String, Object>> electrical_asset= buildingAssetService.getElectricalAssetMasterByRoomId(room_id);
-								List<Map<String, Object>> furniture_asset= buildingAssetService.getFurnitureAssetMasterByRoomId(room_id);
-								for(Integer it_details_id : asset_ID) {
-									buildingAssetService.unmapItAssetMaster(it_details_id);
-								}
-								/*
-								for(Map<String, Object> ele_data : electrical_asset) {
-									int school_id = (Integer) ele_data.get("school_id");
-									int sub_asset_id = (Integer) ele_data.get("sub_asset_id");
-									String assetType="electricalasset";
-									Map<String, Object> assetMaster = buildingAssetService.getAssetMasterBySchlId(sub_asset_id, school_id, assetType);
-									int mapped = assetMaster.get("mapped_qty") != null ? (Integer) assetMaster.get("mapped_qty") : 0;
-									int unMapped = assetMaster.get("unmapped_qty") != null ? (Integer) assetMaster.get("unmapped_qty") : 0;
-									int map = 0;
-									int unMap = unMapped+mapped;
-									buildingAssetService.updateAssetmaster(map, unMap, school_id, sub_asset_id, assetType);
-								}
-								for(Map<String, Object> fur_data : furniture_asset) {
-									int school_id = (Integer) fur_data.get("school_id");
-									int sub_asset_id = (Integer) fur_data.get("sub_asset_id");
-									String assetType="furnitureasset";
-									Map<String, Object> assetMaster = buildingAssetService.getAssetMasterBySchlId(sub_asset_id, school_id, assetType);
-									int mapped = assetMaster.get("mapped_qty") != null ? (Integer) assetMaster.get("mapped_qty") : 0;
-									int unMapped = assetMaster.get("unmapped_qty") != null ? (Integer) assetMaster.get("unmapped_qty") : 0;
-									int map = 0;
-									int unMap = unMapped+mapped;
-									buildingAssetService.updateAssetmaster(map, unMap, school_id, sub_asset_id, assetType);
-								}*/
-								for(Map<String, Object> ele_data : electrical_asset) {
-									int school_id = (Integer) ele_data.get("school_id");
-									int sub_asset_id = (Integer) ele_data.get("sub_asset_id");
-									int asset_qty = (Integer) ele_data.get("asset_qty");
-									String assetType="electricalasset";
-									Map<String, Object> assetMaster = buildingAssetService.getAssetMasterBySchlId(sub_asset_id, school_id, assetType);
-									int mapped = assetMaster.get("mapped_qty") != null ? (Integer) assetMaster.get("mapped_qty") : 0;
-									int unMapped = assetMaster.get("unmapped_qty") != null ? (Integer) assetMaster.get("unmapped_qty") : 0;
-									int map = mapped-asset_qty;
-									int unMap = unMapped+asset_qty;
-									buildingAssetService.updateAssetmaster(map, unMap, school_id, sub_asset_id, assetType);
-								}
-								for(Map<String, Object> fur_data : furniture_asset) {
-									int school_id = (Integer) fur_data.get("school_id");
-									int sub_asset_id = (Integer) fur_data.get("sub_asset_id");
-									int asset_qty = (Integer) fur_data.get("asset_qty");
-									String assetType="furnitureasset";
-									Map<String, Object> assetMaster = buildingAssetService.getAssetMasterBySchlId(sub_asset_id, school_id, assetType);
-									int mapped = assetMaster.get("mapped_qty") != null ? (Integer) assetMaster.get("mapped_qty") : 0;
-									int unMapped = assetMaster.get("unmapped_qty") != null ? (Integer) assetMaster.get("unmapped_qty") : 0;
-									int map = mapped-asset_qty;
-									int unMap = unMapped+asset_qty;
-									buildingAssetService.updateAssetmaster(map, unMap, school_id, sub_asset_id, assetType);
-								}
-								buildingAssetService.unmapAssets(room_id, is_delete);
-								buildingAssetService.deleteRoom(room_id, is_delete);
-								return "Rooms Edited Sucessfully";
-							} catch (Exception e) {
-								e.printStackTrace();
-								return "error";
-							}
-						}
-						
-						@PostMapping(value = "/editBuildings")
-						public String editBuilding(@RequestParam int building_id,
-								                    @RequestParam int floor_id) {
-
-							return buildingAssetService.editBuildings(building_id, floor_id);	
-						}
-						@PostMapping(value = "/addFloor")
-						public String addFloor(@RequestParam int building_id,
-								                    @RequestParam int exe_order) {
-							return buildingAssetService.addFloor(building_id, exe_order);
-						}
-						@PostMapping(value ="/updateBuilding")
-						public String updateBuilding(@RequestParam int building_id,
-								                      @RequestParam String building_name,
-								                      @RequestParam int total_floor,
-								                      @RequestParam String building_material,
-								                      @RequestParam String roof_material,
-								                      @RequestParam int school_id) {
-							try {
-								buildingAssetService.updateBuilding(building_id, building_name, total_floor, building_material, roof_material, school_id);
-								return "Success";
-							} catch (Exception e) {
-							e.printStackTrace();
-							return "Error";
-							}
-						}
-
-
-
-						@GetMapping("/getRoomDetails")
-						public ResponseEntity<Map<String, Object>> getRoomDetails(@RequestParam int school_id) {
-						    try {
-						        List<Map<String, Object>> data = buildingAssetService.getRoomDetailsBySchoolId(school_id);
-						        Map<String, Object> response = new HashMap<>();
-
-						        if (data != null && !data.isEmpty()) {
-						            response.put("status", "OK");
-						            response.put("data", data);
-						        } else {
-						            response.put("status", "Failed");
-						            response.put("data", "No Data Found");
-						        }
-
-						        return ResponseEntity.ok(response);
-						    } catch (Exception e) {
-						        e.printStackTrace();
-						        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-						                .body(Map.of("status", "Error", "message", "Error fetching room details: " + e.getMessage()));
-						    }
-						}
-						
-						@GetMapping("/getRoomById")
-						public ResponseEntity<Map<String, Object>> getRoomById(@RequestParam int room_id) {
-						    try {
-						        Map<String, Object> room = buildingAssetService.getRoomDetailsById(room_id);
-						        return ResponseEntity.ok(Map.of("status", "OK", "data", room));
-						    } catch (Exception e) {
-						        e.printStackTrace();
-						        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-						                .body(Map.of("status", "ERROR", "data", "Room not found"));
-						    }
-						}
-						
-						@GetMapping(value = "/getItAssetMapping") 
-						public ResponseEntity<Map<String, Object>> getItAssetMapping(int room_id, String assetType) {
-							Map<String, Object> response = new HashMap<>();
-							List<Map<String, Object>>  data = buildingAssetService.getItAssetMapping(room_id, assetType);
-							response.put("Status", "OK");
-							response.put("data", data);
-							return ResponseEntity.ok(response);
-							
-						}
-						
-						
-						@PostMapping(value = "/deleteAssetMapping") 
-						public ResponseEntity<Map<String, Object>> deleteAssetMapping(int it_map_id, boolean is_delete) {
-							Map<String, Object> response = new HashMap<>();
-							Map<String, Object> it_Details = buildingAssetService.getIt_Details(it_map_id);
-							int it_details_id = (Integer) it_Details.get("it_details_id");
-							String  data = buildingAssetService.deleteAssetMapping(it_map_id, is_delete);
-							   buildingAssetService.unmapItAssetMaster(it_details_id);
-							response.put("status", "Sucess");
-							response.put("data", data);
-							return ResponseEntity.ok(response);
-							
-						}
-						
-						// For update assets
-						@PostMapping(value = "/updateassets")
-						public String updateassets(@RequestBody List<Map<String, Object>> assets) {
-							return buildingAssetService.updateAssetExecution(assets);
-						}
-						
-						
-						
-						@GetMapping(value = "/getSchoolAsset")
-						public ResponseEntity<Map<String, Object>> getSchoolAsset(@RequestParam int school_id,
-								                                                  @RequestParam String type) {
-							Map<String, Object> response = new HashMap<>();
-							List<Map<String, Object>> data = buildingAssetService.getSchoolAsset(school_id, type);
-							if(!data.isEmpty()) {
-								response.put("status", "Success");
-								response.put("data", data);
-							} else {
-								response.put("status", "Error");
-							}
-							return ResponseEntity.ok(response);
-						}
-						
-						
-						@PostMapping(value = "/mapAssets")
-						public String mapAssets(@RequestBody List<Map<String, Object>> assets) {
-							try {
-							for(Map<String, Object> asset : assets) {
-								int room_id = Integer.parseInt(asset.get("room_id").toString());
-								int floor_id = Integer.parseInt(asset.get("floor_id").toString());
-								int school_id = Integer.parseInt(asset.get("school_id").toString());
-								int it_details_id = Integer.parseInt(asset.get("it_details_id").toString());
-								int building_id = Integer.parseInt(asset.get("building_id").toString());
-								  buildingAssetService.mapAssets(room_id, floor_id, school_id, it_details_id, building_id);	
-							} 
-							return "Success";
-							} catch (Exception e) {
-								e.printStackTrace();
-								return "Error";
-							}
-							
-							}
-						
-						@PostMapping (value="/addFurAsset")
-						public String addFurAsset(@RequestParam int sub_asset_id,
-								                   @RequestParam int asset_qty,
-								                   @RequestParam int room_id,
-								                   @RequestParam int building_id,
-								                   @RequestParam int floor_id,
-								                   @RequestParam int school_id,
-								                   @RequestParam String assetType) {
-							
-							return buildingAssetService.assetUpdation(asset_qty, assetType, sub_asset_id, school_id, room_id,building_id, floor_id);	
-							}
-						
-						
-						// Asset Management
-						
-						@GetMapping(value = "/getAssetManagement")
-						public ResponseEntity<Map<String, Object>> getSchoolAssetForManagement(@RequestParam int school_id) {
-							Map<String, Object> response = new HashMap<>();
-							List<Map<String, Object>> data = buildingAssetService.getSchoolAssetForManagement(school_id);
-							if(!data.isEmpty()) {
-								response.put("status", "Sucess");
-								response.put("data", data);
-							} else {
-								response.put("status", "Error");
-							}
-							return ResponseEntity.ok(response);
-						}
-						
-						@PostMapping(value = "/addAsset")
-						public String addAsset(@RequestParam String code,
-								               @RequestParam String name,
-								               @RequestParam String source,
-								               @RequestParam String serialNum,
-								               @RequestParam String vendorDetail,
-								               @RequestParam String invoice_num,
-								               @RequestParam String udise,
-								               @RequestParam boolean is_online,
-								               @RequestParam int school_id) {
-							try {
-								int count = buildingAssetService.getAssetCount(udise, is_online);
-						String assetCode="";
-						if(count>=0) {
-							String series = String.format("%04d", count+1);
-							String school = String.format("%03d", school_id);
-							assetCode = code+school+series;
-							
-							
-						} else {
-							return "Error";
-						}
-								return  buildingAssetService.addAsset(assetCode, name, source, serialNum, vendorDetail, invoice_num, udise, is_online);	
-							 
-							
-							} catch (Exception e) {
-								e.printStackTrace();
-								return "Error";
-							}
-							
-							}
-						
-						@GetMapping (value ="/getAssets")
-						public ResponseEntity<Map<String, Object>> getAssets(@RequestParam int it_details_id) {
-							Map<String, Object> response = new HashMap<>();
-							Map<String, Object> data = buildingAssetService.getAssets(it_details_id);
-							if(!data.isEmpty()) {
-								response.put("status", "Success");
-								response.put("data", data);
-							} else {
-								response.put("Status", "Error");
-							}
-							return ResponseEntity.ok(response);
-						}
-	
-						@PostMapping(value = "/editAsset")
-						public String editAsset(@RequestParam String assetCode,
-								               @RequestParam String name,
-								               @RequestParam String source,
-								               @RequestParam String serialNum,
-								               @RequestParam String vendorDetail,
-								               @RequestParam String invoice_num,
-								               @RequestParam int it_details_id) {
-							try {
-						
-								return  buildingAssetService.editAsset(assetCode, name, source, serialNum, vendorDetail, invoice_num, it_details_id);	
-							 
-							
-							} catch (Exception e) {
-								e.printStackTrace();
-								return "Error";
-							}
-							
-							}
-
-						@GetMapping("/getStudentStrengthBySchoolId")
-					    public ResponseEntity<Map<String, Object>> getStudentStrengthBySchoolId(@RequestParam int schoolId) {
-					        try {
-					            List<Map<String, Object>> studentStrength = buildingAssetService.getStudentStrengthBySchoolId(schoolId);
-					            
-					            
-					            if(!studentStrength.isEmpty()) {
-					            	return ResponseEntity.ok(Map.of("status", "OK","studentStrength", studentStrength));
-					            }
-					            else {
-					            	return ResponseEntity.ok(Map.of("status", "NEW","studentStrength", studentStrength));					            					            	
-					            }
-					            
-					        } catch (Exception e) {
-					            e.printStackTrace();
-					            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-					                .body(Map.of("status", "Error", "message", "Could not load student strength data"));
-					        }
-					    }
-						
-						@GetMapping("/getotherdetailsBySchoolId")
-					    public ResponseEntity<Map<String, Object>> getotherdetailsBySchoolId(@RequestParam int schoolId) {
-					        try {
-					            List<Map<String, Object>> getotherdetailsBySchool = buildingAssetService.getotherdetailsBySchoolId(schoolId);
-					            
-					            
-					            if(!getotherdetailsBySchool.isEmpty()) {
-					            	return ResponseEntity.ok(Map.of("status", "OK","otherdetailsBySchool", getotherdetailsBySchool));
-					            }
-					            else {
-					            	return ResponseEntity.ok(Map.of("status", "NEW","otherdetailsBySchool", getotherdetailsBySchool));					            					            	
-					            }
-					            
-					        } catch (Exception e) {
-					            e.printStackTrace();
-					            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-					                .body(Map.of("status", "Error", "message", "Could not load student strength data"));
-					        }
-					    }
-						
-						@GetMapping("/getStaffStrengthBySchoolId")
-					    public ResponseEntity<Map<String, Object>> getStaffStrengthBySchoolId(@RequestParam int schoolId) {
-					        try {
-					            List<Map<String, Object>> staffStrength = buildingAssetService.getStaffStrengthBySchoolId(schoolId);
-					            
-					            
-					            if(!staffStrength.isEmpty()) {
-					            	return ResponseEntity.ok(Map.of("status", "OK","staffStrength", staffStrength));
-					            }
-					            else {
-					            	return ResponseEntity.ok(Map.of("status", "NEW","staffStrength", staffStrength));					            					            	
-					            }
-					            
-					        } catch (Exception e) {
-					            e.printStackTrace();
-					            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-					                .body(Map.of("status", "Error", "message", "Could not load student strength data"));
-					        }
-					    }
-
-	
+
+	@GetMapping("/getBuildingbyid")
+	public ResponseEntity<Map<String, Object>> getSimpleBuilding(@RequestParam int building_id) {
+		try {
+			Map<String, Object> building = buildingAssetService.getSimpleBuildingById(building_id);
+			if (building != null) {
+				return ResponseEntity.ok(Map.of("status", "OK", "data", building));
+			} else {
+				return ResponseEntity.status(HttpStatus.NOT_FOUND)
+						.body(Map.of("status", "Failed", "message", "Building not found"));
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(Map.of("status", "Error", "message", "Something went wrong"));
+		}
+	}
+
+	@GetMapping("/getAllMaterials")
+	public ResponseEntity<Map<String, Object>> getAllMaterials() {
+		try {
+			Map<String, List<Map<String, Object>>> materials = buildingAssetService.getAllMaterials();
+
+			return ResponseEntity.ok(Map.of("status", "OK", "buildingMaterials", materials.get("buildingMaterials"),
+					"roofMaterials", materials.get("roofMaterials")));
+		} catch (Exception e) {
+			e.printStackTrace();
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(Map.of("status", "Error", "message", "Failed to load material data"));
+		}
+	}
+
+	@GetMapping("/getFloorsByBuildingId")
+	public ResponseEntity<Map<String, Object>> getFloorsByBuildingId(@RequestParam int buildingId) {
+		try {
+			List<Map<String, Object>> floors = buildingAssetService.getFloorsByBuildingId(buildingId);
+
+			return ResponseEntity.ok(Map.of("status", "OK", "floors", floors));
+		} catch (Exception e) {
+			e.printStackTrace();
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(Map.of("status", "Error", "message", "Could not load floor list"));
+		}
+	}
+
+	@PostMapping(value = "/deleteBuilding")
+	public String deleteBuilding(@RequestParam int building_id, @RequestParam boolean is_delete) {
+
+		return buildingAssetService.executeDelete(building_id, is_delete);
+
+	}
+
+	@PostMapping(value = "/deleteRoom")
+	public String deleteRoom(@RequestParam int room_id, @RequestParam boolean is_delete) {
+		try {
+			// from assets
+			List<Integer> asset_ID = buildingAssetService.getassetRoomID(room_id);
+			List<Map<String, Object>> electrical_asset = buildingAssetService.getElectricalAssetMasterByRoomId(room_id);
+			List<Map<String, Object>> furniture_asset = buildingAssetService.getFurnitureAssetMasterByRoomId(room_id);
+			for (Integer it_details_id : asset_ID) {
+				buildingAssetService.unmapItAssetMaster(it_details_id);
+			}
+			for (Map<String, Object> ele_data : electrical_asset) {
+				int school_id = (Integer) ele_data.get("school_id");
+				int sub_asset_id = (Integer) ele_data.get("sub_asset_id");
+				int asset_qty = (Integer) ele_data.get("asset_qty");
+				String assetType = "electricalasset";
+				Map<String, Object> assetMaster = buildingAssetService.getAssetMasterBySchlId(sub_asset_id, school_id,
+						assetType);
+				int mapped = assetMaster.get("mapped_qty") != null ? (Integer) assetMaster.get("mapped_qty") : 0;
+				int unMapped = assetMaster.get("unmapped_qty") != null ? (Integer) assetMaster.get("unmapped_qty") : 0;
+				int map = mapped - asset_qty;
+				int unMap = unMapped + asset_qty;
+				buildingAssetService.updateAssetmaster(map, unMap, school_id, sub_asset_id, assetType);
+			}
+			for (Map<String, Object> fur_data : furniture_asset) {
+				int school_id = (Integer) fur_data.get("school_id");
+				int sub_asset_id = (Integer) fur_data.get("sub_asset_id");
+				int asset_qty = (Integer) fur_data.get("asset_qty");
+				String assetType = "furnitureasset";
+				Map<String, Object> assetMaster = buildingAssetService.getAssetMasterBySchlId(sub_asset_id, school_id,
+						assetType);
+				int mapped = assetMaster.get("mapped_qty") != null ? (Integer) assetMaster.get("mapped_qty") : 0;
+				int unMapped = assetMaster.get("unmapped_qty") != null ? (Integer) assetMaster.get("unmapped_qty") : 0;
+				int map = mapped - asset_qty;
+				int unMap = unMapped + asset_qty;
+				buildingAssetService.updateAssetmaster(map, unMap, school_id, sub_asset_id, assetType);
+			}
+			buildingAssetService.unmapAssets(room_id, is_delete);
+			buildingAssetService.deleteRoom(room_id, is_delete);
+			return "Rooms Edited Sucessfully";
+		} catch (Exception e) {
+			e.printStackTrace();
+			return "error";
+		}
+	}
+
+	@PostMapping(value = "/editBuildings")
+	public String editBuilding(@RequestParam int building_id, @RequestParam int floor_id) {
+
+		return buildingAssetService.editBuildings(building_id, floor_id);
+	}
+
+	@PostMapping(value = "/addFloor")
+	public String addFloor(@RequestParam int building_id, @RequestParam int exe_order) {
+		return buildingAssetService.addFloor(building_id, exe_order);
+	}
+
+	@PostMapping(value = "/updateBuilding")
+	public String updateBuilding(@RequestParam int building_id, @RequestParam String building_name,
+			@RequestParam int total_floor, @RequestParam String building_material, @RequestParam String roof_material,
+			@RequestParam int school_id) {
+		try {
+			buildingAssetService.updateBuilding(building_id, building_name, total_floor, building_material,
+					roof_material, school_id);
+			return "Success";
+		} catch (Exception e) {
+			e.printStackTrace();
+			return "Error";
+		}
+	}
+
+	@GetMapping("/getRoomDetails")
+	public ResponseEntity<Map<String, Object>> getRoomDetails(@RequestParam int school_id) {
+		try {
+			List<Map<String, Object>> data = buildingAssetService.getRoomDetailsBySchoolId(school_id);
+			Map<String, Object> response = new HashMap<>();
+
+			if (data != null && !data.isEmpty()) {
+				response.put("status", "OK");
+				response.put("data", data);
+			} else {
+				response.put("status", "Failed");
+				response.put("data", "No Data Found");
+			}
+
+			return ResponseEntity.ok(response);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(Map.of("status", "Error", "message", "Error fetching room details: " + e.getMessage()));
+		}
+	}
+
+	@GetMapping("/getRoomById")
+	public ResponseEntity<Map<String, Object>> getRoomById(@RequestParam int room_id) {
+		try {
+			Map<String, Object> room = buildingAssetService.getRoomDetailsById(room_id);
+			return ResponseEntity.ok(Map.of("status", "OK", "data", room));
+		} catch (Exception e) {
+			e.printStackTrace();
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(Map.of("status", "ERROR", "data", "Room not found"));
+		}
+	}
+
+	@GetMapping(value = "/getItAssetMapping")
+	public ResponseEntity<Map<String, Object>> getItAssetMapping(int room_id, String assetType) {
+		Map<String, Object> response = new HashMap<>();
+		List<Map<String, Object>> data = buildingAssetService.getItAssetMapping(room_id, assetType);
+		response.put("Status", "OK");
+		response.put("data", data);
+		return ResponseEntity.ok(response);
+
+	}
+
+	@PostMapping(value = "/deleteAssetMapping")
+	public ResponseEntity<Map<String, Object>> deleteAssetMapping(int it_map_id, boolean is_delete) {
+		Map<String, Object> response = new HashMap<>();
+		Map<String, Object> it_Details = buildingAssetService.getIt_Details(it_map_id);
+		int it_details_id = (Integer) it_Details.get("it_details_id");
+		String data = buildingAssetService.deleteAssetMapping(it_map_id, is_delete);
+		buildingAssetService.unmapItAssetMaster(it_details_id);
+		response.put("status", "Sucess");
+		response.put("data", data);
+		return ResponseEntity.ok(response);
+
+	}
+
+	// For update assets
+	@PostMapping(value = "/updateassets")
+	public String updateassets(@RequestBody List<Map<String, Object>> assets) {
+		return buildingAssetService.updateAssetExecution(assets);
+	}
+
+	@GetMapping(value = "/getSchoolAsset")
+	public ResponseEntity<Map<String, Object>> getSchoolAsset(@RequestParam int school_id, @RequestParam String type) {
+		Map<String, Object> response = new HashMap<>();
+		List<Map<String, Object>> data = buildingAssetService.getSchoolAsset(school_id, type);
+		if (!data.isEmpty()) {
+			response.put("status", "Success");
+			response.put("data", data);
+		} else {
+			response.put("status", "Error");
+		}
+		return ResponseEntity.ok(response);
+	}
+
+	@PostMapping(value = "/mapAssets")
+	public String mapAssets(@RequestBody List<Map<String, Object>> assets) {
+		try {
+			for (Map<String, Object> asset : assets) {
+				int room_id = Integer.parseInt(asset.get("room_id").toString());
+				int floor_id = Integer.parseInt(asset.get("floor_id").toString());
+				int school_id = Integer.parseInt(asset.get("school_id").toString());
+				int it_details_id = Integer.parseInt(asset.get("it_details_id").toString());
+				int building_id = Integer.parseInt(asset.get("building_id").toString());
+				buildingAssetService.mapAssets(room_id, floor_id, school_id, it_details_id, building_id);
+			}
+			return "Success";
+		} catch (Exception e) {
+			e.printStackTrace();
+			return "Error";
+		}
+
+	}
+
+	@PostMapping(value = "/addFurAsset")
+	public String addFurAsset(@RequestParam int sub_asset_id, @RequestParam int asset_qty, @RequestParam int room_id,
+			@RequestParam int building_id, @RequestParam int floor_id, @RequestParam int school_id,
+			@RequestParam String assetType) {
+
+		return buildingAssetService.assetUpdation(asset_qty, assetType, sub_asset_id, school_id, room_id, building_id,
+				floor_id);
+	}
+
+	// Asset Management
+
+	@GetMapping(value = "/getAssetManagement")
+	public ResponseEntity<Map<String, Object>> getSchoolAssetForManagement(@RequestParam int school_id) {
+		Map<String, Object> response = new HashMap<>();
+		List<Map<String, Object>> data = buildingAssetService.getSchoolAssetForManagement(school_id);
+		if (!data.isEmpty()) {
+			response.put("status", "Sucess");
+			response.put("data", data);
+		} else {
+			response.put("status", "Error");
+		}
+		return ResponseEntity.ok(response);
+	}
+
+	@PostMapping(value = "/addAsset")
+	public String addAsset(@RequestParam String code, @RequestParam String name, @RequestParam String source,
+			@RequestParam String serialNum, @RequestParam String vendorDetail, @RequestParam String invoice_num,
+			@RequestParam String udise, @RequestParam boolean is_online, @RequestParam int school_id) {
+		try {
+			int count = buildingAssetService.getAssetCount(udise, is_online);
+			String assetCode = "";
+			if (count >= 0) {
+				String series = String.format("%04d", count + 1);
+				String school = String.format("%03d", school_id);
+				assetCode = code + school + series;
+
+			} else {
+				return "Error";
+			}
+			return buildingAssetService.addAsset(assetCode, name, source, serialNum, vendorDetail, invoice_num, udise,
+					is_online);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			return "Error";
+		}
+
+	}
+
+	@GetMapping(value = "/getAssets")
+	public ResponseEntity<Map<String, Object>> getAssets(@RequestParam int it_details_id) {
+		Map<String, Object> response = new HashMap<>();
+		Map<String, Object> data = buildingAssetService.getAssets(it_details_id);
+		if (!data.isEmpty()) {
+			response.put("status", "Success");
+			response.put("data", data);
+		} else {
+			response.put("Status", "Error");
+		}
+		return ResponseEntity.ok(response);
+	}
+
+	@PostMapping(value = "/editAsset")
+	public String editAsset(@RequestParam String assetCode, @RequestParam String name, @RequestParam String source,
+			@RequestParam String serialNum, @RequestParam String vendorDetail, @RequestParam String invoice_num,
+			@RequestParam int it_details_id) {
+		try {
+
+			return buildingAssetService.editAsset(assetCode, name, source, serialNum, vendorDetail, invoice_num,
+					it_details_id);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			return "Error";
+		}
+
+	}
+
+	@GetMapping("/getStudentStrengthBySchoolId")
+	public ResponseEntity<Map<String, Object>> getStudentStrengthBySchoolId(@RequestParam int schoolId) {
+		try {
+			List<Map<String, Object>> studentStrength = buildingAssetService.getStudentStrengthBySchoolId(schoolId);
+
+			if (!studentStrength.isEmpty()) {
+				return ResponseEntity.ok(Map.of("status", "OK", "studentStrength", studentStrength));
+			} else {
+				return ResponseEntity.ok(Map.of("status", "NEW", "studentStrength", studentStrength));
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(Map.of("status", "Error", "message", "Could not load student strength data"));
+		}
+	}
+
+	@GetMapping("/getotherdetailsBySchoolId")
+	public ResponseEntity<Map<String, Object>> getotherdetailsBySchoolId(@RequestParam int schoolId) {
+		try {
+			List<Map<String, Object>> getotherdetailsBySchool = buildingAssetService
+					.getotherdetailsBySchoolId(schoolId);
+
+			if (!getotherdetailsBySchool.isEmpty()) {
+				return ResponseEntity.ok(Map.of("status", "OK", "otherdetailsBySchool", getotherdetailsBySchool));
+			} else {
+				return ResponseEntity.ok(Map.of("status", "NEW", "otherdetailsBySchool", getotherdetailsBySchool));
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(Map.of("status", "Error", "message", "Could not load student strength data"));
+		}
+	}
+
+	@GetMapping("/getStaffStrengthBySchoolId")
+	public ResponseEntity<Map<String, Object>> getStaffStrengthBySchoolId(@RequestParam int schoolId) {
+		try {
+			List<Map<String, Object>> staffStrength = buildingAssetService.getStaffStrengthBySchoolId(schoolId);
+			List<Map<String, Object>> special_category = buildingAssetService.getSpecialCategoryBySchoolId(schoolId);
+
+			if (!staffStrength.isEmpty()) {
+				return ResponseEntity.ok(Map.of("status", "OK", "staffStrength", staffStrength,"special_category",special_category));
+			} else {
+				return ResponseEntity.ok(Map.of("status", "NEW", "staffStrength", staffStrength,"special_category",special_category));
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(Map.of("status", "Error", "message", "Could not load student strength data"));
+		}
+	}
+
 }
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/school/Controller/DropdownsController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/school/Controller/DropdownsController.java
index 4924313..b3a5456 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/school/Controller/DropdownsController.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/school/Controller/DropdownsController.java
@@ -17,483 +17,484 @@ import org.springframework.web.bind.annotation.RestController;
 
 import in.gov.chennaicorporation.gccoffice.school.Service.DropdownsService;
 
-
 @RestController
 @RequestMapping("/gcc/api/gccschool/dropdown")
 public class DropdownsController {
 	@Autowired
 	private DropdownsService dropdownsService;
-	
-	
-	 @Autowired
-	    public DropdownsController(DropdownsService dropdownsService) {
-	        this.dropdownsService = dropdownsService;
-	    }
-	 
+
+	@Autowired
+	public DropdownsController(DropdownsService dropdownsService) {
+		this.dropdownsService = dropdownsService;
+	}
+
 	// To Get Court Dropdown Data
-		@GetMapping("/getCourtData")
-		public ResponseEntity<Map<String, Object>> getCourtData() {
-			try {
-				List<Map<String, Object>> data = dropdownsService.getCourtData();
-				Map<String, Object> response = new HashMap<>();
-				if (data.size() != 0) {
-					response.put("status", "OK");
-					response.put("data", data);
-				} else {
-					response.put("status", "Failed");
-					response.put("data", "No Data Found");
-				}
-				return ResponseEntity.ok(response);
-			} catch (Exception e) {
-				// Log the exception details for debugging
-				e.printStackTrace();
-
-				// Provide a user-friendly error message
-				return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-						.body(Map.of("status", "Error", "message", "Error getting data: " + e.getMessage()));
+	@GetMapping("/getCourtData")
+	public ResponseEntity<Map<String, Object>> getCourtData() {
+		try {
+			List<Map<String, Object>> data = dropdownsService.getCourtData();
+			Map<String, Object> response = new HashMap<>();
+			if (data.size() != 0) {
+				response.put("status", "OK");
+				response.put("data", data);
+			} else {
+				response.put("status", "Failed");
+				response.put("data", "No Data Found");
+			}
+			return ResponseEntity.ok(response);
+		} catch (Exception e) {
+			// Log the exception details for debugging
+			e.printStackTrace();
+
+			// Provide a user-friendly error message
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(Map.of("status", "Error", "message", "Error getting data: " + e.getMessage()));
+		}
+	}
+
+	// To Get Equipmengt Dropdown Data
+	@GetMapping("/getEquipmentData")
+	public ResponseEntity<Map<String, Object>> getEquipmentData() {
+		try {
+			List<Map<String, Object>> data = dropdownsService.getEquipmentData();
+			Map<String, Object> response = new HashMap<>();
+			if (data.size() != 0) {
+				response.put("status", "OK");
+				response.put("data", data);
+			} else {
+				response.put("status", "Failed");
+				response.put("data", "No Data Found");
+			}
+			return ResponseEntity.ok(response);
+		} catch (Exception e) {
+			// Log the exception details for debugging
+			e.printStackTrace();
+
+			// Provide a user-friendly error message
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(Map.of("status", "Error", "message", "Error getting data: " + e.getMessage()));
+		}
+	}
+
+	// To Get Building Material Dropdown Data
+	@GetMapping("/getBuildingMaterial")
+	public ResponseEntity<Map<String, Object>> getBuildingMaterial() {
+		try {
+			List<Map<String, Object>> data = dropdownsService.getBuildingMaterial();
+			Map<String, Object> response = new HashMap<>();
+			if (data.size() != 0) {
+				response.put("status", "OK");
+				response.put("data", data);
+			} else {
+				response.put("status", "Failed");
+				response.put("data", "No Data Found");
+			}
+			return ResponseEntity.ok(response);
+		} catch (Exception e) {
+			// Log the exception details for debugging
+			e.printStackTrace();
+
+			// Provide a user-friendly error message
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(Map.of("status", "Error", "message", "Error getting data: " + e.getMessage()));
+		}
+	}
+
+	// To Get Roof Material Dropdown Data
+	@GetMapping("/getRoofMaterial")
+	public ResponseEntity<Map<String, Object>> getRoofMaterial() {
+		try {
+			List<Map<String, Object>> data = dropdownsService.getRoofMaterial();
+			Map<String, Object> response = new HashMap<>();
+			if (data.size() != 0) {
+				response.put("status", "OK");
+				response.put("data", data);
+			} else {
+				response.put("status", "Failed");
+				response.put("data", "No Data Found");
+			}
+			return ResponseEntity.ok(response);
+		} catch (Exception e) {
+			// Log the exception details for debugging
+			e.printStackTrace();
+
+			// Provide a user-friendly error message
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(Map.of("status", "Error", "message", "Error getting data: " + e.getMessage()));
+		}
+	}
+
+	// To Get Water Source Dropdown Data
+	@GetMapping("/getWaterSource")
+	public ResponseEntity<Map<String, Object>> getWaterSource() {
+		try {
+			List<Map<String, Object>> data = dropdownsService.getWaterSource();
+			Map<String, Object> response = new HashMap<>();
+			if (data.size() != 0) {
+				response.put("status", "OK");
+				response.put("data", data);
+			} else {
+				response.put("status", "Failed");
+				response.put("data", "No Data Found");
+			}
+			return ResponseEntity.ok(response);
+		} catch (Exception e) {
+			// Log the exception details for debugging
+			e.printStackTrace();
+
+			// Provide a user-friendly error message
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(Map.of("status", "Error", "message", "Error getting data: " + e.getMessage()));
+		}
+	}
+
+	// To Get Water Storage Dropdown Data
+	@GetMapping("/getWaterStorage")
+	public ResponseEntity<Map<String, Object>> getWaterStorage() {
+		try {
+			List<Map<String, Object>> data = dropdownsService.getWaterStorage();
+			Map<String, Object> response = new HashMap<>();
+			if (data.size() != 0) {
+				response.put("status", "OK");
+				response.put("data", data);
+			} else {
+				response.put("status", "Failed");
+				response.put("data", "No Data Found");
+			}
+			return ResponseEntity.ok(response);
+		} catch (Exception e) {
+			// Log the exception details for debugging
+			e.printStackTrace();
+
+			// Provide a user-friendly error message
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(Map.of("status", "Error", "message", "Error getting data: " + e.getMessage()));
+		}
+	}
+
+	// To Get Rooms Dropdown Data
+	@GetMapping("/getRooms")
+	public ResponseEntity<Map<String, Object>> getRooms() {
+		try {
+			List<Map<String, Object>> data = dropdownsService.getRooms();
+			Map<String, Object> response = new HashMap<>();
+			if (data.size() != 0) {
+				response.put("status", "OK");
+				response.put("data", data);
+			} else {
+				response.put("status", "Failed");
+				response.put("data", "No Data Found");
+			}
+			return ResponseEntity.ok(response);
+		} catch (Exception e) {
+			// Log the exception details for debugging
+			e.printStackTrace();
+
+			// Provide a user-friendly error message
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(Map.of("status", "Error", "message", "Error getting data: " + e.getMessage()));
+		}
+	}
+
+	@GetMapping("/getFloorsByBuilding")
+	public ResponseEntity<Map<String, Object>> getFloorsByBuilding(@RequestParam("building_id") int buildingId) {
+		try {
+			List<Map<String, Object>> data = dropdownsService.getFloorsByBuilding(buildingId);
+			Map<String, Object> response = new HashMap<>();
+			if (!data.isEmpty()) {
+				response.put("status", "OK");
+				response.put("data", data);
+			} else {
+				response.put("status", "Failed");
+				response.put("data", "No floors found for the selected building.");
 			}
+			return ResponseEntity.ok(response);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(Map.of("status", "Error", "message", "Failed to fetch floors."));
+		}
+	}
+
+	@GetMapping("/getBuildingsBySchoolId")
+	public ResponseEntity<Map<String, Object>> getBuildingsBySchoolId(@RequestParam int school_id) {
+		try {
+			List<Map<String, Object>> data = dropdownsService.getBuildingsBySchoolId(school_id);
+			Map<String, Object> response = new HashMap<>();
+			if (!data.isEmpty()) {
+				response.put("status", "OK");
+				response.put("data", data);
+			} else {
+				response.put("status", "Failed");
+				response.put("data", "No buildings found for the selected school.");
+			}
+			return ResponseEntity.ok(response);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(Map.of("status", "Error", "message", "Failed to fetch buildings."));
+		}
+	}
+
+	@GetMapping("/getDropdownValues")
+	public List<Map<String, Object>> getDropdownValues(@RequestParam String user_id) {
+		List<Map<String, Object>> resultList = new ArrayList<>();
+		Map<String, Object> response = new HashMap<>();
+
+		String schoolId = dropdownsService.getSchoolId(user_id);
+		if (schoolId == null || schoolId.trim().isEmpty() || schoolId.equalsIgnoreCase("error")) {
+			response.put("Message", "Failure");
+			response.put("Data", List.of());
+			resultList.add(response);
+			return resultList;
+		}
+
+		List<Map<String, Object>> udiseData = dropdownsService.getUdiseNumbersBySchoolId(schoolId);
+		if (!udiseData.isEmpty()) {
+			List<String> udiseList = udiseData.stream().map(m -> (String) m.get("udise")).collect(Collectors.toList());
+
+			response.put("Message", "Success");
+			response.put("Data", udiseList);
+		} else {
+			response.put("Message", "No Data Found");
+			response.put("Data", List.of());
 		}
 
-		
-		// To Get Equipmengt Dropdown Data
-		@GetMapping("/getEquipmentData")
-		public ResponseEntity<Map<String, Object>> getEquipmentData() {
-			try {
-				List<Map<String, Object>> data = dropdownsService.getEquipmentData();
-				Map<String, Object> response = new HashMap<>();
-				if (data.size() != 0) {
-					response.put("status", "OK");
-					response.put("data", data);
-				} else {
-					response.put("status", "Failed");
-					response.put("data", "No Data Found");
-				}
-				return ResponseEntity.ok(response);
-			} catch (Exception e) {
-				// Log the exception details for debugging
-				e.printStackTrace();
-
-				// Provide a user-friendly error message
-				return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-						.body(Map.of("status", "Error", "message", "Error getting data: " + e.getMessage()));
+		resultList.add(response);
+		return resultList;
+	}
+
+	@GetMapping("/getCategoryValues")
+	public List<Map<String, Object>> getCategoryValues(@RequestParam String user_id) {
+		List<Map<String, Object>> resultList = new ArrayList<>();
+		Map<String, Object> response = new HashMap<>();
+
+		String schoolId = dropdownsService.getSchoolId(user_id);
+		if (schoolId == null || schoolId.trim().isEmpty() || schoolId.equalsIgnoreCase("error")) {
+			response.put("Message", "Failure");
+			response.put("Data", List.of());
+			resultList.add(response);
+			return resultList;
+		}
+
+		List<Map<String, Object>> categoryData = dropdownsService.getCategoryBySchoolId(schoolId);
+		if (!categoryData.isEmpty()) {
+			List<String> categoryList = categoryData.stream().map(m -> (String) m.get("category"))
+					.collect(Collectors.toList());
+
+			response.put("Message", "Success");
+			response.put("Data", categoryList);
+		} else {
+			response.put("Message", "No Data Found");
+			response.put("Data", List.of());
+		}
+
+		resultList.add(response);
+		return resultList;
+	}
+
+	@GetMapping("/getZoneValues")
+	public List<Map<String, Object>> getZoneValues(@RequestParam String user_id) {
+		List<Map<String, Object>> resultList = new ArrayList<>();
+		Map<String, Object> response = new HashMap<>();
+
+		String schoolId = dropdownsService.getSchoolId(user_id);
+		if (schoolId == null || schoolId.trim().isEmpty() || schoolId.equalsIgnoreCase("error")) {
+			response.put("Message", "Failure");
+			response.put("Data", List.of());
+			resultList.add(response);
+			return resultList;
+		}
+
+		List<Map<String, Object>> zoneData = dropdownsService.getZoneBySchoolId(schoolId);
+		if (!zoneData.isEmpty()) {
+			List<String> zoneList = zoneData.stream().map(m -> (String) m.get("zone")).collect(Collectors.toList());
+
+			response.put("Message", "Success");
+			response.put("Data", zoneList);
+		} else {
+			response.put("Message", "No Data Found");
+			response.put("Data", List.of());
+		}
+
+		resultList.add(response);
+		return resultList;
+	}
+
+	@GetMapping("/getwardValues")
+	public List<Map<String, Object>> getWardValues(@RequestParam String user_id) {
+		List<Map<String, Object>> resultList = new ArrayList<>();
+		Map<String, Object> response = new HashMap<>();
+
+		String schoolId = dropdownsService.getSchoolId(user_id);
+		if (schoolId == null || schoolId.trim().isEmpty() || schoolId.equalsIgnoreCase("error")) {
+			response.put("Message", "Failure");
+			response.put("Data", List.of());
+			resultList.add(response);
+			return resultList;
+		}
+
+		List<Map<String, Object>> wardData = dropdownsService.getWardBySchoolId(schoolId);
+		if (!wardData.isEmpty()) {
+			List<String> wardList = wardData.stream().map(m -> (String) m.get("division")).collect(Collectors.toList());
+
+			response.put("Message", "Success");
+			response.put("Data", wardList);
+		} else {
+			response.put("Message", "No Data Found");
+			response.put("Data", List.of());
+		}
+
+		resultList.add(response);
+		return resultList;
+	}
+
+	@GetMapping("/getAllDropdownValues")
+	public ResponseEntity<?> getAllDropdownValues(@RequestParam String user_id, @RequestParam String type) {
+		Map<String, Object> response = new HashMap<>();
+		List<String> dropdownList = Collections.emptyList();
+
+		// First get school_id(s) for this user
+		String schoolId = dropdownsService.getSchoolId(user_id);
+
+		if (schoolId.equals("error")) {
+			response.put("Message", "Failed to fetch school ID");
+			response.put("Data", dropdownList);
+			return ResponseEntity.ok(Collections.singletonList(response));
+		}
+
+		try {
+			List<Map<String, Object>> rawData;
+
+			switch (type.toLowerCase()) {
+			case "udise":
+				rawData = dropdownsService.getUdiseNumbersBySchoolId(schoolId);
+				dropdownList = rawData.stream().map(map -> String.valueOf(map.get("udise")))
+						.collect(Collectors.toList());
+				break;
+			case "category":
+				rawData = dropdownsService.getCategoryBySchoolId(schoolId);
+				dropdownList = rawData.stream().map(map -> String.valueOf(map.get("category"))).distinct()
+						.collect(Collectors.toList());
+				break;
+			case "zone":
+				rawData = dropdownsService.getZoneBySchoolId(schoolId);
+				dropdownList = rawData.stream().map(map -> String.valueOf(map.get("zone"))).distinct()
+						.collect(Collectors.toList());
+				break;
+			case "ward":
+				rawData = dropdownsService.getWardBySchoolId(schoolId);
+				dropdownList = rawData.stream().map(map -> String.valueOf(map.get("division"))).distinct()
+						.collect(Collectors.toList());
+				break;
+			default:
+				response.put("Message", "Invalid dropdown type");
+				response.put("Data", dropdownList);
+				return ResponseEntity.badRequest().body(Collections.singletonList(response));
 			}
+
+			response.put("Message", "Success");
+			response.put("Data", dropdownList);
+			return ResponseEntity.ok(Collections.singletonList(response));
+		} catch (Exception e) {
+			e.printStackTrace();
+			response.put("Message", "Error while processing dropdown values");
+			response.put("Data", dropdownList);
+			return ResponseEntity.ok(Collections.singletonList(response));
 		}
-		
-		
-		// To Get Building Material Dropdown Data
-		@GetMapping("/getBuildingMaterial")
-		public ResponseEntity<Map<String, Object>> getBuildingMaterial() {
-			try {
-				List<Map<String, Object>> data = dropdownsService.getBuildingMaterial();
-				Map<String, Object> response = new HashMap<>();
-				if (data.size() != 0) {
-					response.put("status", "OK");
-					response.put("data", data);
-				} else {
-					response.put("status", "Failed");
-					response.put("data", "No Data Found");
-				}
-				return ResponseEntity.ok(response);
-			} catch (Exception e) {
-				// Log the exception details for debugging
-				e.printStackTrace();
-
-				// Provide a user-friendly error message
-				return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-						.body(Map.of("status", "Error", "message", "Error getting data: " + e.getMessage()));
+	}
+
+	// To Get Asset Types Data
+	@GetMapping("/getAssetType")
+	public ResponseEntity<Map<String, Object>> getAssetType() {
+		try {
+			List<Map<String, Object>> data = dropdownsService.getAssetType();
+			Map<String, Object> response = new HashMap<>();
+			if (data.size() != 0) {
+				response.put("status", "OK");
+				response.put("data", data);
+			} else {
+				response.put("status", "Failed");
+				response.put("data", "No Data Found");
 			}
+			return ResponseEntity.ok(response);
+		} catch (Exception e) {
+			// Log the exception details for debugging
+			e.printStackTrace();
+
+			// Provide a user-friendly error message
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(Map.of("status", "Error", "message", "Error getting data: " + e.getMessage()));
 		}
-				
-		// To Get Roof Material Dropdown Data
-		@GetMapping("/getRoofMaterial")
-		public ResponseEntity<Map<String, Object>> getRoofMaterial() {
-			try {
-				List<Map<String, Object>> data = dropdownsService.getRoofMaterial();
-				Map<String, Object> response = new HashMap<>();
-				if (data.size() != 0) {
-					response.put("status", "OK");
-					response.put("data", data);
-				} else {
-					response.put("status", "Failed");
-					response.put("data", "No Data Found");
-				}
-				return ResponseEntity.ok(response);
-			} catch (Exception e) {
-				// Log the exception details for debugging
-				e.printStackTrace();
-
-				// Provide a user-friendly error message
-				return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-						.body(Map.of("status", "Error", "message", "Error getting data: " + e.getMessage()));
+	}
+
+	// To Get Sub Asset Types Data
+	@GetMapping("/getSubAssetType")
+	public ResponseEntity<Map<String, Object>> getSubAssetType(int assetid) {
+		try {
+			List<Map<String, Object>> data = dropdownsService.getSubAssetType(assetid);
+			Map<String, Object> response = new HashMap<>();
+			if (data.size() != 0) {
+				response.put("status", "OK");
+				response.put("data", data);
+			} else {
+				response.put("status", "Failed");
+				response.put("data", "No Data Found");
 			}
+			return ResponseEntity.ok(response);
+		} catch (Exception e) {
+
+			e.printStackTrace();
+
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(Map.of("status", "Error", "message", "Error getting data: " + e.getMessage()));
 		}
-		
-		// To Get Water Source Dropdown Data
-		@GetMapping("/getWaterSource")
-		public ResponseEntity<Map<String, Object>> getWaterSource() {
-			try {
-				List<Map<String, Object>> data = dropdownsService.getWaterSource();
-				Map<String, Object> response = new HashMap<>();
-				if (data.size() != 0) {
-					response.put("status", "OK");
-					response.put("data", data);
-				} else {
-					response.put("status", "Failed");
-					response.put("data", "No Data Found");
-				}
-				return ResponseEntity.ok(response);
-			} catch (Exception e) {
-				// Log the exception details for debugging
-				e.printStackTrace();
-
-				// Provide a user-friendly error message
-				return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-						.body(Map.of("status", "Error", "message", "Error getting data: " + e.getMessage()));
+	}
+
+	@GetMapping("/getSplSubAssetType")
+	public ResponseEntity<Map<String, Object>> getSplSubAssetType(int school_id, int assetid) {
+		try {
+			List<String> assets = dropdownsService.getAssetList(school_id, assetid);
+			List<Map<String, Object>> data = dropdownsService.getSplSubAssetType(assets, assetid);
+			Map<String, Object> response = new HashMap<>();
+			if (data.size() != 0) {
+				response.put("status", "OK");
+				response.put("data", data);
+			} else {
+				response.put("status", "Failed");
+				response.put("data", "No Data Found");
 			}
+			return ResponseEntity.ok(response);
+		} catch (Exception e) {
+
+			e.printStackTrace();
+
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(Map.of("status", "Error", "message", "Error getting data: " + e.getMessage()));
 		}
-		
-		// To Get Water Storage Dropdown Data
-		@GetMapping("/getWaterStorage")
-		public ResponseEntity<Map<String, Object>> getWaterStorage() {
-			try {
-				List<Map<String, Object>> data = dropdownsService.getWaterStorage();
-				Map<String, Object> response = new HashMap<>();
-				if (data.size() != 0) {
-					response.put("status", "OK");
-					response.put("data", data);
-				} else {
-					response.put("status", "Failed");
-					response.put("data", "No Data Found");
-				}
-				return ResponseEntity.ok(response);
-			} catch (Exception e) {
-				// Log the exception details for debugging
-				e.printStackTrace();
-
-				// Provide a user-friendly error message
-				return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-						.body(Map.of("status", "Error", "message", "Error getting data: " + e.getMessage()));
+	}
+	
+	@GetMapping("/getSpecialCategory")
+	public ResponseEntity<Map<String, Object>> getSpecialCategory() {
+		try {
+			List<Map<String, Object>> data = dropdownsService.getSpecialCategory();
+			Map<String, Object> response = new HashMap<>();
+			if (data.size() != 0) {
+				response.put("status", "OK");
+				response.put("data", data);
+			} else {
+				response.put("status", "Failed");
+				response.put("data", "No Data Found");
 			}
+			return ResponseEntity.ok(response);
+		} catch (Exception e) {
+			// Log the exception details for debugging
+			e.printStackTrace();
+
+			// Provide a user-friendly error message
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(Map.of("status", "Error", "message", "Error getting data: " + e.getMessage()));
 		}
-		
-		
-		// To Get Rooms Dropdown Data
-				@GetMapping("/getRooms")
-				public ResponseEntity<Map<String, Object>> getRooms() {
-					try {
-						List<Map<String, Object>> data = dropdownsService.getRooms();
-						Map<String, Object> response = new HashMap<>();
-						if (data.size() != 0) {
-							response.put("status", "OK");
-							response.put("data", data);
-						} else {
-							response.put("status", "Failed");
-							response.put("data", "No Data Found");
-						}
-						return ResponseEntity.ok(response);
-					} catch (Exception e) {
-						// Log the exception details for debugging
-						e.printStackTrace();
-
-						// Provide a user-friendly error message
-						return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-								.body(Map.of("status", "Error", "message", "Error getting data: " + e.getMessage()));
-					}
-				}
-				
-				@GetMapping("/getFloorsByBuilding")
-				public ResponseEntity<Map<String, Object>> getFloorsByBuilding(@RequestParam("building_id") int buildingId) {
-				    try {
-				        List<Map<String, Object>> data = dropdownsService.getFloorsByBuilding(buildingId);
-				        Map<String, Object> response = new HashMap<>();
-				        if (!data.isEmpty()) {
-				            response.put("status", "OK");
-				            response.put("data", data);
-				        } else {
-				            response.put("status", "Failed");
-				            response.put("data", "No floors found for the selected building.");
-				        }
-				        return ResponseEntity.ok(response);
-				    } catch (Exception e) {
-				        e.printStackTrace();
-				        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-				                .body(Map.of("status", "Error", "message", "Failed to fetch floors."));
-				    }
-				}
-				
-				@GetMapping("/getBuildingsBySchoolId")
-				public ResponseEntity<Map<String, Object>> getBuildingsBySchoolId(@RequestParam int school_id) {
-				    try {
-				        List<Map<String, Object>> data = dropdownsService.getBuildingsBySchoolId(school_id);
-				        Map<String, Object> response = new HashMap<>();
-				        if (!data.isEmpty()) {
-				            response.put("status", "OK");
-				            response.put("data", data);
-				        } else {
-				            response.put("status", "Failed");
-				            response.put("data", "No buildings found for the selected school.");
-				        }
-				        return ResponseEntity.ok(response);
-				    } catch (Exception e) {
-				        e.printStackTrace();
-				        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-				                .body(Map.of("status", "Error", "message", "Failed to fetch buildings."));
-				    }
-				}
-				@GetMapping("/getDropdownValues")
-				public List<Map<String, Object>> getDropdownValues(@RequestParam String user_id) {
-				    List<Map<String, Object>> resultList = new ArrayList<>();
-				    Map<String, Object> response = new HashMap<>();
-
-				    String schoolId = dropdownsService.getSchoolId(user_id); 
-				    if (schoolId == null || schoolId.trim().isEmpty() || schoolId.equalsIgnoreCase("error")) {
-				        response.put("Message", "Failure");
-				        response.put("Data", List.of());
-				        resultList.add(response);
-				        return resultList;
-				    }
-
-				    List<Map<String, Object>> udiseData = dropdownsService.getUdiseNumbersBySchoolId(schoolId);
-				    if (!udiseData.isEmpty()) {
-				        List<String> udiseList = udiseData.stream()
-				                                          .map(m -> (String) m.get("udise"))
-				                                          .collect(Collectors.toList());
-
-				        response.put("Message", "Success");
-				        response.put("Data", udiseList);
-				    } else {
-				        response.put("Message", "No Data Found");
-				        response.put("Data", List.of());
-				    }
-
-				    resultList.add(response);
-				    return resultList;
-				}
-				
-				@GetMapping("/getCategoryValues")
-				public List<Map<String, Object>> getCategoryValues(@RequestParam String user_id) {
-				    List<Map<String, Object>> resultList = new ArrayList<>();
-				    Map<String, Object> response = new HashMap<>();
-
-				    String schoolId = dropdownsService.getSchoolId(user_id); 
-				    if (schoolId == null || schoolId.trim().isEmpty() || schoolId.equalsIgnoreCase("error")) {
-				        response.put("Message", "Failure");
-				        response.put("Data", List.of());
-				        resultList.add(response);
-				        return resultList;
-				    }
-
-				    List<Map<String, Object>> categoryData = dropdownsService.getCategoryBySchoolId(schoolId);
-				    if (!categoryData.isEmpty()) {
-				        List<String> categoryList = categoryData.stream()
-				                                          .map(m -> (String) m.get("category"))
-				                                          .collect(Collectors.toList());
-
-				        response.put("Message", "Success");
-				        response.put("Data", categoryList);
-				    } else {
-				        response.put("Message", "No Data Found");
-				        response.put("Data", List.of());
-				    }
-
-				    resultList.add(response);
-				    return resultList;
-				}
-
-				@GetMapping("/getZoneValues")
-				public List<Map<String, Object>> getZoneValues(@RequestParam String user_id) {
-				    List<Map<String, Object>> resultList = new ArrayList<>();
-				    Map<String, Object> response = new HashMap<>();
-
-				    String schoolId = dropdownsService.getSchoolId(user_id); 
-				    if (schoolId == null || schoolId.trim().isEmpty() || schoolId.equalsIgnoreCase("error")) {
-				        response.put("Message", "Failure");
-				        response.put("Data", List.of());
-				        resultList.add(response);
-				        return resultList;
-				    }
-
-				    List<Map<String, Object>> zoneData = dropdownsService.getZoneBySchoolId(schoolId);
-				    if (!zoneData.isEmpty()) {
-				        List<String> zoneList = zoneData.stream()
-				                                          .map(m -> (String) m.get("zone"))
-				                                          .collect(Collectors.toList());
-
-				        response.put("Message", "Success");
-				        response.put("Data", zoneList);
-				    } else {
-				        response.put("Message", "No Data Found");
-				        response.put("Data", List.of());
-				    }
-
-				    resultList.add(response);
-				    return resultList;
-				}
-
-				
-				@GetMapping("/getwardValues")
-				public List<Map<String, Object>> getWardValues(@RequestParam String user_id) {
-				    List<Map<String, Object>> resultList = new ArrayList<>();
-				    Map<String, Object> response = new HashMap<>();
-
-				    String schoolId = dropdownsService.getSchoolId(user_id); 
-				    if (schoolId == null || schoolId.trim().isEmpty() || schoolId.equalsIgnoreCase("error")) {
-				        response.put("Message", "Failure");
-				        response.put("Data", List.of());
-				        resultList.add(response);
-				        return resultList;
-				    }
-
-				    List<Map<String, Object>> wardData = dropdownsService.getWardBySchoolId(schoolId);
-				    if (!wardData.isEmpty()) {
-				        List<String> wardList = wardData.stream()
-				                                          .map(m -> (String) m.get("division"))
-				                                          .collect(Collectors.toList());
-
-				        response.put("Message", "Success");
-				        response.put("Data", wardList);
-				    } else {
-				        response.put("Message", "No Data Found");
-				        response.put("Data", List.of());
-				    }
-
-				    resultList.add(response);
-				    return resultList;
-				}
-				
-				
-
-			    @GetMapping("/getAllDropdownValues")
-			    public ResponseEntity<?> getAllDropdownValues(@RequestParam String user_id, @RequestParam String type) {
-			        Map<String, Object> response = new HashMap<>();
-			        List<String> dropdownList = Collections.emptyList();
-
-			        // First get school_id(s) for this user
-			        String schoolId = dropdownsService.getSchoolId(user_id);
-
-			        if (schoolId.equals("error")) {
-			            response.put("Message", "Failed to fetch school ID");
-			            response.put("Data", dropdownList);
-			            return ResponseEntity.ok(Collections.singletonList(response));
-			        }
-
-			        try {
-			            List<Map<String, Object>> rawData;
-
-			            switch (type.toLowerCase()) {
-			                case "udise":
-			                    rawData = dropdownsService.getUdiseNumbersBySchoolId(schoolId);
-			                    dropdownList = rawData.stream()
-			                        .map(map -> String.valueOf(map.get("udise")))
-			                        .collect(Collectors.toList());
-			                    break;
-			                case "category":
-			                    rawData = dropdownsService.getCategoryBySchoolId(schoolId);
-			                    dropdownList = rawData.stream()
-			                        .map(map -> String.valueOf(map.get("category")))
-			                        .distinct()
-			                        .collect(Collectors.toList());
-			                    break;
-			                case "zone":
-			                    rawData = dropdownsService.getZoneBySchoolId(schoolId);
-			                    dropdownList = rawData.stream()
-			                        .map(map -> String.valueOf(map.get("zone")))
-			                        .distinct()
-			                        .collect(Collectors.toList());
-			                    break;
-			                case "ward":
-			                    rawData = dropdownsService.getWardBySchoolId(schoolId);
-			                    dropdownList = rawData.stream()
-			                        .map(map -> String.valueOf(map.get("division")))
-			                        .distinct()
-			                        .collect(Collectors.toList());
-			                    break;
-			                default:
-			                    response.put("Message", "Invalid dropdown type");
-			                    response.put("Data", dropdownList);
-			                    return ResponseEntity.badRequest().body(Collections.singletonList(response));
-			            }
-
-			            response.put("Message", "Success");
-			            response.put("Data", dropdownList);
-			            return ResponseEntity.ok(Collections.singletonList(response));
-			        } catch (Exception e) {
-			            e.printStackTrace();
-			            response.put("Message", "Error while processing dropdown values");
-			            response.put("Data", dropdownList);
-			            return ResponseEntity.ok(Collections.singletonList(response));
-			        }
-			    }
-
-			 // To Get Asset Types Data
-				@GetMapping("/getAssetType")
-				public ResponseEntity<Map<String, Object>> getAssetType() {
-					try {
-						List<Map<String, Object>> data = dropdownsService.getAssetType();
-						Map<String, Object> response = new HashMap<>();
-						if (data.size() != 0) {
-							response.put("status", "OK");
-							response.put("data", data);
-						} else {
-							response.put("status", "Failed");
-							response.put("data", "No Data Found");
-						}
-						return ResponseEntity.ok(response);
-					} catch (Exception e) {
-						// Log the exception details for debugging
-						e.printStackTrace();
-
-						// Provide a user-friendly error message
-						return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-								.body(Map.of("status", "Error", "message", "Error getting data: " + e.getMessage()));
-					}
-				}
-				
-				
-				// To Get Sub Asset Types Data
-				@GetMapping("/getSubAssetType")
-				public ResponseEntity<Map<String, Object>> getSubAssetType(int assetid) {
-					try {
-						List<Map<String, Object>> data = dropdownsService.getSubAssetType(assetid);
-						Map<String, Object> response = new HashMap<>();
-						if (data.size() != 0) {
-							response.put("status", "OK");
-							response.put("data", data);
-						} else {
-							response.put("status", "Failed");
-							response.put("data", "No Data Found");
-						}
-						return ResponseEntity.ok(response);
-					} catch (Exception e) {
-
-						e.printStackTrace();
-
-						return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-								.body(Map.of("status", "Error", "message", "Error getting data: " + e.getMessage()));
-					}
-				}
-				
-				@GetMapping("/getSplSubAssetType")
-				public ResponseEntity<Map<String, Object>> getSplSubAssetType(int school_id, int assetid) {
-					try {
-						List<String> assets = dropdownsService.getAssetList(school_id, assetid);
-						List<Map<String, Object>> data = dropdownsService.getSplSubAssetType(assets, assetid);
-						Map<String, Object> response = new HashMap<>();
-						if (data.size() != 0) {
-							response.put("status", "OK");
-							response.put("data", data);
-						} else {
-							response.put("status", "Failed");
-							response.put("data", "No Data Found");
-						}
-						return ResponseEntity.ok(response);
-					} catch (Exception e) {
-
-						e.printStackTrace();
-
-						return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-								.body(Map.of("status", "Error", "message", "Error getting data: " + e.getMessage()));
-					}
-				}
+	}
 
 }
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/school/Controller/MainController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/school/Controller/MainController.java
index 96d52de..91287fe 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/school/Controller/MainController.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/school/Controller/MainController.java
@@ -16,60 +16,56 @@ public class MainController {
 
 		return "modules/school/otherdetails";
 	}
+
 	@GetMapping("/schooldetails")
 	public String viewschool(Model model) {
 		return "modules/school/schooldetails";
 	}
+
 	@GetMapping("/schoolmodule")
 	public String viewmodule(Model model) {
-		String loginUserId = LoginUserInfo.getLoginUserId(); 
-	    model.addAttribute("user_id", loginUserId); 
-	    System.out.println("loginUserId..........."+loginUserId);
+		String loginUserId = LoginUserInfo.getLoginUserId();
+		model.addAttribute("user_id", loginUserId);
+		System.out.println("loginUserId..........." + loginUserId);
 		return "modules/school/dashboard";
-	}	
-	 @GetMapping("/staffdetails")
-	    public String staffdetails(Model model) {
-	        return "modules/school/staffdetails";
-	    }
-	 
-	 @GetMapping("/roomassets")
-		public String roomassets(Model model) {
-		 
-			return "modules/school/roomassets";
-		}
-	 
-	 @GetMapping("/assetmanagement")
-		public String assetmanagement(Model model) {
-		 
-			return "modules/school/assetmanagement";
-		}
-	 
-//	 @GetMapping("/itassets")
-//		public String itassets(Model model) {
-//		 
-//		 System.out.println("okokokok===");
-//		 
-//			return "modules/school/itassets";
-//		}
-	 
+	}
+
+	@GetMapping("/staffdetails")
+	public String staffdetails(Model model) {
+		return "modules/school/staffdetails";
+	}
+
+	@GetMapping("/roomassets")
+	public String roomassets(Model model) {
+
+		return "modules/school/roomassets";
+	}
+
+	@GetMapping("/assetmanagement")
+	public String assetmanagement(Model model) {
+
+		return "modules/school/assetmanagement";
+	}
+
+
 	@GetMapping("/studentdetails")
 	public String studentdetails(Model model) {
 
 		return "modules/school/studentdetails";
 	}
-	
+
 	@GetMapping("/building")
 	public String buildings(Model model) {
 
 		return "modules/school/building";
 	}
+
 	@GetMapping("/room")
 	public String roomlist(Model model) {
 
 		return "modules/school/room";
 	}
 
-
 	@GetMapping("/playground")
 	public String playground(Model model) {
 
@@ -88,7 +84,6 @@ public class MainController {
 		return "modules/school/toilets";
 	}
 
-
 //	@GetMapping("/electricalassets")
 //	public String electricalassets(Model model) {
 //
@@ -100,28 +95,46 @@ public class MainController {
 //
 //		return "modules/school/furnitureassets";
 //	}
-	
+
 	@GetMapping("/kitchen")
 	public String kitchen(Model model) {
 
 		return "modules/school/kitchen";
 	}
-	
+
 	@GetMapping("/addelectricalasset")
 	public String addelectricalasset(Model model) {
-	 
+
 		return "modules/school/addelectricalasset";
 	}
- 
+
 	@GetMapping("/addfurnitureasset")
 	public String addfurnitureasset(Model model) {
-	 
+
 		return "modules/school/addfurnitureasset";
 	}
- 
-	 @GetMapping("/reports")
-	 public String reportpage(Model model) {
-	 	 
-	 	return "modules/school/reports";
-	 }
+	@GetMapping("/reports")
+	public String reportpage(Model model) {
+	 
+		return "modules/school/reports";
+	}
+	
+	@GetMapping("/studentregistration")
+	public String studentRegistrationPage() {
+		
+		return "modules/school/studentregister";
+	}
+	
+	@GetMapping("/aeoschoolentry/aeolist")
+	public String viewaeolist(Model model) {
+	 
+		return "modules/school/reportfolder/aeolist";
+	}
+	
+
+	@GetMapping("/aeoschoolentry/aeoallschools")
+	public String viewaeoallschools(Model model) {
+	 
+		return "modules/school/reportfolder/aeoallschools";
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/school/Controller/SchoolPropertyController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/school/Controller/SchoolPropertyController.java
index 10ef794..7a85deb 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/school/Controller/SchoolPropertyController.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/school/Controller/SchoolPropertyController.java
@@ -61,7 +61,7 @@ public class SchoolPropertyController {
 //   For Other Details	
 	@PostMapping(value = "/saveSchoolBuildupArea")
 	public String saveSchoolBuildupArea(@RequestParam("land_area") Double land_area,
-			@RequestParam("buildup_area") Double buildup_area, @RequestParam("is_compound") Boolean is_compound,
+			@RequestParam("buildup_area") Double buildup_area, @RequestParam("is_compound") int is_compound,
 			@RequestParam("is_nameboard") Boolean is_nameboard, @RequestParam("is_pasystem") Boolean is_pasystem,
 			@RequestParam("is_bell") Boolean is_bell, @RequestParam("is_generator") Boolean is_generator,
 			@RequestParam("school_id") int school_id) {
@@ -74,9 +74,9 @@ public class SchoolPropertyController {
 	@PostMapping(value = "/saveStudentStrength")
 	public String saveStudentStrength(@RequestParam("total_students") int total_students,
 			@RequestParam("total_girls") int total_girls, @RequestParam("total_boys") int total_boys,
-			@RequestParam("others") int others, @RequestParam("school_id") int school_id) {
+			@RequestParam("others") int others, @RequestParam("special_child") int special_child,@RequestParam("school_id") int school_id) {
 
-		return schoolPropertyService.saveStudentStrength(total_students, total_girls, total_boys, others, school_id);
+		return schoolPropertyService.saveStudentStrength(total_students, total_girls, total_boys, others,special_child, school_id);
 	}
 
 //  For Staff Strength	
@@ -104,38 +104,66 @@ public class SchoolPropertyController {
 
 //  For Toilets	
 	@PostMapping(value = "/saveToilets")
-	public String saveToilets(@RequestParam("total_toiletBlocks") int total_toiletBlocks,
+	public String saveToilets(@RequestParam(value = "total_toiletBlocks", required = false) Integer total_toiletBlocks,
 			@RequestParam("total_male_urinals") int total_male_urinals,
+			@RequestParam("total_female_urinals") int total_female_urinals,
+			@RequestParam("staff_male_toilets") int staff_male_toilets,
+			@RequestParam("staff_female_toilets") int staff_female_toilets,
 			@RequestParam("total_wc_male") int total_wc_male, @RequestParam("total_wc_female") int total_wc_female,
 			@RequestParam("total_diffAbled_toilet") int total_diffAbled_toilet,
 			@RequestParam("is_napkins") Boolean is_napkins, @RequestParam("school_id") int school_id) {
 
-		return schoolPropertyService.saveToilets(total_toiletBlocks, total_male_urinals, total_wc_male, total_wc_female,
+		return schoolPropertyService.saveToilets(total_toiletBlocks, total_male_urinals, total_female_urinals,staff_male_toilets,staff_female_toilets,total_wc_male, total_wc_female,
 				total_diffAbled_toilet, is_napkins, school_id);
 	}
 
 //  For Kitchen	
 	@PostMapping(value = "/saveKitchen")
-	public String saveKitchen(@RequestParam(value = "is_cmbfs") Boolean is_cmbfs,
-			@RequestParam(value = "is_cmbfsIndividual", required = false) Boolean is_cmbfsIndividual,
-			@RequestParam(value = "is_noonmeal") Boolean is_noonmeal,
-			@RequestParam(value = "is_noonIndividual", required = false) Boolean is_noonIndividual,
-			@RequestParam(value = "is_vegGarden", required = false) Boolean is_vegGarden,
-			@RequestParam(value = "is_anganwadi") Boolean is_anganwadi,
-			@RequestParam(value = "anganwadi_unique", required = false) String anganwadi_unique,
-			@RequestParam(value = "is_anganwadiIndividual", required = false) Boolean is_anganwadiIndividual,
-			@RequestParam(value = "school_id") int school_id) {
-
-		if (anganwadi_unique != null && anganwadi_unique.trim().isEmpty()) {
-			anganwadi_unique = null;
-		}
+	public ResponseEntity<Map<String, String>> saveKitchen(@RequestBody Map<String, Object> payload) {
+		Map<String, String> response = new HashMap<>();
+		try {
+			Boolean is_cmbfs = payload.get("is_cmbfs") != null ? Boolean.parseBoolean(payload.get("is_cmbfs").toString()) : null;
+			Boolean is_cmbfsIndividual = payload.get("is_cmbfsIndividual") != null ? Boolean.parseBoolean(payload.get("is_cmbfsIndividual").toString()) : null;
+			Boolean is_noonmeal = payload.get("is_noonmeal") != null ? Boolean.parseBoolean(payload.get("is_noonmeal").toString()) : null;
+			Boolean is_noonIndividual = payload.get("is_noonIndividual") != null ? Boolean.parseBoolean(payload.get("is_noonIndividual").toString()) : null;
+			Boolean is_vegGarden = payload.get("is_vegGarden") != null ? Boolean.parseBoolean(payload.get("is_vegGarden").toString()) : null;
+			Boolean is_anganwadi = payload.get("is_anganwadi") != null ? Boolean.parseBoolean(payload.get("is_anganwadi").toString()) : null;
+
+		List<Map<String, Object>> anganwadi = (List<Map<String, Object>>) payload.get("anganwadi");
+		
+		//System.out.println("anganwadi="+ anganwadi);
+ 
+		int school_id = Integer.parseInt(payload.get("school_id").toString());
+		
 
-		return schoolPropertyService.saveKitchen(is_cmbfs, is_cmbfsIndividual, is_noonmeal, is_noonIndividual,
-				is_vegGarden, is_anganwadi, anganwadi_unique, is_anganwadiIndividual, school_id);
+		int kitchen_id =  schoolPropertyService.saveKitchen(is_cmbfs, is_cmbfsIndividual, is_noonmeal, is_noonIndividual,
+				is_vegGarden, is_anganwadi, school_id);
+		
+		if(is_anganwadi) {
+			for(Map<String, Object> data:anganwadi) {
+				//System.out.println("hi");
+				String anganwadi_unique = data.get("anganwadi_unique")!= null ? data.get("anganwadi_unique").toString() : null;											
+				Boolean is_anganwadiIndividual = data.get("is_anganwadiIndividual") != null ? Boolean.parseBoolean(data.get("is_anganwadiIndividual").toString()) : null;
+				//System.out.printf(anganwadi_unique,is_anganwadiIndividual);
+				schoolPropertyService.saveAnganwadi(anganwadi_unique, is_anganwadiIndividual, kitchen_id, school_id);
+				schoolPropertyService.updateAnganwadiCheck(anganwadi_unique, school_id);
+			}
+		}
+		
+		response.put("status", "OK");
+		response.put("message", "Kitchen Details saved successfully");
+		return ResponseEntity.ok(response);
+		
+		}catch (Exception e) {
+			e.printStackTrace();
+			response.put("status", "ERROR");
+			response.put("message", "Failed to save Kitchen details");
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
+		}
 	}
 
 //  For Playground	
-	@PostMapping(value = "/savePlayground")
+	/*@PostMapping(value = "/savePlayground")
 	public ResponseEntity<Map<String, String>> savePlayground(@RequestBody Map<String, Object> payload) {
 		Map<String, String> response = new HashMap<>();
 		try {
@@ -173,10 +201,56 @@ public class SchoolPropertyController {
 			response.put("message", "Failed to save playground details");
 			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
 		}
+	}*/
+	@PostMapping("/savePlayground")
+	public ResponseEntity<Map<String, String>> savePlayground(@RequestBody Map<String, Object> payload) {
+	    Map<String, String> response = new HashMap<>();
+	    try {
+	        Boolean is_playground = (Boolean) payload.get("is_playground");
+	        Double playground_area = Double.valueOf(payload.get("playground_area").toString());
+	        Boolean is_court = (Boolean) payload.get("is_court");
+	        int school_id = Integer.parseInt(payload.get("school_id").toString());
+
+	        List<String> equipmentidRaw = (List<String>) payload.get("equipmentid");
+	        List<String> courtidRaw = (List<String>) payload.get("courtid");
+
+	        int playground_id = schoolPropertyService.savePlayground(is_playground, playground_area, is_court, school_id);
+
+	        boolean insertedAny = false;
+
+	        for (String equipment_id : equipmentidRaw) {
+	            if (schoolPropertyService.saveEquipmentDetails(equipment_id, school_id, playground_id)) {
+	                insertedAny = true;
+	            }
+	        }
+
+	        for (String court_id : courtidRaw) {
+	            if (schoolPropertyService.saveCourtDetails(court_id, school_id, playground_id)) {
+	                insertedAny = true;
+	            }
+	        }
+
+	        if (insertedAny) {
+	            response.put("status", "OK");
+	            response.put("message", "Playground and related details saved successfully");
+	        } else {
+	            response.put("status", "SKIPPED");
+	            response.put("message", "No new data inserted; records already exist");
+	        }
+
+	        return ResponseEntity.ok(response);
+
+	    } catch (Exception e) {
+	        e.printStackTrace();
+	        response.put("status", "ERROR");
+	        response.put("message", "Failed to save playground details");
+	        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
+	    }
 	}
 
+//initial
 	// For Drinking Water
-	@PostMapping(value = "/saveDrinkingWater")
+	/*@PostMapping(value = "/saveDrinkingWater")
 	public ResponseEntity<Map<String, Object>> saveDrinkingWater(@RequestBody Map<String, Object> requestData) {
 		try {
 			// Extract data from the map
@@ -217,25 +291,142 @@ public class SchoolPropertyController {
 			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
 					.body(Map.of("status", "Error", "message", "Error saving data: " + e.getMessage()));
 		}
+	}*/
+	@PostMapping("/saveDrinkingWater")
+	public ResponseEntity<Map<String, Object>> saveDrinkingWater(@RequestBody Map<String, Object> requestData) {
+	    Map<String, Object> response = new HashMap<>();
+	    try {
+	        int schoolId = Integer.parseInt(requestData.get("school_id").toString());
+
+	        // Check if data already exists for the school
+	        boolean exists = schoolPropertyService.existsDrinkingWaterData(schoolId);
+
+	        if (exists) {
+	            // If data exists, respond with SKIPPED status and message
+	            response.put("status", "SKIPPED");
+	            response.put("message", "Data already exists for this school. Insert skipped.");
+	            return ResponseEntity.ok(response);
+	        }
+
+	        // If no existing data, proceed with your save logic
+	        List<Map<String, Object>> water = (List<Map<String, Object>>) requestData.get("water");
+	        Boolean is_purifier = "1".equals(requestData.get("is_purifier"));
+	        Double purifier_capacity = requestData.get("purifier_capacity") != null
+	                ? Double.valueOf(requestData.get("purifier_capacity").toString())
+	                : null;
+	        Boolean is_borewell = "1".equals(requestData.get("is_borewell"));
+	        Integer borewell_count = requestData.get("borewell_count") != null
+	                ? Integer.valueOf(requestData.get("borewell_count").toString())
+	                : null;
+	        
+	        int drinkingwater_tap = requestData.get("drinkingwater_tap") != null
+	                ? Integer.valueOf(requestData.get("drinkingwater_tap").toString())
+	                : null;
+	        int handwash_tap = requestData.get("handwash_tap") != null
+	                ? Integer.valueOf(requestData.get("handwash_tap").toString())
+	                : null;
+
+	        Boolean is_storage = "1".equals(requestData.get("is_storage"));
+	        List<Map<String, Object>> storage = (List<Map<String, Object>>) requestData.get("storage");
+/*
+	        int drinking_water_id = schoolPropertyService.saveDrinkingWater(is_purifier, purifier_capacity, is_borewell,
+	                borewell_count, is_storage, schoolId);
+	      */
+	        int drinking_water_id = schoolPropertyService.saveDrinkingWater(is_purifier, purifier_capacity, is_borewell,
+	                borewell_count, is_storage, schoolId,drinkingwater_tap,handwash_tap);
+	        
+	        for (Map<String, Object> waterSupply : water) {
+	            int source_water_id = (int) waterSupply.get("source_water_id");
+	            String supply_type = (String) waterSupply.get("supply_type");
+	            schoolPropertyService.saveWaterSupply(source_water_id, supply_type, drinking_water_id, schoolId);
+	        }
+	        if (!storage.isEmpty()) {
+	            for (Map<String, Object> waterStorage : storage) {
+	                double capacity = Double.valueOf(waterStorage.get("capacity").toString());
+	                int storage_water_id = (int) waterStorage.get("storage_water_id");
+	                schoolPropertyService.saveWaterStorage(capacity, storage_water_id, drinking_water_id, schoolId);
+	            }
+	        }
+
+	        response.put("status", "OK");
+	        response.put("message", "Drinking water details submitted successfully!");
+	        return ResponseEntity.ok(response);
+
+	    } catch (Exception e) {
+	        e.printStackTrace();
+	        response.put("status", "ERROR");
+	        response.put("message", "Error saving data: " + e.getMessage());
+	        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
+	    }
 	}
 
-	@PostMapping("/saveStaffStrength")
-	public String saveStaffStrength(@RequestParam int sgRegTeacher, @RequestParam int sgTempTeacher,@RequestParam int sgPtTeacher, @RequestParam int sgNgoTeacher, 
-			@RequestParam int btRegTeacher,@RequestParam int btTempTeacher, @RequestParam int btPtTeacher, @RequestParam int btNgoTeacher,
-			@RequestParam int pgRegTeacher, @RequestParam int pgTempTeacher, @RequestParam int pgPtTeacher,@RequestParam int pgNgoTeacher, 
-			@RequestParam int kgRegTeacher, @RequestParam int kgTempTeacher,
-			@RequestParam int petRegTeacher, @RequestParam int petTempTeacher, @RequestParam int petGrade1Teacher, @RequestParam int petGrade2Teacher,
-			@RequestParam int totOa, @RequestParam int kgAyah, @RequestParam int compAss, @RequestParam int watchmen,
-			@RequestParam int scavengers, @RequestParam int maintenanceWork, @RequestParam int schoolId) {
+	//initial
+
+	/*@PostMapping("/saveStaffStrength")
+	public String saveStaffStrength(@RequestParam int sgRegTeacher, @RequestParam int sgTempTeacher,
+			@RequestParam int sgPtTeacher, @RequestParam int sgNgoTeacher, @RequestParam int btRegTeacher,
+			@RequestParam int btTempTeacher, @RequestParam int btPtTeacher, @RequestParam int btNgoTeacher,
+			@RequestParam int pgRegTeacher, @RequestParam int pgTempTeacher, @RequestParam int pgPtTeacher,
+			@RequestParam int pgNgoTeacher, @RequestParam int kgRegTeacher, @RequestParam int kgTempTeacher,
+			@RequestParam int petRegTeacher, @RequestParam int petTempTeacher, @RequestParam int petGrade1Teacher,
+			@RequestParam int petGrade2Teacher, @RequestParam int totOa, @RequestParam int kgAyah,
+			@RequestParam int compAss, @RequestParam int watchmen, @RequestParam int scavengers,
+			@RequestParam int maintenanceWork, @RequestParam int schoolId) {
 
 		// Call service method
 		schoolPropertyService.saveStaffStrength(sgRegTeacher, sgTempTeacher, sgPtTeacher, sgNgoTeacher, btRegTeacher,
 				btTempTeacher, btPtTeacher, btNgoTeacher, pgRegTeacher, pgTempTeacher, pgPtTeacher, pgNgoTeacher,
-				kgRegTeacher, kgTempTeacher, petRegTeacher, petTempTeacher, petGrade1Teacher, petGrade2Teacher, totOa, kgAyah, compAss, watchmen, scavengers, maintenanceWork, schoolId);
+				kgRegTeacher, kgTempTeacher, petRegTeacher, petTempTeacher, petGrade1Teacher, petGrade2Teacher, totOa,
+				kgAyah, compAss, watchmen, scavengers, maintenanceWork, schoolId);
 
 		return "Staff strength details saved successfully!";
+	}*/
+	@PostMapping("/saveStaffStrength")
+	public String saveStaffStrength(@RequestBody Map<String, Object> payload) {
+		
+		int sgRegTeacher = Integer.parseInt(payload.get("sgRegTeacher").toString());
+		int sgTempTeacher = Integer.parseInt(payload.get("sgTempTeacher").toString());
+		int sgPtTeacher = Integer.parseInt(payload.get("sgPtTeacher").toString());
+		int sgNgoTeacher = Integer.parseInt(payload.get("sgNgoTeacher").toString());
+		int btRegTeacher = Integer.parseInt(payload.get("btRegTeacher").toString());
+		int btTempTeacher = Integer.parseInt(payload.get("btTempTeacher").toString());
+		int btPtTeacher = Integer.parseInt(payload.get("btPtTeacher").toString());
+		int btNgoTeacher = Integer.parseInt(payload.get("btNgoTeacher").toString());
+		int pgRegTeacher = Integer.parseInt(payload.get("pgRegTeacher").toString());
+		int pgTempTeacher = Integer.parseInt(payload.get("pgTempTeacher").toString());
+		int pgPtTeacher = Integer.parseInt(payload.get("pgPtTeacher").toString());
+		int pgNgoTeacher = Integer.parseInt(payload.get("pgNgoTeacher").toString());
+		int kgRegTeacher = Integer.parseInt(payload.get("kgRegTeacher").toString());
+		int kgTempTeacher = Integer.parseInt(payload.get("kgTempTeacher").toString());
+		int petRegTeacher = Integer.parseInt(payload.get("petRegTeacher").toString());
+		int petTempTeacher = Integer.parseInt(payload.get("petTempTeacher").toString());
+		int petGrade1Teacher = Integer.parseInt(payload.get("petGrade1Teacher").toString());
+		int petGrade2Teacher = Integer.parseInt(payload.get("petGrade2Teacher").toString());
+		
+		int petPtTeacher = Integer.parseInt(payload.get("petPtTeacher").toString());
+		Boolean is_hm = (Boolean) payload.get("hmAvailability");
+		int stRegTeacher = Integer.parseInt(payload.get("stRegTeacher").toString());
+		int stPtTeacher = Integer.parseInt(payload.get("stPtTeacher").toString());
+		
+		int totOa = Integer.parseInt(payload.get("totOa").toString());
+		int kgAyah = Integer.parseInt(payload.get("kgAyah").toString());
+		int compAss = Integer.parseInt(payload.get("compAss").toString());
+		String watchmen = payload.get("watchmen").toString();
+		int scavengers = Integer.parseInt(payload.get("scavengers").toString());
+		int maintenanceWork = Integer.parseInt(payload.get("maintenanceWork").toString());
+		int schoolId = Integer.parseInt(payload.get("schoolId").toString());
+		
+		List<String> specialCategoryId = (List<String>) payload.get("specialCategoryId");
+     
+		return schoolPropertyService.saveStaffStrength(sgRegTeacher, sgTempTeacher, sgPtTeacher, sgNgoTeacher, btRegTeacher,
+				btTempTeacher, btPtTeacher, btNgoTeacher, pgRegTeacher, pgTempTeacher, pgPtTeacher, pgNgoTeacher,
+				kgRegTeacher, kgTempTeacher, petRegTeacher, petTempTeacher, petGrade1Teacher, petGrade2Teacher, petPtTeacher,
+				is_hm, stRegTeacher, stPtTeacher, totOa, kgAyah, compAss, watchmen, scavengers, maintenanceWork, schoolId, specialCategoryId);
+
+
 	}
 
+
 	// For login
 	@GetMapping(value = "/getLoginDetails")
 	public List<Map<String, Object>> getLoginDetails(@RequestParam String user_id) {
@@ -296,7 +487,7 @@ public class SchoolPropertyController {
 
 	@PostMapping("/updateOtherDetails")
 	public String updateOtherDetails(@RequestParam("land_area") Double land_area,
-			@RequestParam("buildup_area") Double buildup_area, @RequestParam("is_compound") Boolean is_compound,
+			@RequestParam("buildup_area") Double buildup_area, @RequestParam("is_compound") int is_compound,
 			@RequestParam("is_nameboard") Boolean is_nameboard, @RequestParam("is_pasystem") Boolean is_pasystem,
 			@RequestParam("is_bell") Boolean is_bell, @RequestParam("is_generator") Boolean is_generator,
 			@RequestParam("school_id") int school_id) {
@@ -312,11 +503,10 @@ public class SchoolPropertyController {
 	@PostMapping(value = "/updateStudentDetails")
 	public String updateStudentDetails(@RequestParam("total_students") int total_students,
 			@RequestParam("total_girls") int total_girls, @RequestParam("total_boys") int total_boys,
-			@RequestParam("others") int others, @RequestParam("school_id") int school_id) {
-		System.out.println("Update Request => total: " + total_students + ", boys: " + total_boys + ", girls: "
-				+ total_girls + ", others: " + others + ", school_id: " + school_id);
+			@RequestParam("others") int others,@RequestParam("special_child") int special_child , @RequestParam("school_id") int school_id) {
+		
 		try {
-			return schoolPropertyService.updateStudentDetails(total_students, total_girls, total_boys, others,
+			return schoolPropertyService.updateStudentDetails(total_students, total_girls, total_boys, others,special_child,
 					school_id);
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -434,23 +624,66 @@ public class SchoolPropertyController {
 	}
 
 	@PostMapping(value = "/updateKitchenDetails")
-	public String updateKitchenDetails(@RequestParam(value = "is_cmbfs") Boolean is_cmbfs,
-			@RequestParam(value = "is_cmbfsIndividual", required = false) Boolean is_cmbfsIndividual,
-			@RequestParam(value = "is_noonmeal") Boolean is_noonmeal,
-			@RequestParam(value = "is_noonIndividual", required = false) Boolean is_noonIndividual,
-			@RequestParam(value = "is_vegGarden", required = false) Boolean is_vegGarden,
-			@RequestParam(value = "is_anganwadi") Boolean is_anganwadi,
-			@RequestParam(value = "anganwadi_unique", required = false) String anganwadi_unique,
-			@RequestParam(value = "is_anganwadiIndividual", required = false) Boolean is_anganwadiIndividual,
-			@RequestParam(value = "school_id") int school_id) {
+	public ResponseEntity<Map<String, String>> updateKitchenDetails(@RequestBody Map<String, Object> payload) {
+		Map<String, String> response = new HashMap<>();
 		try {
-
-			return schoolPropertyService.updateKitchenDetails(is_cmbfs, is_cmbfsIndividual, is_noonmeal,
-					is_noonIndividual, is_vegGarden, is_anganwadi, anganwadi_unique, is_anganwadiIndividual, school_id);
+			
+			Map<String, Object> kitchenEdit = (Map<String, Object>) payload.get("kitchenEdit");
+			System.err.println("kitchenEdit="+kitchenEdit);
+			List<Map<String, Object>> oldAnganwadiEdit = (List<Map<String, Object>>) payload.get("oldAnganwadiEdit");
+			List<Map<String, Object>> newAnganwadiEdit = (List<Map<String, Object>>) payload.get("newAnganwadiEdit");
+			
+			Boolean is_cmbfs = kitchenEdit.get("is_cmbfs") != null ? Boolean.parseBoolean(kitchenEdit.get("is_cmbfs").toString()) : null;
+			Boolean is_cmbfsIndividual = kitchenEdit.get("is_cmbfsIndividual") != null ? Boolean.parseBoolean(kitchenEdit.get("is_cmbfsIndividual").toString()) : null;
+			Boolean is_noonmeal = kitchenEdit.get("is_noonmeal") != null ? Boolean.parseBoolean(kitchenEdit.get("is_noonmeal").toString()) : null;
+			Boolean is_noonIndividual = kitchenEdit.get("is_noonIndividual") != null ? Boolean.parseBoolean(kitchenEdit.get("is_noonIndividual").toString()) : null;
+			Boolean is_vegGarden = kitchenEdit.get("is_vegGarden") != null ? Boolean.parseBoolean(kitchenEdit.get("is_vegGarden").toString()) : null;
+			Boolean is_anganwadi = kitchenEdit.get("is_anganwadi") != null ? Boolean.parseBoolean(kitchenEdit.get("is_anganwadi").toString()) : null;
+			
+			int school_id = kitchenEdit.get("school_id") != null ?Integer.parseInt(kitchenEdit.get("school_id").toString()) : null;
+			
+			
+			schoolPropertyService.updateKitchenDetails(is_cmbfs, is_cmbfsIndividual, is_noonmeal, is_noonIndividual, is_vegGarden, is_anganwadi,school_id);
+			
+			if(is_anganwadi) {
+			
+				if(oldAnganwadiEdit != null) {
+					
+					for(Map<String, Object> oldlist:oldAnganwadiEdit) {
+						
+						String anganwadi_unique = oldlist.get("anganwadi_unique")!= null ? oldlist.get("anganwadi_unique").toString() : null;											
+						Boolean is_anganwadiIndividual = oldlist.get("is_anganwadiIndividual") != null ? Boolean.parseBoolean(oldlist.get("is_anganwadiIndividual").toString()) : null;
+						schoolPropertyService.saveOldAnganwadi(anganwadi_unique, is_anganwadiIndividual, school_id);
+					}
+					
+				}
+				
+			if(newAnganwadiEdit != null) {
+				
+				int kitchen_id=schoolPropertyService.getKitchenIdbySchId(school_id);
+				
+				for(Map<String, Object> newlist:newAnganwadiEdit) {
+					
+					String new_anganwadi_unique = newlist.get("anganwadi_unique")!= null ? newlist.get("anganwadi_unique").toString() : null;											
+					Boolean new_is_anganwadiIndividual = newlist.get("is_anganwadiIndividual") != null ? Boolean.parseBoolean(newlist.get("is_anganwadiIndividual").toString()) : null;
+					schoolPropertyService.saveNewAnganwadi(new_anganwadi_unique, new_is_anganwadiIndividual,kitchen_id,school_id);
+					schoolPropertyService.updateAnganwadiCheck(new_anganwadi_unique, school_id);
+				}
+				
+			}
+			
+			
+		}
+			
+			response.put("status", "OK");
+			response.put("message", "Kitchen Details Updated successfully");
+			return ResponseEntity.ok(response);
 
 		} catch (Exception e) {
 			e.printStackTrace();
-			return "Error";
+			response.put("status", "ERROR");
+			response.put("message", "Failed to save Kitchen details");
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
 		}
 
 	}
@@ -459,34 +692,60 @@ public class SchoolPropertyController {
 	public ResponseEntity<?> checkKitchenDetails(@RequestParam int school_id) {
 
 		Map<String, Object> kitchenDetails = schoolPropertyService.checkKitchenDetails(school_id);
+		List<Map<String, Object>> oldAnganwadiDetails = schoolPropertyService.checkOldAnganwadiDetails(school_id);
+		List<Map<String, Object>> newAnganwadiDetails = schoolPropertyService.checkNewAnganwadiDetails(school_id);
 
 		Map<String, Object> result = new HashMap<>();
 		result.put("Message", "Success");
-		result.put("Data", kitchenDetails);
+		result.put("kitchenDetails", kitchenDetails);
+		result.put("anganwadiDetails", oldAnganwadiDetails);
+		result.put("newAnganwadiDetails", newAnganwadiDetails);
 
 		return ResponseEntity.ok(Collections.singletonList(result));
 	}
 
-	@PostMapping(value = "/updateStaffDetails")
-	public String updateStaffDetails(@RequestParam int sgRegTeacher, @RequestParam int sgTempTeacher,
-			@RequestParam int sgPtTeacher, @RequestParam int sgNgoTeacher, @RequestParam int btRegTeacher,
-			@RequestParam int btTempTeacher, @RequestParam int btPtTeacher, @RequestParam int btNgoTeacher,
-			@RequestParam int pgRegTeacher, @RequestParam int pgTempTeacher, @RequestParam int pgPtTeacher,
-			@RequestParam int pgNgoTeacher, @RequestParam int kgRegTeacher, @RequestParam int kgTempTeacher,
-			@RequestParam int petRegTeacher, @RequestParam int petTempTeacher, @RequestParam int petGrade1Teacher, @RequestParam int petGrade2Teacher,
-			@RequestParam int totOa, @RequestParam int kgAyah, @RequestParam int compAss, @RequestParam int watchmen,
-			@RequestParam int scavengers, @RequestParam int maintenanceWork, @RequestParam int school_id) {
-		try {
+	@PostMapping("/updateStaffDetails")
+	public String updateStaffDetails(@RequestBody Map<String, Object> payload) {
+		
+		int sgRegTeacher = Integer.parseInt(payload.get("modal_sgRegTeacher").toString());
+		int sgTempTeacher = Integer.parseInt(payload.get("modal_sgTempTeacher").toString());
+		int sgPtTeacher = Integer.parseInt(payload.get("modal_sgPtTeacher").toString());
+		int sgNgoTeacher = Integer.parseInt(payload.get("modal_sgNgoTeacher").toString());
+		int btRegTeacher = Integer.parseInt(payload.get("modal_btRegTeacher").toString());
+		int btTempTeacher = Integer.parseInt(payload.get("modal_btTempTeacher").toString());
+		int btPtTeacher = Integer.parseInt(payload.get("modal_btPtTeacher").toString());
+		int btNgoTeacher = Integer.parseInt(payload.get("modal_btNgoTeacher").toString());
+		int pgRegTeacher = Integer.parseInt(payload.get("modal_pgRegTeacher").toString());
+		int pgTempTeacher = Integer.parseInt(payload.get("modal_pgTempTeacher").toString());
+		int pgPtTeacher = Integer.parseInt(payload.get("modal_pgPtTeacher").toString());
+		int pgNgoTeacher = Integer.parseInt(payload.get("modal_pgNgoTeacher").toString());
+		int kgRegTeacher = Integer.parseInt(payload.get("modal_kgRegTeacher").toString());
+		int kgTempTeacher = Integer.parseInt(payload.get("modal_kgTempTeacher").toString());
+		int petRegTeacher = Integer.parseInt(payload.get("modal_petRegTeacher").toString());
+		int petTempTeacher = Integer.parseInt(payload.get("modal_petTempTeacher").toString());
+		int petGrade1Teacher = Integer.parseInt(payload.get("modal_petg1Teacher").toString());
+		int petGrade2Teacher = Integer.parseInt(payload.get("modal_petg2Teacher").toString());
+		
+		int petPtTeacher = Integer.parseInt(payload.get("modal_petptTeacher").toString());
+		Boolean is_hm = (Boolean) payload.get("is_hmAvailability");
+		int stRegTeacher = Integer.parseInt(payload.get("modal_stRegTeacher").toString());
+		int stPtTeacher = Integer.parseInt(payload.get("modal_stPtTeacher").toString());
+		
+		int totOa = Integer.parseInt(payload.get("modal_totOa").toString());
+		int kgAyah = Integer.parseInt(payload.get("modal_kgAyah").toString());
+		int compAss = Integer.parseInt(payload.get("modal_compAss").toString());
+		String watchmen = payload.get("modal_watchmen").toString();
+		int scavengers = Integer.parseInt(payload.get("modal_scavengers").toString());
+		int maintenanceWork = Integer.parseInt(payload.get("modal_maintenanceWork").toString());
+		int schoolId = Integer.parseInt(payload.get("schoolId").toString());
+		
+		List<String> specialCategoryId = (List<String>) payload.get("specialCategoryId");
+     
+		return schoolPropertyService.updateStaffStrength(sgRegTeacher, sgTempTeacher, sgPtTeacher, sgNgoTeacher, btRegTeacher,
+				btTempTeacher, btPtTeacher, btNgoTeacher, pgRegTeacher, pgTempTeacher, pgPtTeacher, pgNgoTeacher,
+				kgRegTeacher, kgTempTeacher, petRegTeacher, petTempTeacher, petGrade1Teacher, petGrade2Teacher, petPtTeacher,
+				is_hm, stRegTeacher, stPtTeacher, totOa, kgAyah, compAss, watchmen, scavengers, maintenanceWork, schoolId, specialCategoryId);
 
-			return schoolPropertyService.updateStaffDetails(sgRegTeacher, sgTempTeacher, sgPtTeacher, sgNgoTeacher,
-					btRegTeacher, btTempTeacher, btPtTeacher, btNgoTeacher, pgRegTeacher, pgTempTeacher, pgPtTeacher,
-					pgNgoTeacher, kgRegTeacher, kgTempTeacher, petRegTeacher, petTempTeacher, petGrade1Teacher, petGrade2Teacher, totOa, kgAyah, compAss, watchmen, scavengers, maintenanceWork,
-					school_id);
-
-		} catch (Exception e) {
-			e.printStackTrace();
-			return "Error";
-		}
 
 	}
 	/*
@@ -544,6 +803,14 @@ public class SchoolPropertyController {
 			Integer borewell_count = requestData.get("borewell_count") != null
 					? Integer.valueOf(requestData.get("borewell_count").toString())
 					: 0;
+			
+			int drinkingwater_tap = requestData.get("drinkingwater_tap") != null
+					? Integer.valueOf(requestData.get("drinkingwater_tap").toString())
+					: 0;
+			int  handwash_tap= requestData.get("handwash_tap") != null
+					? Integer.valueOf(requestData.get("handwash_tap").toString())
+					: 0;
+
 			Boolean is_storage = (Boolean) requestData.get("is_storage");
 			// List<Map<String, Object>> storage = (List<Map<String, Object>>)
 			// requestData.get("storage");
@@ -551,9 +818,13 @@ public class SchoolPropertyController {
 			int drinking_water_id = Integer.parseInt(requestData.get("drinking_water_id").toString());
 
 			Map<String, Object> response = new HashMap<>();
-
+/*
 			schoolPropertyService.updateDrinkWater(is_purifier, purifier_capacity, is_borewell, borewell_count,
 					is_storage, school_id, drinking_water_id);
+		*/	
+			schoolPropertyService.updateDrinkWater(is_purifier, purifier_capacity, is_borewell, borewell_count,
+					is_storage, school_id, drinking_water_id,drinkingwater_tap,handwash_tap);
+			
 			schoolPropertyService.deactiveWaterSupply(school_id, drinking_water_id);
 			schoolPropertyService.deactiveWaterStorage(school_id, drinking_water_id);
 			for (Map<String, Object> waterSupply : water) {
@@ -622,27 +893,29 @@ public class SchoolPropertyController {
 	}
 
 	@PostMapping(value = "/updateToiletDetails")
-	public String updateToiletDetails(@RequestParam("total_toiletBlocks") int total_toiletBlocks,
+	public String updateToiletDetails(@RequestParam(value = "total_toiletBlocks", required = false) Integer total_toiletBlocks,
 			@RequestParam("total_male_urinals") int total_male_urinals,
+			@RequestParam("total_female_urinals") int total_female_urinals,
+			@RequestParam("staff_male_toilets") int staff_male_toilets,
+			@RequestParam("staff_female_toilets") int staff_female_toilets,
 			@RequestParam("total_wc_male") int total_wc_male, @RequestParam("total_wc_female") int total_wc_female,
 			@RequestParam("total_diffAbled_toilet") int total_diffAbled_toilet,
 			@RequestParam("is_napkins") Boolean is_napkins, @RequestParam("school_id") int school_id) {
 		try {
 
-			return schoolPropertyService.updateToiletDetails(total_toiletBlocks, total_male_urinals, total_wc_male,
+			return schoolPropertyService.updateToiletDetails(total_toiletBlocks, total_male_urinals,total_female_urinals,staff_male_toilets,staff_female_toilets, total_wc_male,
 					total_wc_female, total_diffAbled_toilet, is_napkins, school_id);
 
 		} catch (Exception e) {
 			e.printStackTrace();
 			return "Error";
 		}
-
 	}
 
 	@PostMapping(value = "/saveAssetMaster")
 	public ResponseEntity<Map<String, String>> saveAssetMaster(@RequestBody Map<String, Object> payload) {
 		Map<String, String> response = new HashMap<>();
-		String status="";
+		String status = "";
 		try {
 
 			int school_id = Integer.parseInt(payload.get("school_id").toString());
@@ -653,13 +926,14 @@ public class SchoolPropertyController {
 			for (Map<String, Object> asset : equipmentList) {
 				int sub_asset_id = Integer.parseInt(asset.get("sub_asset_id").toString());
 				int master_qty = Integer.parseInt(asset.get("master_qty").toString());
-				
-				 status = schoolPropertyService.saveAssetMaster(sub_asset_id, master_qty, school_id, asset_id);
+
+				status = schoolPropertyService.saveAssetMaster(sub_asset_id, master_qty, school_id, asset_id);
 
 			}
 
 			response.put("status", status.equals("Success") ? "OK" : "ERROR");
-			response.put("message",status.equals("Success") ? "Asset Master Saved successfully" : "Failed to Save Asset Master");
+			response.put("message",
+					status.equals("Success") ? "Asset Master Saved successfully" : "Failed to Save Asset Master");
 
 			return ResponseEntity.ok(response);
 		} catch (Exception e) {
@@ -669,19 +943,19 @@ public class SchoolPropertyController {
 			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
 		}
 	}
-	
+
 	@GetMapping("/getAssetMaster")
 	public ResponseEntity<?> getAssetMaster(@RequestParam int school_id, @RequestParam int asset_id) {
 
 		List<Map<String, Object>> data = schoolPropertyService.getAssetMaster(school_id, asset_id);
-		//System.out.println("data=="+data);
+		// System.out.println("data=="+data);
 		Map<String, Object> result = new HashMap<>();
 		result.put("status", "Success");
 		result.put("data", data);
 
 		return ResponseEntity.ok(result);
 	}
-	
+
 	@GetMapping("/getAssetMasterById")
 	public ResponseEntity<?> getAssetMasterById(@RequestParam int assetMasterId, @RequestParam int asset_id) {
 
@@ -693,24 +967,52 @@ public class SchoolPropertyController {
 
 		return ResponseEntity.ok(result);
 	}
-	
+
 	@PostMapping(value = "/updateAssetMaster")
 	public String updateStudentDetails(@RequestParam("master_qty") int master_qty,
 			@RequestParam("assetMasterId") int assetMasterId, @RequestParam("asset_id") int asset_id) {
-		
+
 		try {
 			Map<String, Object> assetMaster = schoolPropertyService.getAssetMasterById(assetMasterId, asset_id);
 			int qty = (Integer) assetMaster.get("master_qty");
 			int unmapped_asset = (Integer) assetMaster.get("unmapped_qty");
-			int master = qty + master_qty;
-			int unmapped = master_qty + unmapped_asset;
-				return schoolPropertyService.updateAssetMaster(assetMasterId, master, asset_id, unmapped);
-		
+			int mapped_asset = qty - unmapped_asset;
+			int master = 0;
+			int unmapped = 0;
 			
+			if(master_qty>=mapped_asset) {
+				 master = master_qty;				 
+				 unmapped = master_qty - mapped_asset;
+				 return schoolPropertyService.updateAssetMaster(assetMasterId, master, asset_id, unmapped);
+			}
+			else {
+				return "lesser than";
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 			return "Error";
 		}
 	}
 
+	@GetMapping("/getAnganwadiDetails")
+	public ResponseEntity<Map<String, Object>> getAnganwadiDetailsBySchId(@RequestParam int school_id) {
+		try {
+			List<Map<String, Object>> data = schoolPropertyService.getAnganwadiDetailsBySchId(school_id);
+			Map<String, Object> response = new HashMap<>();
+
+			if (data != null && !data.isEmpty()) {
+				response.put("status", "OK");
+				response.put("data", data);
+			} else {
+				response.put("status", "Failed");
+				response.put("data", "No Data Found");
+			}
+
+			return ResponseEntity.ok(response);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+					.body(Map.of("status", "Error", "message", "Error fetching room details: " + e.getMessage()));
+		}
+	}
 }
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/school/Controller/SchoolReportController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/school/Controller/SchoolReportController.java
index 7885101..433ea2e 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/school/Controller/SchoolReportController.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/school/Controller/SchoolReportController.java
@@ -43,6 +43,26 @@ public class SchoolReportController {
 		public ResponseEntity<?> getAEOSchoolData(@RequestParam (required = false) List<String> udise,
 				                                  @RequestParam (required = false) String zone, 
 				                                  @RequestParam (required = false) String ward){
+			
+			
 			return schoolReportService.getAEOSchoolData(udise, zone, ward);
 		}
+		
+		
+		@GetMapping("/getAEOStudentData")
+		public ResponseEntity<?> getAEOStudentData(@RequestParam (required = false) List<String> udise){
+			System.out.println("list="+udise);
+			return schoolReportService.getAEOStudentData(udise);
+		}
+		
+		
+		@GetMapping("/getAEOStudentsCount")
+		public ResponseEntity<?> getAEOStudentsCount(){
+			return schoolReportService.getAEOStudentsCount();
+		}
+		
+		@GetMapping("/getRegisteredStud")
+		public ResponseEntity<?> getRegisteredStud(@RequestParam String udise){
+			return schoolReportService.getRegisteredStud(udise);
+		}
 }
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/school/Controller/StudentInfoController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/school/Controller/StudentInfoController.java
new file mode 100644
index 0000000..8ce92f0
--- /dev/null
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/school/Controller/StudentInfoController.java
@@ -0,0 +1,127 @@
+package in.gov.chennaicorporation.gccoffice.school.Controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+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.multipart.MultipartFile;
+
+import in.gov.chennaicorporation.gccoffice.school.Service.StudentInfoService;
+
+@RestController
+@RequestMapping("/gcc/api/gccschool/studentInfo")
+public class StudentInfoController {
+	@Autowired
+	private StudentInfoService studentInfoService;
+	
+	@Autowired
+    public StudentInfoController(StudentInfoService studentInfoService) {
+        this.studentInfoService = studentInfoService;
+    }
+	
+	@GetMapping("/getStandards")
+	public ResponseEntity<?> getStandards(@RequestParam String udise){
+		return studentInfoService.getStandards(udise);
+	}
+	
+	@GetMapping("/getSections")
+	public ResponseEntity<?> getSections(){
+		return studentInfoService.getSections();
+	}
+	
+	@PostMapping("/saveStudent")
+	public ResponseEntity<?> saveStudent(@RequestParam String udise,
+			@RequestParam String student_name,
+			@RequestParam String emis_no,
+			@RequestParam String gender,
+			@RequestParam String std,
+			@RequestParam String dob,
+			@RequestParam String age,
+			@RequestParam String parent_type,
+			@RequestParam String section,
+			@RequestParam String medium,
+			@RequestParam(value = "father_name", required = false) String father_name,
+			@RequestParam(value = "mother_name", required = false) String mother_name,
+			@RequestParam(value = "guardian_name", required = false) String guardian_name,
+			@RequestParam(value = "father_mobile", required = false) String father_mobile,
+			@RequestParam(value = "mother_mobile", required = false) String mother_mobile,
+			@RequestParam(value = "guardian_mobile", required = false) String guardian_mobile,
+			@RequestParam(value = "father_aadhar", required = false) String father_aadhar,
+			@RequestParam(value = "mother_aadhar", required = false) String mother_aadhar,
+			@RequestParam(value = "guardian_aadhar", required = false) String guardian_aadhar,
+			@RequestParam(value = "student_aadhar", required = false) String student_aadhar,
+			@RequestParam(value = "father_aadhar_file", required = false) MultipartFile father_aadhar_file,
+			@RequestParam(value = "mother_aadhar_file", required = false) MultipartFile mother_aadhar_file,
+			@RequestParam(value = "guardian_aadhar_file", required = false) MultipartFile guardian_aadhar_file,
+			@RequestParam(value = "student_aadhar_file", required = false) MultipartFile student_aadhar_file) {
+		//return studentInfoService.saveStudent(udise, student_name, emis_no, gender, std, dob, age, parent_type, father_name, mother_name, guardian_name, father_mobile, mother_mobile, guardian_mobile, father_aadhar, mother_aadhar, guardian_aadhar, student_aadhar, father_aadhar_file, mother_aadhar_file, guardian_aadhar_file, student_aadhar_file);
+		return studentInfoService.checkStudent(udise, student_name, emis_no, gender, std, dob, age, parent_type,section,medium, father_name, mother_name, guardian_name, father_mobile, mother_mobile, guardian_mobile, father_aadhar, mother_aadhar, guardian_aadhar, student_aadhar, father_aadhar_file, mother_aadhar_file, guardian_aadhar_file, student_aadhar_file);
+	}
+	
+	@GetMapping("/getStudentsClass")
+	public ResponseEntity<?> getStudentsClass(@RequestParam String std,
+			                                  @RequestParam String udise){
+		return studentInfoService.getStudentsClass(udise, std);
+	}
+	
+	@GetMapping("/getStudentsDetails")
+	public ResponseEntity<?> getStudentsDetails(@RequestParam String studentId){
+		return studentInfoService.getStudentsDetails(studentId);
+	}
+	
+	@GetMapping("/getMedium")
+	public ResponseEntity<?> getMedium(){
+		return studentInfoService.getMedium();
+	}
+	
+	@PostMapping("/deleteStudent")
+	public ResponseEntity<?> deleteStudent(@RequestParam String student_id,
+			@RequestParam String user_id,
+			@RequestParam String action_type) {
+		return studentInfoService.deleteProcess(student_id, user_id, action_type);
+	}
+	
+	@PostMapping("/updateStudent")
+	public ResponseEntity<?> updateStudent(@RequestParam String student_id,
+			@RequestParam String user_id,
+			@RequestParam String action_type,
+			@RequestParam String udise,
+			@RequestParam String student_name,
+			@RequestParam String emis_no,
+			@RequestParam String gender,
+			@RequestParam String mediums,
+			@RequestParam String std,
+			@RequestParam String section,
+			@RequestParam String dob,
+			@RequestParam String age,
+			@RequestParam String parent_type,
+			@RequestParam(value = "father_name", required = false) String father_name,
+			@RequestParam(value = "mother_name", required = false) String mother_name,
+			@RequestParam(value = "guardian_name", required = false) String guardian_name,
+			@RequestParam(value = "father_mobile", required = false) String father_mobile,
+			@RequestParam(value = "mother_mobile", required = false) String mother_mobile,
+			@RequestParam(value = "guardian_mobile", required = false) String guardian_mobile,
+			@RequestParam(value = "father_aadhar", required = false) String father_aadhar,
+			@RequestParam(value = "mother_aadhar", required = false) String mother_aadhar,
+			@RequestParam(value = "guardian_aadhar", required = false) String guardian_aadhar,
+			@RequestParam(value = "student_aadhar", required = false) String student_aadhar,
+			@RequestParam(value = "father_aadhar_file", required = false) MultipartFile father_aadhar_file,
+			@RequestParam(value = "mother_aadhar_file", required = false) MultipartFile mother_aadhar_file,
+			@RequestParam(value = "guardian_aadhar_file", required = false) MultipartFile guardian_aadhar_file,
+			@RequestParam(value = "student_aadhar_file", required = false) MultipartFile student_aadhar_file,
+			@RequestParam (value = "raw_father_aadhar", required = false) String raw_father_aadhar,
+			@RequestParam (value = "raw_mother_aadhar", required = false) String raw_mother_aadhar,
+			@RequestParam (value = "raw_guardian_aadhar", required = false) String raw_guardian_aadhar,
+			@RequestParam (value = "raw_student_aadhar", required = false) String raw_student_aadhar) {
+		return studentInfoService.updateProcess(student_id, user_id, action_type, udise, student_name, emis_no, gender, mediums, std, section, dob, age, parent_type, father_name, mother_name, guardian_name, father_mobile, mother_mobile, guardian_mobile, father_aadhar, mother_aadhar, guardian_aadhar, student_aadhar, father_aadhar_file, mother_aadhar_file, guardian_aadhar_file, student_aadhar_file, raw_father_aadhar, raw_mother_aadhar, raw_guardian_aadhar, raw_student_aadhar);
+	}
+	
+	@GetMapping("/checkStudent")
+	public ResponseEntity<?> checkStudent(@RequestParam String udise, @RequestParam String schoolId){
+		return studentInfoService.checkStudent(udise, schoolId);
+	}
+	
+ }
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/school/Service/.DS_Store b/src/main/java/in/gov/chennaicorporation/gccoffice/school/Service/.DS_Store
new file mode 100644
index 0000000..c3ca84b
Binary files /dev/null and b/src/main/java/in/gov/chennaicorporation/gccoffice/school/Service/.DS_Store differ
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/school/Service/BuildingAssetService.java b/src/main/java/in/gov/chennaicorporation/gccoffice/school/Service/BuildingAssetService.java
index 93671dc..93fa743 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/school/Service/BuildingAssetService.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/school/Service/BuildingAssetService.java
@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Service;
@@ -22,10 +23,14 @@ import org.springframework.web.bind.annotation.RequestParam;
 @Service
 public class BuildingAssetService {
 	private JdbcTemplate jdbcTemplate;
+	
+	@Autowired
+	private NamedParameterJdbcTemplate namedParameterJdbcTemplate;
 
 	@Autowired
 	public void setDataSourcemysql(@Qualifier("mysqlSchoolDataSource") DataSource dataSource) {
 		this.jdbcTemplate = new JdbcTemplate(dataSource);
+		this.namedParameterJdbcTemplate= new NamedParameterJdbcTemplate(dataSource);
 	}
 
 	@Transactional
@@ -113,7 +118,7 @@ public class BuildingAssetService {
 				+ "WHERE b.school_id = ? and b.is_delete=0 and b.is_active=1  ORDER BY b.buildng_id";
 		return jdbcTemplate.queryForList(sql, school_id);
 	}
-
+/*
 	@Transactional
 	public void saveRoomDetails(int room_type, String room_num, int building_id, int floors_id, int school_id) {
 		String sql = "INSERT INTO room_details (room_type, room_num, building_id, floors_id, school_id) VALUES (?, ?, ?, ?, ?)";
@@ -124,7 +129,48 @@ public class BuildingAssetService {
 		}
 
 	}
+*/
+	@Transactional
+	public String roomDetails(int room_type, String room_num, int building_id, int floors_id,
+			String anganwadiUniqueNumber, Boolean  anganwadi_check, int school_id) {
+		String response = "";
+		if(anganwadiUniqueNumber!=null) {
+			int is_avbl = checkAnganwadi(school_id, anganwadiUniqueNumber);
+			if(is_avbl==0) {
+				saveRoomDetails(room_type, room_num, building_id, floors_id,anganwadiUniqueNumber, anganwadi_check, school_id);
+				response = "Saved sucessfully";
+			} else if(is_avbl==1) {
+				response = "Duplicate";
+			} else {
+				response = "Error";
+			}
+		} else {
+			saveRoomDetails(room_type, room_num, building_id, floors_id,anganwadiUniqueNumber, anganwadi_check, school_id);
+			response = "Saved sucessfully";
+		}
+		return response;
+	}
+	
+	private int checkAnganwadi(int school_id, String anganwadiUniqueNumber) {
+	    String sql = "SELECT CASE WHEN EXISTS (SELECT 1 FROM room_details WHERE school_id = ? and anganwadi_unique_number = ?) THEN 1 ELSE 0 END AS result";
+	    try {
+	        return  jdbcTemplate.queryForObject(sql, Integer.class, school_id, anganwadiUniqueNumber);
+	        
+	    } catch (Exception e) {
+	        e.printStackTrace(); 
+	        return 5;
+	    }
+	}
 
+	public void saveRoomDetails(int room_type, String room_num, int building_id, int floors_id, String anganwadiUniqueNumber, Boolean  anganwadi_check, int school_id) {
+		String sql = "INSERT INTO room_details (room_type, room_num, building_id, floors_id,anganwadi_unique_number, anganwadi_check, school_id) VALUES (?,?, ?, ?, ?, ?, ?)";
+		try {
+			jdbcTemplate.update(sql, room_type, room_num, building_id, floors_id,anganwadiUniqueNumber, anganwadi_check, school_id);
+		} catch (DataAccessException e) {
+			e.printStackTrace();
+		}
+
+	}
 	public Map<String, Object> getSimpleBuildingById(int buildingId) {
 		String sql = "SELECT b.*, rm.content as roofmaterial ,bm.content as buildingmaterial FROM buildings b join building_material_master bm on\r\n"
 				+ " bm.execution_order=b.building_material inner join roof_material_master rm on rm.execution_order=b.roof_material  WHERE buildng_id = ?";
@@ -208,33 +254,7 @@ public class BuildingAssetService {
 			
 			List<Map<String, Object>> electrical_asset= getElectricalAssetMasterByFloorId(floor_id);
 			List<Map<String, Object>> furniture_asset= getFurnitureAssetMasterByFloorId(floor_id);
-			/*
-			for(Map<String, Object> ele_data : electrical_asset) {
-				int school_id = (Integer) ele_data.get("school_id");
-				int sub_asset_id = (Integer) ele_data.get("sub_asset_id");
-				String assetType="electricalasset";
-				Map<String, Object> assetMaster = getAssetMasterBySchlId(sub_asset_id, school_id, assetType);
-				int mapped = assetMaster.get("mapped_qty") != null ? (Integer) assetMaster.get("mapped_qty") : 0;
-				int unMapped = assetMaster.get("unmapped_qty") != null ? (Integer) assetMaster.get("unmapped_qty") : 0;
-				int map = 0;
-				int unMap = unMapped+mapped;
-				updateAssetmaster(map, unMap, school_id, sub_asset_id, assetType);
-			}
-			
-			editElectricalAsset(floor_id, building_id);
 			
-			for(Map<String, Object> fur_data : furniture_asset) {
-				int school_id = (Integer) fur_data.get("school_id");
-				int sub_asset_id = (Integer) fur_data.get("sub_asset_id");
-				String assetType="furnitureasset";
-				Map<String, Object> assetMaster = getAssetMasterBySchlId(sub_asset_id, school_id, assetType);
-				int mapped = assetMaster.get("mapped_qty") != null ? (Integer) assetMaster.get("mapped_qty") : 0;
-				int unMapped = assetMaster.get("unmapped_qty") != null ? (Integer) assetMaster.get("unmapped_qty") : 0;
-				int map = 0;
-				int unMap = unMapped+mapped;
-				updateAssetmaster(map, unMap, school_id, sub_asset_id, assetType);
-			}
-			*/
 			for(Map<String, Object> ele_data : electrical_asset) {
 				int school_id = (Integer) ele_data.get("school_id");
 				int sub_asset_id = (Integer) ele_data.get("sub_asset_id");
@@ -262,9 +282,10 @@ public class BuildingAssetService {
 				int unMap = unMapped+asset_qty;
 				updateAssetmaster(map, unMap, school_id, sub_asset_id, assetType);
 			}
+			
 			editFurnitureAsset(floor_id, building_id);
 			
-			editRooms(floor_id, building_id);
+			editRoom(floor_id, building_id);
 	
 			editFloor(floor_id, building_id);
 		
@@ -319,7 +340,7 @@ public class BuildingAssetService {
 
 	}
 
-	private void editRooms(int floor_id, int building_id) {
+	private void editRoom(int floor_id, int building_id) {
 		String sql = "UPDATE room_details SET is_active = false, is_delete = true WHERE floors_id = ? And building_id=?";
 		try {
 			jdbcTemplate.update(sql, floor_id, building_id);
@@ -341,9 +362,9 @@ public class BuildingAssetService {
 
 	@Transactional
 	public void unmapAssets(int room_id, boolean is_delete) {
-		String sql = "UPDATE it_mapping SET is_delete = ?, is_active=0 WHERE room_id = ?";
-		String sql1 = "UPDATE furniture_mapping SET is_delete = ?, is_active=0 WHERE room_id = ?";
-		String sql2 = "UPDATE electrical_mapping SET is_delete = ?, is_active=0 WHERE room_id = ?";
+		String sql = "UPDATE it_mapping SET is_delete = ?,is_active=0 WHERE room_id = ?";
+		String sql1 = "UPDATE furniture_mapping SET is_delete = ?,is_active=0 WHERE room_id = ?";
+		String sql2 = "UPDATE electrical_mapping SET is_delete = ?,is_active=0 WHERE room_id = ?";
 		try {
 			jdbcTemplate.update(sql, is_delete, room_id);
 			jdbcTemplate.update(sql1, is_delete, room_id);
@@ -357,7 +378,7 @@ public class BuildingAssetService {
 
 	@Transactional
 	public void deleteRoom(int room_id, boolean is_delete) {
-		String sql = "UPDATE room_details SET is_delete = ?, is_active=0 WHERE room_id = ? ";
+		String sql = "UPDATE room_details SET is_delete = ?,is_active=0 WHERE room_id = ? ";
 		try {
 			jdbcTemplate.update(sql, is_delete, room_id);
 		} catch (DataAccessException e) {
@@ -377,16 +398,17 @@ public class BuildingAssetService {
 			
 			List<Map<String, Object>> electrical_asset= getElectricalAssetMasterByBuildingId(building_id);
 			List<Map<String, Object>> furniture_asset= getFurnitureAssetMasterByBuildingId(building_id);
-			/*
+			
 			for(Map<String, Object> ele_data : electrical_asset) {
 				int school_id = (Integer) ele_data.get("school_id");
 				int sub_asset_id = (Integer) ele_data.get("sub_asset_id");
+				int asset_qty = (Integer) ele_data.get("asset_qty");
 				String assetType="electricalasset";
 				Map<String, Object> assetMaster = getAssetMasterBySchlId(sub_asset_id, school_id, assetType);
 				int mapped = assetMaster.get("mapped_qty") != null ? (Integer) assetMaster.get("mapped_qty") : 0;
 				int unMapped = assetMaster.get("unmapped_qty") != null ? (Integer) assetMaster.get("unmapped_qty") : 0;
-				int map = 0;
-				int unMap = unMapped+mapped;
+				int map = mapped-asset_qty;
+				int unMap = unMapped+asset_qty;
 				updateAssetmaster(map, unMap, school_id, sub_asset_id, assetType);
 			}
 			
@@ -395,42 +417,16 @@ public class BuildingAssetService {
 			for(Map<String, Object> fur_data : furniture_asset) {
 				int school_id = (Integer) fur_data.get("school_id");
 				int sub_asset_id = (Integer) fur_data.get("sub_asset_id");
+				int asset_qty = (Integer) fur_data.get("asset_qty");
 				String assetType="furnitureasset";
 				Map<String, Object> assetMaster = getAssetMasterBySchlId(sub_asset_id, school_id, assetType);
 				int mapped = assetMaster.get("mapped_qty") != null ? (Integer) assetMaster.get("mapped_qty") : 0;
 				int unMapped = assetMaster.get("unmapped_qty") != null ? (Integer) assetMaster.get("unmapped_qty") : 0;
-				int map = 0;
-				int unMap = unMapped+mapped;
+				int map = mapped-asset_qty;
+				int unMap = unMapped+asset_qty;
 				updateAssetmaster(map, unMap, school_id, sub_asset_id, assetType);
 			}
-			*/
-			for(Map<String, Object> ele_data : electrical_asset) {
- 				int school_id = (Integer) ele_data.get("school_id");
- 				int sub_asset_id = (Integer) ele_data.get("sub_asset_id");
- 				int asset_qty = (Integer) ele_data.get("asset_qty");
- 				String assetType="electricalasset";
- 				Map<String, Object> assetMaster = getAssetMasterBySchlId(sub_asset_id, school_id, assetType);
- 				int mapped = assetMaster.get("mapped_qty") != null ? (Integer) assetMaster.get("mapped_qty") : 0;
- 				int unMapped = assetMaster.get("unmapped_qty") != null ? (Integer) assetMaster.get("unmapped_qty") : 0;
- 				int map = mapped-asset_qty;
- 				int unMap = unMapped+asset_qty;
- 				updateAssetmaster(map, unMap, school_id, sub_asset_id, assetType);
- 			}
-			
- 			deleteElectricalAsset(building_id, is_delete);
 			
- 			for(Map<String, Object> fur_data : furniture_asset) {
- 				int school_id = (Integer) fur_data.get("school_id");
- 				int sub_asset_id = (Integer) fur_data.get("sub_asset_id");
- 				int asset_qty = (Integer) fur_data.get("asset_qty");
- 				String assetType="furnitureasset";
- 				Map<String, Object> assetMaster = getAssetMasterBySchlId(sub_asset_id, school_id, assetType);
- 				int mapped = assetMaster.get("mapped_qty") != null ? (Integer) assetMaster.get("mapped_qty") : 0;
- 				int unMapped = assetMaster.get("unmapped_qty") != null ? (Integer) assetMaster.get("unmapped_qty") : 0;
- 				int map = mapped-asset_qty;
- 				int unMap = unMapped+asset_qty;
- 				updateAssetmaster(map, unMap, school_id, sub_asset_id, assetType);
- 			}
 			deleteFurnitureAsset(building_id, is_delete);
 			
 			deleteRoomById(building_id, is_delete);
@@ -544,23 +540,57 @@ public class BuildingAssetService {
 
 	@Transactional
 	public Map<String, Object> getRoomDetailsById(int roomId) {
-		String sql = "SELECT rd.room_id, " + "       rd.room_num AS room_name, " + "       bd.building_name, "
-				+ "       fl.floor_name AS floor, " + // ✅ FIXED HERE
-				"       rm.room_type, " + "       rd.school_id, " + "       rm.room_master_id, "
-				+ "       fl.floors_id " + "FROM room_details rd "
+		String sql = "SELECT rd.room_id,rd.room_num AS room_name,bd.building_name, "
+				+ "fl.floor_name AS floor, rm.room_type, rd.school_id, rm.room_master_id,rd.anganwadi_unique_number, "
+				+ "fl.floors_id " + "FROM room_details rd "
 				+ "JOIN buildings bd ON bd.buildng_id = rd.building_id "
-				+ "JOIN floor_list fl ON fl.floors_id = rd.floors_id " + // ✅ REMOVED floor_master JOIN
+				+ "JOIN floor_list fl ON fl.floors_id = rd.floors_id " + 
 				"JOIN room_master rm ON rd.room_type = rm.room_master_id "
 				+ "WHERE rd.room_id = ? AND rd.is_active = 1 AND rd.is_delete = 0";
 
 		return jdbcTemplate.queryForMap(sql, roomId);
 	}
 
+	public String editRoomsById(int room_type, String room_num, int building_id, int floors_id, int school_id,
+			String anganwadiUniqueNumber, Boolean anganwadi_check,int room_id) {
+		
+		String response = "";
+		if(anganwadiUniqueNumber!=null) {
+			int is_avbl = checkAnganwadiEdit(school_id, anganwadiUniqueNumber,room_id);
+			if(is_avbl==0) {
+				editRoom(room_type, room_num, building_id, floors_id, school_id,anganwadiUniqueNumber,anganwadi_check,room_id);				
+				response = "Rooms Edited Sucessfully";
+				
+			} else if(is_avbl==1) {				
+				response = "Duplicate";
+				
+			} else {				
+				response = "Error";
+				
+			}
+		} else {
+			editRoom(room_type, room_num, building_id, floors_id, school_id,anganwadiUniqueNumber, anganwadi_check,room_id);
+			response = "Rooms Edited Sucessfully";
+		}
+		return response;
+	}
+	
+	private int checkAnganwadiEdit(int school_id, String anganwadiUniqueNumber,int room_id) {
+	    String sql = "SELECT CASE WHEN EXISTS (SELECT 1 FROM room_details WHERE school_id = ? and anganwadi_unique_number = ? and room_id !=? ) THEN 1 ELSE 0 END AS result";
+	    try {
+	        return  jdbcTemplate.queryForObject(sql, Integer.class, school_id, anganwadiUniqueNumber,room_id);
+	        
+	    } catch (Exception e) {
+	        e.printStackTrace(); 
+	        return 5;
+	    }
+	}
+
 	@Transactional
-	public void editRoom(int room_type, String room_num, int building_id, int floors_id, int school_id, int room_id) {
-		String sql = "UPDATE room_details SET room_type = ?, room_num = ?, building_id = ?, floors_id = ?, school_id = ? WHERE room_id = ? ";
+	public void editRoom(int room_type, String room_num, int building_id, int floors_id, int school_id,String anganwadiUniqueNumber,Boolean anganwadi_check, int room_id) {
+		String sql = "UPDATE room_details SET room_type = ?, room_num = ?, building_id = ?, floors_id = ?, school_id = ?, anganwadi_unique_number=?,anganwadi_check=? WHERE room_id = ? ";
 		try {
-			jdbcTemplate.update(sql, room_type, room_num, building_id, floors_id, school_id, room_id);
+			jdbcTemplate.update(sql, room_type, room_num, building_id, floors_id, school_id,anganwadiUniqueNumber, anganwadi_check, room_id);
 		} catch (DataAccessException e) {
 			e.printStackTrace();
 		}
@@ -634,8 +664,8 @@ public class BuildingAssetService {
 
 	@Transactional
 	public List<Map<String, Object>> getSchoolAssetForManagement(int school_id) {
-		String sql = "SELECT md.* FROM school_list m INNER JOIN it_master_details md ON m.udise COLLATE utf8mb4_general_ci = md.udise\r\n"
-				+ "WHERE m.id = ?";
+		String sql = "SELECT md.* FROM school_list m INNER JOIN it_master_details md ON m.udise COLLATE utf8mb4_general_ci = md.udise "
+				+ "WHERE m.id = ? and md.is_online = '0'";
 		try {
 			return jdbcTemplate.queryForList(sql, school_id);
 		} catch (Exception e) {
@@ -735,26 +765,51 @@ public class BuildingAssetService {
 
 		}
 	}
-
+//intial
 	// checking for view
 	public List<Map<String, Object>> getStudentStrengthBySchoolId(@RequestParam int schoolId) {
-		String sql = "SELECT total_boys, total_girls, others, total_students FROM student_strength WHERE school_id = ?";
+	    String sql = "SELECT total_boys, total_girls, others, total_students,special_child " +
+	                 "FROM student_strength " +
+	                 "WHERE school_id = ? " +
+	                 "ORDER BY student_id DESC LIMIT 1";
 
-		return jdbcTemplate.queryForList(sql, schoolId);
+	    return jdbcTemplate.queryForList(sql, schoolId);
 	}
 
+//initial
+	/*public List<Map<String, Object>> getotherdetailsBySchoolId(@RequestParam int schoolId) {
+		String sql = "select*from school_buildup_area where school_id=?" ;
+
+		return jdbcTemplate.queryForList(sql, schoolId);
+	}*/
+	
 	public List<Map<String, Object>> getotherdetailsBySchoolId(@RequestParam int schoolId) {
-		String sql = "select*from school_buildup_area where school_id=?";
+		//String sql = "select*from school_buildup_area where school_id=? ORDER BY buildup_id DESC LIMIT 1" ;
+
+		String sql = "SELECT buildup_id, land_area, buildup_area, " +
+	             "CAST(is_compound AS SIGNED) AS is_compound, " +
+	             "is_nameboard AS is_nameboard, " +
+	             "is_pasystem  AS is_pasystem, " +
+	             "is_bell  AS is_bell, " +
+	             "is_generator  AS is_generator, " +
+	             "school_id " +
+	             "FROM school_buildup_area WHERE school_id = ? ORDER BY buildup_id DESC LIMIT 1";
 
+		
 		return jdbcTemplate.queryForList(sql, schoolId);
 	}
-
-	public List<Map<String, Object>> getStaffStrengthBySchoolId(@RequestParam int schoolId) {
+//initial
+	/*public List<Map<String, Object>> getStaffStrengthBySchoolId(@RequestParam int schoolId) {
 		String sql = "SELECT * FROM staff_strength_1 WHERE school_id = ?";
 
 		return jdbcTemplate.queryForList(sql, schoolId);
 	}
+	public List<Map<String, Object>> getStaffStrengthBySchoolId(@RequestParam int schoolId) {
+		String sql = "SELECT * FROM staff_strength_1 WHERE school_id = ? ORDER BY staff_id DESC LIMIT 1";
 
+		return jdbcTemplate.queryForList(sql, schoolId);
+	}
+*/
 	@Transactional
 	public Map<String, Object> getIt_Details(int it_map_id) {
 		Map<String, Object> result = new HashMap<>();
@@ -893,6 +948,7 @@ public class BuildingAssetService {
 	@Transactional
 	public int mapAssetMaster(int asset_qty, String assetType, int sub_asset_id, int school_id) {
 		Map<String, Object> assetMaster = getAssetMasterBySchlId(sub_asset_id, school_id, assetType);
+		
 		int mapped = assetMaster.get("mapped_qty") != null ? (Integer) assetMaster.get("mapped_qty") : 0;
 		int unMapped = assetMaster.get("unmapped_qty") != null ? (Integer) assetMaster.get("unmapped_qty") : 0;
 		if(unMapped>=asset_qty) {
@@ -923,23 +979,7 @@ public class BuildingAssetService {
 	}	
 	
 
-/*
-	@Transactional
-	public Map<String, Object> getAssetMasterBySchlId(int sub_asset_id, int school_id, String assetType) {
-		String sql="";
-		if (assetType.equalsIgnoreCase("furnitureasset")) {
-		 sql = "SELECT * from furniture_master where school_id = ? and sub_asset_id = ?";
-		} else if (assetType.equalsIgnoreCase("electricalasset")) {
-			sql = "SELECT * from electrical_master where school_id = ? and sub_asset_id = ?";
-		}
-		try {
-			return jdbcTemplate.queryForMap(sql, school_id, sub_asset_id);
-		} catch (Exception e) {
-			e.printStackTrace();
-			return Map.of();
-		}
-	}
-	*/
+
 	@Transactional
 	public Map<String, Object> getAssetMasterBySchlId(int sub_asset_id, int school_id, String assetType) {
 		String sql="";
@@ -963,7 +1003,7 @@ public class BuildingAssetService {
 	@Transactional
 	public List<Map<String, Object>> getElectricalAssetMasterByRoomId(int room_id) {
 		try {
-		String sql = "select sub_asset_id, school_id from electrical_mapping where room_id=? AND is_active = 1 AND is_delete = 0";
+		String sql = "select sub_asset_id, school_id, asset_qty from electrical_mapping where room_id=? and is_active = 1 and is_delete = 0";
 
 		return jdbcTemplate.queryForList(sql, room_id);
 		} catch (Exception e) {
@@ -975,7 +1015,7 @@ public class BuildingAssetService {
 	@Transactional
 	public List<Map<String, Object>> getFurnitureAssetMasterByRoomId(int room_id) {
 		try {
-			String sql = "select sub_asset_id, school_id from furniture_mapping where room_id=? AND is_active = 1 AND is_delete = 0";
+			String sql = "select sub_asset_id, school_id, asset_qty from furniture_mapping where room_id=? and is_active = 1 and is_delete = 0";
 
 			return jdbcTemplate.queryForList(sql, room_id);
 			} catch (Exception e) {
@@ -987,7 +1027,7 @@ public class BuildingAssetService {
 	@Transactional
 	private List<Map<String, Object>> getElectricalAssetMasterByFloorId(int floor_id) {
 		try {
-			String sql = "select sub_asset_id, school_id from electrical_mapping where floor_id=? AND is_active = 1 and is_delete = 0";
+			String sql = "select sub_asset_id, school_id, asset_qty from electrical_mapping where floor_id=? and is_active = 1 and is_delete = 0";
 
 			return jdbcTemplate.queryForList(sql, floor_id);
 			} catch (Exception e) {
@@ -998,7 +1038,7 @@ public class BuildingAssetService {
 	@Transactional
 	private List<Map<String, Object>> getFurnitureAssetMasterByFloorId(int floor_id) {
 		try {
-			String sql = "select sub_asset_id, school_id from furniture_mapping where floor_id=? AND is_active = 1 and is_delete = 0";
+			String sql = "select sub_asset_id, school_id, asset_qty from furniture_mapping where floor_id=? and is_active = 1 and is_delete = 0";
 
 			return jdbcTemplate.queryForList(sql, floor_id);
 			} catch (Exception e) {
@@ -1010,7 +1050,7 @@ public class BuildingAssetService {
 	@Transactional
 	private List<Map<String, Object>> getElectricalAssetMasterByBuildingId(int building_id) {
 		try {
-			String sql = "select sub_asset_id, school_id from electrical_mapping where building_id=? and is_active = 1 and is_delete = 0";
+			String sql = "select sub_asset_id, school_id, asset_qty from electrical_mapping where building_id=? and is_active = 1 and is_delete = 0";
 
 			return jdbcTemplate.queryForList(sql, building_id);
 			} catch (Exception e) {
@@ -1022,7 +1062,7 @@ public class BuildingAssetService {
 	@Transactional
 	private List<Map<String, Object>> getFurnitureAssetMasterByBuildingId(int building_id) {
 		try {
-			String sql = "select sub_asset_id, school_id from furniture_mapping where building_id=? and is_active = 1 and is_delete = 0";
+			String sql = "select sub_asset_id, school_id, asset_qty from furniture_mapping where building_id=? and is_active = 1 and is_delete = 0";
 
 			return jdbcTemplate.queryForList(sql, building_id);
 			} catch (Exception e) {
@@ -1084,7 +1124,19 @@ public class BuildingAssetService {
 			}
 	}
 	
+	public List<Map<String, Object>> getStaffStrengthBySchoolId(@RequestParam int schoolId) {
+		String sql = "SELECT * FROM staff_strength_1 WHERE school_id = ? ORDER BY staff_id DESC LIMIT 1";
 
+		return jdbcTemplate.queryForList(sql, schoolId);
+	}
+	
+	public List<Map<String, Object>> getSpecialCategoryBySchoolId(int schoolId) {
+		String sql = "SELECT scd.*,scm.special_category as sc_names FROM  special_category_details scd\r\n"
+				+ "INNER JOIN special_category_master scm ON scm.special_category_id=scd.special_category_id\r\n"
+				+ "where scd.school_id=? AND scd.is_active=1 AND scd.is_delete=0";
+
+		return jdbcTemplate.queryForList(sql, schoolId);
+	}
 	
 
 }
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/school/Service/DropdownsService.java b/src/main/java/in/gov/chennaicorporation/gccoffice/school/Service/DropdownsService.java
index 1a6c32b..2c28c37 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/school/Service/DropdownsService.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/school/Service/DropdownsService.java
@@ -184,5 +184,11 @@ public class DropdownsService {
 			}
 			 return jdbcTemplate.queryForList(sql, String.class, school_id);
 		}
+		
+		@Transactional
+		public List<Map<String, Object>> getSpecialCategory(){
+			String sql = "SELECT * FROM special_category_master WHERE is_active=1 AND is_delete=0 ORDER BY execution_order";
+			return jdbcTemplate.queryForList(sql);
+		}
 
 }
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/school/Service/SchoolPropertyService.java b/src/main/java/in/gov/chennaicorporation/gccoffice/school/Service/SchoolPropertyService.java
index 6445db8..eda2abe 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/school/Service/SchoolPropertyService.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/school/Service/SchoolPropertyService.java
@@ -17,6 +17,7 @@ import javax.sql.DataSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.dao.DataAccessException;
+import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.jdbc.support.KeyHolder;
@@ -31,6 +32,7 @@ public class SchoolPropertyService {
 	@Autowired
 	public void setDataSourcemysql(@Qualifier("mysqlSchoolDataSource") DataSource dataSource) {
 		this.jdbcTemplate = new JdbcTemplate(dataSource);
+		
 	}
 
 	@Transactional
@@ -38,8 +40,8 @@ public class SchoolPropertyService {
 		String sql = "SELECT * FROM school_list WHERE udise = ?";
 		return jdbcTemplate.queryForList(sql, udise);
 	}
-
-	@Transactional
+//initial
+	/*@Transactional
 	public String saveSchoolBuildupArea(Double land_area, Double buildup_area, Boolean is_compound,
 			Boolean is_nameboard, Boolean is_pasystem, Boolean is_bell, Boolean is_generator, int school_id) {
 		String sql = "INSERT INTO school_buildup_area (land_area, buildup_area, is_compound, is_nameboard, is_pasystem, is_bell, is_generator, school_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
@@ -52,9 +54,34 @@ public class SchoolPropertyService {
 			return "error";
 		}
 
+	}*/
+	@Transactional
+	public String saveSchoolBuildupArea(Double land_area, Double buildup_area, int is_compound,
+	        Boolean is_nameboard, Boolean is_pasystem, Boolean is_bell, Boolean is_generator, int school_id) {
+
+	    // Step 1: Check if record exists for the given school_id
+	    String checkSql = "SELECT COUNT(*) FROM school_buildup_area WHERE school_id = ?";
+	    try {
+	        int count = jdbcTemplate.queryForObject(checkSql, new Object[]{school_id}, Integer.class);
+
+	        if (count > 0) {
+	            return "Build-up Area details for this school already exist.";
+	        }
+
+	        // Step 2: Insert only if no existing record found
+	        String insertSql = "INSERT INTO school_buildup_area (land_area, buildup_area, is_compound, is_nameboard, is_pasystem, is_bell, is_generator, school_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
+	        jdbcTemplate.update(insertSql, land_area, buildup_area, is_compound, is_nameboard, is_pasystem, is_bell, is_generator, school_id);
+
+	        return "Other Details saved successfully";
+
+	    } catch (DataAccessException e) {
+	        e.printStackTrace();
+	        return "Error saving build-up area details.";
+	    }
 	}
 
-	@Transactional
+//initial live
+	/*@Transactional
 	public String saveStudentStrength(int total_students, int total_girls, int total_boys, int others, int school_id) {
 		String sql = "INSERT INTO student_strength (total_students, total_girls, total_boys,others,school_id) VALUES (?,?, ?, ?, ?)";
 		try {
@@ -64,8 +91,29 @@ public class SchoolPropertyService {
 			e.printStackTrace();
 			return "error";
 		}
+	}*/
+	@Transactional
+	public String saveStudentStrength(int total_students, int total_girls, int total_boys, int others,int special_child, int school_id) {
+	    // Check if a record already exists for the given school_id
+	    String checkSql = "SELECT COUNT(*) FROM student_strength WHERE school_id = ?";
+	    try {
+	        int count = jdbcTemplate.queryForObject(checkSql, new Object[]{school_id}, Integer.class);
+	        if (count > 0) {
+	            return "Student Strength for this school is already recorded.";
+	        }
+
+	        // Proceed with insert if no record found
+	        String insertSql = "INSERT INTO student_strength (total_students, total_girls, total_boys, others, special_child,school_id) VALUES (?,?, ?, ?, ?, ?)";
+	        jdbcTemplate.update(insertSql, total_students, total_girls, total_boys, others,special_child, school_id);
+	        return "Student Strength saved successfully";
+
+	    } catch (DataAccessException e) {
+	        e.printStackTrace();
+	        return "Error saving student strength.";
+	    }
 	}
 
+
 //	@Transactional
 //	public String saveStaffStrength(int tot_staff, int sg_staff, int bt_staff, int pg_staff, int temp_staff,
 //			int ngo_staff, int kg_staff, int pt_staff, int part_staff, int qa_staff, int kg_ayha, int watchman,
@@ -81,7 +129,9 @@ public class SchoolPropertyService {
 //		}
 //	}
 
-	@Transactional
+	
+	//initial
+	/*@Transactional
 	public String saveToilets(int total_toiletBlocks, int total_male_urinals, int total_wc_male, int total_wc_female,
 			int total_diffAbled_toilet, Boolean is_napkins, int school_id) {
 		String sql = "INSERT INTO toilet (total_toiletBlocks, total_male_urinals, total_wc_male, total_wc_female, total_diffAbled_toilet, is_napkins, school_id) VALUES (?, ?, ?, ?, ?, ?, ?)";
@@ -93,9 +143,30 @@ public class SchoolPropertyService {
 			e.printStackTrace();
 			return "error";
 		}
-	}
-
+	}*/
 	@Transactional
+	public String saveToilets(Integer total_toiletBlocks, int total_male_urinals,int total_female_urinals,int staff_male_toilets,int staff_female_toilets, int total_wc_male, int total_wc_female,
+	                          int total_diffAbled_toilet, Boolean is_napkins, int school_id) {
+	    String checkSql = "SELECT COUNT(*) FROM toilet WHERE school_id = ?";
+	    int count = jdbcTemplate.queryForObject(checkSql, Integer.class, school_id);
+
+	    if (count > 0) {
+	        return "Toilet data already exists for this school. Insertion not allowed.";
+	    }
+
+	    String insertSql = "INSERT INTO toilet (total_toiletBlocks, total_male_urinals, total_wc_male, total_wc_female, total_diffAbled_toilet, is_napkins, school_id,total_female_urinals,staff_male_toilet,staff_female_toilet) VALUES (?, ?, ?, ?, ?, ?, ?,?,?,?)";
+
+	    try {
+	        jdbcTemplate.update(insertSql, total_toiletBlocks, total_male_urinals, total_wc_male, total_wc_female,
+	                total_diffAbled_toilet, is_napkins, school_id,total_female_urinals,staff_male_toilets,staff_female_toilets);
+	        return "Toilet Details saved successfully";
+	    } catch (DataAccessException e) {
+	        e.printStackTrace();
+	        return "Error while saving toilet details";
+	    }
+	}
+//initial
+	/*@Transactional
 	public String saveKitchen(Boolean is_cmbfs, Boolean is_cmbfsIndividual, Boolean is_noonmeal,
 			Boolean is_noonIndividual, Boolean is_vegGarden, Boolean is_anganwadi, String anganwadi_unique,
 			Boolean is_anganwadiIndividual, int school_id) {
@@ -108,9 +179,58 @@ public class SchoolPropertyService {
 			e.printStackTrace();
 			return "error";
 		}
+	}*/
+
+@Transactional
+	public int saveKitchen(Boolean is_cmbfs, Boolean is_cmbfsIndividual, Boolean is_noonmeal, Boolean is_noonIndividual,
+			Boolean is_vegGarden, Boolean is_anganwadi, int school_id) {
+		String sql = "INSERT INTO kitchen (is_cmbfs, is_cmbfsIndividual, is_noonmeal, is_noonIndividual, is_vegGarden, is_anganwadi, school_id) VALUES (?, ?, ?, ?, ?, ?, ?)";
+		try {
+			KeyHolder keyHolder = new GeneratedKeyHolder();
+			jdbcTemplate.update(connection -> {
+				PreparedStatement ps = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
+				ps.setObject(1, is_cmbfs, Types.BOOLEAN);
+	            ps.setObject(2, is_cmbfsIndividual, Types.BOOLEAN);
+	            ps.setObject(3, is_noonmeal, Types.BOOLEAN);
+	            ps.setObject(4, is_noonIndividual, Types.BOOLEAN);
+	            ps.setObject(5, is_vegGarden, Types.BOOLEAN);
+	            ps.setObject(6, is_anganwadi, Types.BOOLEAN);
+				ps.setInt(7, school_id);
+				return ps;
+			}, keyHolder);
+			Number generatedDataId = keyHolder.getKey();
+			int playgoundID = generatedDataId.intValue();
+			return playgoundID;
+		} catch (DataAccessException e) {
+			e.printStackTrace();
+			return 0;
+		}
+	}
+	
+	@Transactional
+	public void saveAnganwadi(String anganwadi_unique, Boolean is_anganwadiIndividual, int kitchen_id, int school_id) {
+		String sql = "INSERT INTO anganwadi_details (anganwadi_unique, is_anganwadiIndividual, kitchen_id, school_id) VALUES (?, ?, ?, ?)";
+		try {
+			jdbcTemplate.update(sql, anganwadi_unique, is_anganwadiIndividual, kitchen_id, school_id);
+		} catch (DataAccessException e) {
+			e.printStackTrace();
+		}
+		
 	}
 
 	@Transactional
+	public void updateAnganwadiCheck(String anganwadi_unique, int school_id) {
+		String sql ="UPDATE room_details SET anganwadi_check = 1 WHERE anganwadi_unique_number = ? AND school_id = ?";
+		
+		try {
+			jdbcTemplate.update(sql, anganwadi_unique, school_id);
+		} catch (DataAccessException e) {
+			e.printStackTrace();
+		}
+	}
+
+//initial
+	/*@Transactional
 	public int savePlayground(Boolean is_playground, Double playground_area, Boolean is_court, int school_id) {
 		String sql = "INSERT INTO playground (is_playground, playground_area, is_court, school_id) VALUES (?, ?, ?, ?)";
 		try {
@@ -131,9 +251,37 @@ public class SchoolPropertyService {
 			return 0;
 		}
 
+	}*/
+	@Transactional
+	public int savePlayground(Boolean is_playground, Double playground_area, Boolean is_court, int school_id) {
+	    String checkSql = "SELECT playground_id FROM playground WHERE school_id = ?";
+	    List<Integer> existing = jdbcTemplate.queryForList(checkSql, Integer.class, school_id);
+
+	    if (!existing.isEmpty()) {
+	        // Return existing ID without inserting new row
+	        return existing.get(0);
+	    }
+
+	    // Insert new record
+	    String insertSql = "INSERT INTO playground (is_playground, playground_area, is_court, school_id) VALUES (?, ?, ?, ?)";
+	    KeyHolder keyHolder = new GeneratedKeyHolder();
+	    jdbcTemplate.update(connection -> {
+	        PreparedStatement ps = connection.prepareStatement(insertSql, Statement.RETURN_GENERATED_KEYS);
+	        ps.setBoolean(1, is_playground);
+	        ps.setDouble(2, playground_area);
+	        ps.setBoolean(3, is_court);
+	        ps.setInt(4, school_id);
+	        return ps;
+	    }, keyHolder);
+
+	    Number generatedId = keyHolder.getKey();
+	    return generatedId != null ? generatedId.intValue() : 0;
 	}
 
-	@Transactional
+
+
+	//initiall
+	/*@Transactional
 	public void saveEquipmentDetails(String equipment_id, int school_id, int playground_id) {
 		String sql = "INSERT INTO equipment_details (equipment_id, school_id, playground_id) VALUES (?, ?, ?)";
 		try {
@@ -141,7 +289,22 @@ public class SchoolPropertyService {
 		} catch (DataAccessException e) {
 			e.printStackTrace();
 		}
+	}*/
+	@Transactional
+	public boolean saveEquipmentDetails(String equipment_id, int school_id, int playground_id) {
+	    String checkSql = "SELECT COUNT(*) FROM equipment_details WHERE equipment_id = ? AND school_id = ? AND playground_id = ?";
+	    Integer count = jdbcTemplate.queryForObject(checkSql, Integer.class, equipment_id, school_id, playground_id);
+	    if (count != null && count < 0) {
+	        return false;
+	    }
+
+	    String insertSql = "INSERT INTO equipment_details (equipment_id, school_id, playground_id) VALUES (?, ?, ?)";
+	    jdbcTemplate.update(insertSql, equipment_id, school_id, playground_id);
+	    return true;
 	}
+
+	
+	
 	@Transactional
 	public void updatePlayground(Boolean is_playground, Double playground_area, Boolean is_court, int school_id, int playground_id) {
 	    String sql = "UPDATE playground SET is_playground = ?, playground_area = ?, is_court = ? WHERE playground_id = ? AND school_id = ?";
@@ -153,8 +316,8 @@ public class SchoolPropertyService {
 	    }
 	}
 
-
-	@Transactional
+//initial
+	/*@Transactional
 	public void saveCourtDetails(String court_id, int school_id, int playground_id) {
 		String sql = "INSERT INTO courts_details (court_id, school_id, playground_id) VALUES (?, ?, ?)";
 		try {
@@ -163,12 +326,39 @@ public class SchoolPropertyService {
 			e.printStackTrace();
 		}
 
+	}*/
+	@Transactional
+	public boolean saveCourtDetails(String court_id, int school_id, int playground_id) {
+	    String checkSql = "SELECT COUNT(*) FROM courts_details WHERE court_id = ? AND school_id = ? AND playground_id = ?";
+	    Integer count = jdbcTemplate.queryForObject(checkSql, Integer.class, court_id, school_id, playground_id);
+	    if (count != null && count > 0) {
+	        return false;
+	    }
+
+	    String insertSql = "INSERT INTO courts_details (court_id, school_id, playground_id) VALUES (?, ?, ?)";
+	    jdbcTemplate.update(insertSql, court_id, school_id, playground_id);
+	    return true;
+	}
+	
+	public boolean existsDrinkingWaterData(int schoolId) {
+	    String drinkingWaterSql = "SELECT COUNT(*) FROM drinking_water WHERE school_id = ?";
+	    String waterSupplySql = "SELECT COUNT(*) FROM water_supply WHERE school_id = ?";
+	    String waterStorageSql = "SELECT COUNT(*) FROM water_storage WHERE school_id = ?";
+
+	    int drinkingWaterCount = jdbcTemplate.queryForObject(drinkingWaterSql, Integer.class, schoolId);
+	    int waterSupplyCount = jdbcTemplate.queryForObject(waterSupplySql, Integer.class, schoolId);
+	    int waterStorageCount = jdbcTemplate.queryForObject(waterStorageSql, Integer.class, schoolId);
+
+	    return drinkingWaterCount > 0 || waterSupplyCount > 0 || waterStorageCount > 0;
 	}
 
+
+	
+
 	@Transactional
 	public int saveDrinkingWater(Boolean is_purifier, Double purifier_capacity, Boolean is_borewell,
-			Integer borewell_count, Boolean is_storage, int school_id) {
-		String sql = "INSERT INTO drinking_water (is_purifier, purifier_capacity, is_borewell, borewell_count, is_storage, school_id) VALUES (?, ?, ?, ?, ?, ?)";
+			Integer borewell_count, Boolean is_storage, int school_id,int drinkingwater_tap,int handwash_tap) {
+		String sql = "INSERT INTO drinking_water (is_purifier, purifier_capacity, is_borewell, borewell_count, is_storage, school_id,drinkingwater_tap,handwash_tap) VALUES (?, ?, ?, ?, ?, ?,?,?)";
 		try {
 			KeyHolder keyHolder = new GeneratedKeyHolder();
 			jdbcTemplate.update(connection -> {
@@ -189,6 +379,8 @@ public class SchoolPropertyService {
 				}
 				ps.setBoolean(5, is_storage);
 				ps.setInt(6, school_id);
+				ps.setInt(7, drinkingwater_tap);
+				ps.setInt(8, handwash_tap);
 				return ps;
 			}, keyHolder);
 			Number generatedDataId = keyHolder.getKey();
@@ -222,8 +414,8 @@ public class SchoolPropertyService {
 		}
 
 	}
-
-	@Transactional
+//initial
+	/*@Transactional
 	public void saveStaffStrength(int sgRegTeacher, int sgTempTeacher, int sgPtTeacher, int sgNgoTeacher,
 			int btRegTeacher, int btTempTeacher, int btPtTeacher, int btNgoTeacher, int pgRegTeacher, int pgTempTeacher,
 			int pgPtTeacher, int pgNgoTeacher, int kgRegTeacher, int kgTempTeacher, int petRegTeacher, int petTempTeacher, int petGrade1Teacher, int petGrade2Teacher, int totOa, int kgAyah, int compAss,
@@ -239,7 +431,106 @@ public class SchoolPropertyService {
 		jdbcTemplate.update(sql, sgRegTeacher, sgTempTeacher, sgPtTeacher, sgNgoTeacher, btRegTeacher, btTempTeacher,
 				btPtTeacher, btNgoTeacher, pgRegTeacher, pgTempTeacher, pgPtTeacher, pgNgoTeacher, kgRegTeacher, kgTempTeacher,
 				petRegTeacher, petTempTeacher, petGrade1Teacher, petGrade2Teacher, totOa, kgAyah, compAss, watchmen, scavengers, maintenanceWork, schoolId);
+	}*/
+	@Transactional
+	public String saveStaffStrength(int sgRegTeacher, int sgTempTeacher, int sgPtTeacher, int sgNgoTeacher,
+			int btRegTeacher, int btTempTeacher, int btPtTeacher, int btNgoTeacher, int pgRegTeacher, int pgTempTeacher,
+			int pgPtTeacher, int pgNgoTeacher, int kgRegTeacher, int kgTempTeacher, int petRegTeacher,
+			int petTempTeacher, int petGrade1Teacher, int petGrade2Teacher, int petPtTeacher, Boolean is_hm,
+			int stRegTeacher, int stPtTeacher, int totOa, int kgAyah, int compAss, String watchmen, int scavengers,
+			int maintenanceWork, int schoolId, List<String> specialCategoryId) {
+		try {
+		int staff_id = saveStaffCounts(sgRegTeacher, sgTempTeacher, sgPtTeacher, sgNgoTeacher, btRegTeacher,
+				btTempTeacher, btPtTeacher, btNgoTeacher, pgRegTeacher, pgTempTeacher, pgPtTeacher, pgNgoTeacher,
+				kgRegTeacher, kgTempTeacher, petRegTeacher, petTempTeacher, petGrade1Teacher, petGrade2Teacher, petPtTeacher,
+				is_hm, stRegTeacher, stPtTeacher, totOa, kgAyah, compAss, watchmen, scavengers, maintenanceWork, schoolId);
+		
+		if(!specialCategoryId.isEmpty()) {
+			for(String special_category_id : specialCategoryId) {
+				saveSpecialCategoryDetails(special_category_id, schoolId, staff_id);
+			}
+		}
+		
+		
+		return "Staff Details Saved Sucessfully";
+		} catch (Exception e) {
+			e.printStackTrace();
+			return "Error";
+		}
+		
 	}
+	
+
+	
+	private void saveSpecialCategoryDetails(String special_category_id, int schoolId, int staff_id) {
+				
+		String sql = "INSERT INTO special_category_details (special_category_id, school_id, staff_id) VALUES (?, ?, ?)";
+		try {
+			jdbcTemplate.update(sql, special_category_id, schoolId, staff_id);
+		} catch (DataAccessException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public int saveStaffCounts(int sgRegTeacher, int sgTempTeacher, int sgPtTeacher, int sgNgoTeacher,
+			int btRegTeacher, int btTempTeacher, int btPtTeacher, int btNgoTeacher, int pgRegTeacher, int pgTempTeacher,
+			int pgPtTeacher, int pgNgoTeacher, int kgRegTeacher, int kgTempTeacher, int petRegTeacher, int petTempTeacher, int petGrade1Teacher, int petGrade2Teacher, 
+			int petPtTeacher,Boolean is_hm, int stRegTeacher, int stPtTeacher, 
+			int totOa, int kgAyah, int compAss, String watchmen, int scavengers, int maintenanceWork, int schoolId) {
+		String sql = "INSERT INTO staff_strength_1 ( "
+				+ " sg_reg_teacher, sg_temp_teacher, sg_pt_teacher, sg_ngo_teacher, "
+				+ " bt_reg_teacher, bt_temp_teacher, bt_pt_teacher, bt_ngo_teacher, "
+				+ " pg_reg_teacher, pg_temp_teacher, pg_pt_teacher, pg_ngo_teacher, "
+				+ " kg_reg_teacher, kg_temp_teacher, "
+				+ " pet_reg_teacher, pet_temp_teacher, pet_grade1_teacher, pet_grade2_teacher, pet_pt_teacher, "
+				+ " is_hm, st_reg_teacher, st_pt_teacher, tot_oa, kg_ayah, comp_ass, "
+				+ " watchmen, scavengers, maintenance_work, school_id) "
+				+ " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ";
+		
+		try {
+			KeyHolder keyHolder = new GeneratedKeyHolder();
+			jdbcTemplate.update(connection -> {
+				PreparedStatement ps = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
+				ps.setInt(1, sgRegTeacher);
+				ps.setInt(2, sgTempTeacher);
+				ps.setInt(3, sgPtTeacher);
+				ps.setInt(4, sgNgoTeacher);
+				ps.setInt(5, btRegTeacher);
+				ps.setInt(6, btTempTeacher);
+				ps.setInt(7, btPtTeacher);
+				ps.setInt(8, btNgoTeacher);
+				ps.setInt(9, pgRegTeacher);
+				ps.setInt(10, pgTempTeacher);
+				ps.setInt(11, pgPtTeacher);
+				ps.setInt(12, pgNgoTeacher);
+				ps.setInt(13, kgRegTeacher);
+				ps.setInt(14, kgTempTeacher);
+				ps.setInt(15, petRegTeacher);
+				ps.setInt(16, petTempTeacher);
+				ps.setInt(17, petGrade1Teacher);
+				ps.setInt(18, petGrade2Teacher);
+				ps.setInt(19, petPtTeacher);
+				ps.setBoolean(20, is_hm);
+				ps.setInt(21, stRegTeacher);
+				ps.setInt(22, stPtTeacher);
+				ps.setInt(23, totOa);
+				ps.setInt(24, kgAyah);
+				ps.setInt(25, compAss);
+				ps.setString(26, watchmen);
+				ps.setInt(27, scavengers);
+				ps.setInt(28, maintenanceWork);
+				ps.setInt(29, schoolId);
+				return ps;
+			}, keyHolder);
+			Number generatedDataId = keyHolder.getKey();
+			int playgoundID = generatedDataId.intValue();
+			return playgoundID;
+		} catch (DataAccessException e) {
+			e.printStackTrace();
+			return 0;
+		}
+	}
+
 
 	@Transactional
 	public String getSchoolId(String user_id) {
@@ -261,6 +552,7 @@ public class SchoolPropertyService {
 			return List.of();
 		}
 	}
+	
 
 	@Transactional
 	public Map<String, Object> getSchoolDetails(Long schoolId) {
@@ -268,37 +560,39 @@ public class SchoolPropertyService {
 		return jdbcTemplate.queryForMap(sql, schoolId);
 	}
 
-	public List<Map<String, Object>> filterSchools(String userId, String udise, String category, String zone, String ward) {
-	    String sql = "SELECT "
-	    		+ "	            s.id,"
-	    		+ "	            s.udise,"
-	    		+ "	            s.school_name,"
-	    		+ "	            s.category,"
-	    		+ "	            s.zone,"
-	    		+ "	            s.division,"
-	    		+ "	            s.address"
-	    		+ "	        FROM "
-	    		+ "	            school_list s"
-	    		+ "	        JOIN "
-	    		+ "	            login_details l ON FIND_IN_SET(s.id, l.school_id) > 0"
-	    		+ "	        WHERE "
-	    		+ "	            l.user_id = ?"
-	    		+ "	            AND (? = '' OR s.udise = ?)"
-	    		+ "	            AND (? = '' OR s.category = ?)"
-	    		+ "	            AND (? = '' OR s.zone = ?)"
-	    		+ "	            AND (? = '' OR s.division = ?)";
-
-	    return jdbcTemplate.queryForList(
-	        sql,
-	        userId,
-	        udise, udise,
-	        category, category,
-	        zone, zone,
-	        ward, ward
+	public List<Map<String, Object>> filterSchools(String userId, String udise, String category, String zone, String division) {
+	    StringBuilder sql = new StringBuilder(
+	        "SELECT s.id, s.udise, s.school_name, s.category, s.zone, s.division, s.address " +
+	        "FROM school_list s " +
+	        "JOIN login_details l ON FIND_IN_SET(s.id, l.school_id) > 0 " +
+	        "WHERE l.user_id = ?"
 	    );
+
+	    List<Object> params = new ArrayList<>();
+	    params.add(userId); // required
+
+	    if (udise != null && !udise.isEmpty()) {
+	        sql.append(" AND s.udise = ?");
+	        params.add(udise);
+	    }
+	    if (category != null && !category.isEmpty()) {
+	        sql.append(" AND s.category = ?");
+	        params.add(category);
+	    }
+	    if (zone != null && !zone.isEmpty()) {
+	        sql.append(" AND s.zone = ?");
+	        params.add(zone);
+	    }
+	    if (division != null && !division.isEmpty()) {
+	        sql.append(" AND s.division = ?");
+	        params.add(division);
+	    }
+
+	    return jdbcTemplate.queryForList(sql.toString(), params.toArray());
 	}
+	
 	@Transactional
-	public String updateOtherDetails(Double land_area, Double buildup_area, Boolean is_compound, Boolean is_nameboard,
+	public String updateOtherDetails(Double land_area, Double buildup_area, int is_compound, Boolean is_nameboard,
 			Boolean is_pasystem, Boolean is_bell, Boolean is_generator, int school_id) {
 		String sql = "UPDATE school_buildup_area SET land_area = ?, buildup_area = ?, is_compound = ?, is_nameboard = ?, is_pasystem = ?, is_bell = ?, is_generator = ? WHERE school_id = ? ";
 		try {
@@ -311,20 +605,30 @@ public class SchoolPropertyService {
 		}
 	}
 	@Transactional
-	public String updateStudentDetails(int total_students, int total_girls, int total_boys, int others, int school_id) {
-		String sql = "UPDATE student_strength SET total_students = ?, total_girls = ?, total_boys = ?, others = ? WHERE school_id = ? ";
+	public String updateStudentDetails(int total_students, int total_girls, int total_boys, int others, int special_child,int school_id) {
+		String sql = "UPDATE student_strength SET total_students = ?, total_girls = ?, total_boys = ?, others = ?, special_child=? WHERE school_id = ? ";
 		try {
-			jdbcTemplate.update(sql, total_students, total_girls, total_boys, others, school_id);
+			jdbcTemplate.update(sql, total_students, total_girls, total_boys, others,special_child, school_id);
 			return "Success";
 		}catch (DataAccessException e) {
 			e.printStackTrace();
 			return "Error";
 		}	
 	}
-	
+	//initial
+	/*@Transactional
+	public Map<String, Object> checkPlaygroundDetails(int school_id) {
+		String sql = "SELECT * FROM playground WHERE school_id = ? ";
+		try {
+			return jdbcTemplate.queryForMap(sql, school_id);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return Collections.emptyMap();
+		}
+	}*/
 	@Transactional
 	public Map<String, Object> checkPlaygroundDetails(int school_id) {
-		String sql = "SELECT * FROM playground WHERE school_id = ?";
+		String sql = "SELECT * FROM playground WHERE school_id = ? ORDER BY playground_id DESC LIMIT 1 ";
 		try {
 			return jdbcTemplate.queryForMap(sql, school_id);
 		} catch (Exception e) {
@@ -347,11 +651,11 @@ public class SchoolPropertyService {
 //	public List<Map<String, Object>> checkCourtDetails(int school_id) {
 //	String sql = "select cm.court_type,cd.Courts_detais_id "
 //	+ "FROM "
-//	+ "playground p"
+//	+ "playground p\r\n"
 //	+ "INNER JOIN "
-//	+ "    courts_details cd ON p.playground_id = cd.playground_id"
+//	+ "    courts_details cd ON p.playground_id = cd.playground_id\r\n"
 //	+ "INNER JOIN "
-//	+ "    courts_master cm ON cd.court_id = cm.court_id"
+//	+ "    courts_master cm ON cd.court_id = cm.court_id\r\n"
 //	+ "    WHERE "
 //	+ "    p.school_id = ?";
 //	try {
@@ -361,20 +665,49 @@ public class SchoolPropertyService {
 //	return List.of();
 //	}
 //	}
-	
-	@Transactional
+	//initial
+	/*@Transactional
 	public List<Map<String, Object>> checkCourtDetails(int school_id) {
-	    String sql = "SELECT cm.court_type, cd.Courts_detais_id, cd.court_id"
-	    		+ "	        FROM playground p"
-	    		+ "	        INNER JOIN courts_details cd ON p.playground_id = cd.playground_id"
-	    		+ "	        INNER JOIN courts_master cm ON cd.court_id = cm.court_id"
-	    		+ "	        WHERE p.school_id = ?  and cd.is_active = 1";
+	    String sql = """
+	        SELECT cm.court_type, cd.Courts_detais_id, cd.court_id
+	        FROM playground p
+	        INNER JOIN courts_details cd ON p.playground_id = cd.playground_id
+	        INNER JOIN courts_master cm ON cd.court_id = cm.court_id
+	        WHERE p.school_id = ?  and cd.is_active = 1
+	    """;
 	    try {
 	        return jdbcTemplate.queryForList(sql, school_id);
 	    } catch (Exception e) {
 	        e.printStackTrace();
 	        return List.of();
 	    }
+	}*/
+	
+	@Transactional
+	public List<Map<String, Object>> checkCourtDetails(int schoolId) {
+	    String sql = "" +
+	        "SELECT \n" +
+	        "    cm.court_type, \n" +
+	        "    cd.Courts_detais_id, \n" +
+	        "    cd.court_id, \n" +
+	        "    p.* \n" +
+	        "FROM gcc_school.playground p \n" +
+	        "INNER JOIN gcc_school.courts_details cd ON p.playground_id = cd.playground_id \n" +
+	        "INNER JOIN gcc_school.courts_master cm ON cd.court_id = cm.court_id \n" +
+	        "WHERE p.school_id = ? \n" +
+	        "  AND cd.is_active = 1 \n" +
+	        "  AND p.playground_id = ( \n" +
+	        "      SELECT MAX(playground_id) \n" +
+	        "      FROM gcc_school.playground \n" +
+	        "      WHERE school_id = ? \n" +
+	        "  )";
+
+	    try {
+	        return jdbcTemplate.queryForList(sql, schoolId, schoolId);
+	    } catch (Exception e) {
+	        e.printStackTrace();
+	        return List.of();
+	    }
 	}
 
 
@@ -382,11 +715,11 @@ public class SchoolPropertyService {
 //	public List<Map<String, Object>> checkEquipmentDetails(int school_id) {
 //	String sql = "select em.equipment_type,ed.equipment_detais_id "
 //	+ "FROM "
-//	+ "playground p"
+//	+ "playground p\r\n"
 //	+ "INNER JOIN "
-//	+ "    equipment_details ed ON p.playground_id = ed.playground_id"
+//	+ "    equipment_details ed ON p.playground_id = ed.playground_id\r\n"
 //	+ "INNER JOIN "
-//	+ "    equipment_master em ON ed.equipment_id = em.equipment_id"
+//	+ "    equipment_master em ON ed.equipment_id = em.equipment_id\r\n"
 //	+ "    WHERE "
 //	+ "    p.school_id = ?";
 //	try {
@@ -397,18 +730,41 @@ public class SchoolPropertyService {
 //	}
 //	}
 	//ajith
-	public List<Map<String, Object>> checkEquipmentDetails(int school_id) {
-	    String sql = "SELECT em.equipment_id, em.equipment_type, ed.equipment_detais_id"
-	    		+ "	        FROM playground p"
-	    		+ "	        INNER JOIN equipment_details ed ON p.playground_id = ed.playground_id"
-	    		+ "	        INNER JOIN equipment_master em ON ed.equipment_id = em.equipment_id"
-	    		+ "	        WHERE p.school_id = ? and ed.is_active = 1";
+	//initial
+	/*public List<Map<String, Object>> checkEquipmentDetails(int school_id) {
+	    String sql = """
+	        SELECT em.equipment_id, em.equipment_type, ed.equipment_detais_id
+	        FROM playground p
+	        INNER JOIN equipment_details ed ON p.playground_id = ed.playground_id
+	        INNER JOIN equipment_master em ON ed.equipment_id = em.equipment_id
+	        WHERE p.school_id = ? and ed.is_active = 1 """;
 	    try {
 	        return jdbcTemplate.queryForList(sql, school_id);
 	    } catch (Exception e) {
 	        e.printStackTrace();
 	        return List.of();
 	    }
+	}*/
+	public List<Map<String, Object>> checkEquipmentDetails(int school_id) {
+	    String sql = "" +
+	        "SELECT em.equipment_id, em.equipment_type, ed.equipment_detais_id \n" +
+	        "FROM playground p \n" +
+	        "INNER JOIN equipment_details ed ON p.playground_id = ed.playground_id \n" +
+	        "INNER JOIN equipment_master em ON ed.equipment_id = em.equipment_id \n" +
+	        "WHERE p.school_id = ? \n" +
+	        "  AND ed.is_active = 1 \n" +
+	        "  AND p.playground_id = ( \n" +
+	        "      SELECT MAX(playground_id) \n" +
+	        "      FROM playground \n" +
+	        "      WHERE school_id = ? \n" +
+	        "  )";
+
+	    try {
+	        return jdbcTemplate.queryForList(sql, school_id, school_id);  // pass school_id twice
+	    } catch (Exception e) {
+	        e.printStackTrace();
+	        return List.of();
+	    }
 	}
 
 private void updateEquipmentDetails(Integer equipment_id, int equipment_detais_id) {
@@ -554,21 +910,57 @@ public String updatePlaygroundDetails(Boolean is_playground, Double playground_a
 		
 	}
 
-	@Transactional
-	public String updateKitchenDetails(Boolean is_cmbfs, Boolean is_cmbfsIndividual, Boolean is_noonmeal,
-			Boolean is_noonIndividual, Boolean is_vegGarden, Boolean is_anganwadi, String anganwadi_unique,
-			Boolean is_anganwadiIndividual, int school_id) {
-		String sql = "UPDATE kitchen SET is_cmbfs = ?, is_cmbfsIndividual = ?, is_noonmeal = ?, is_noonIndividual = ?, is_vegGarden = ?, is_anganwadi = ?, anganwadi_unique = ?, is_anganwadiIndividual = ? WHERE school_id = ? ";
+	public void updateKitchenDetails(Boolean is_cmbfs, Boolean is_cmbfsIndividual, Boolean is_noonmeal,
+			Boolean is_noonIndividual, Boolean is_vegGarden, Boolean is_anganwadi,int school_id) {
+    System.out.println("inside");
+		String sql = "UPDATE kitchen SET is_cmbfs = ?, is_cmbfsIndividual = ?, is_noonmeal = ?, is_noonIndividual = ?, is_vegGarden = ?, is_anganwadi = ? WHERE school_id = ? ";
+			
 		try {
-			jdbcTemplate.update(sql, is_cmbfs, is_cmbfsIndividual, is_noonmeal, is_noonIndividual, is_vegGarden,
-					is_anganwadi, anganwadi_unique, is_anganwadiIndividual, school_id);
-			return "Success";
+			jdbcTemplate.update(sql, is_cmbfs,is_cmbfsIndividual,is_noonmeal,is_noonIndividual,is_vegGarden,is_anganwadi, school_id);
 		} catch (DataAccessException e) {
 			e.printStackTrace();
-			return "Error";
 		}
+		
 	}
-	@Transactional
+	
+	public void saveOldAnganwadi(String anganwadi_unique, Boolean is_anganwadiIndividual, int school_id) {
+		
+		String sql = "UPDATE anganwadi_details SET is_anganwadiIndividual = ? WHERE school_id = ? AND anganwadi_unique=?";
+
+		try {
+			jdbcTemplate.update(sql,is_anganwadiIndividual,school_id,anganwadi_unique);
+		} catch (DataAccessException e) {
+			e.printStackTrace();
+		}
+		
+	}
+	
+	public int getKitchenIdbySchId(int school_id) {
+
+		String sql = "SELECT kitchen_id FROM kitchen WHERE school_id=? Limit 1";
+
+		try {
+	        return jdbcTemplate.queryForObject(sql, new Object[]{school_id}, Integer.class);
+	    } catch (EmptyResultDataAccessException e) {
+	        // No kitchen found for this school_id
+	        return 0;
+	    }
+		
+	}
+	
+	public void saveNewAnganwadi(String new_anganwadi_unique, Boolean new_is_anganwadiIndividual, int kitchen_id,
+			int school_id) {
+		
+		String sql = "INSERT INTO anganwadi_details (anganwadi_unique, is_anganwadiIndividual, kitchen_id, school_id) VALUES (?, ?, ?, ?)";
+		
+		try {
+			jdbcTemplate.update(sql, new_anganwadi_unique, new_is_anganwadiIndividual, kitchen_id, school_id);
+		} catch (DataAccessException e) {
+			e.printStackTrace();
+		}
+	}
+	//initial
+	/*@Transactional
 	public Map<String, Object> checkKitchenDetails(int school_id) {
 		String sql = "SELECT * FROM kitchen WHERE school_id = ?";
 		try {
@@ -577,6 +969,36 @@ public String updatePlaygroundDetails(Boolean is_playground, Double playground_a
 			e.printStackTrace();
 			return Collections.emptyMap();
 		}
+	}*/
+	@Transactional
+	public Map<String, Object> checkKitchenDetails(int school_id) {
+		String sql = "SELECT * FROM kitchen WHERE school_id = ? ORDER BY kitchen_id DESC LIMIT 1";
+		try {
+			return jdbcTemplate.queryForMap(sql, school_id);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return Collections.emptyMap();
+		}
+	}
+	@Transactional
+	public List<Map<String, Object>> checkOldAnganwadiDetails(int school_id) {
+		String sql = "SELECT * FROM anganwadi_details WHERE school_id = ? AND is_active = 1 AND is_delete = 0";
+		try {
+			return jdbcTemplate.queryForList(sql, school_id);
+		} catch (Exception e) {
+			 e.printStackTrace();
+		        return List.of();
+		}
+	}
+	@Transactional
+	public List<Map<String, Object>> checkNewAnganwadiDetails(int school_id) {
+		String sql = "SELECT * FROM room_details WHERE school_id = ? AND anganwadi_check = 0 AND is_active = 1 AND is_delete = 0";
+		try {
+			return jdbcTemplate.queryForList(sql, school_id);
+		} catch (Exception e) {
+			 e.printStackTrace();
+		        return List.of();
+		}
 	}
 	/*@Transactional
 	public String updateStaffDetails(int sgRegTeacher, int sgTempTeacher, int sgPtTeacher, int sgNgoTeacher,
@@ -631,7 +1053,8 @@ public String updatePlaygroundDetails(Boolean is_playground, Double playground_a
 	        return "Error";
 	    }
 	}
-	@Transactional
+	//initial
+	/*@Transactional
 	public Map<String, Object> checkWaterDetails(int school_id) {
 		String sql = "select drinking_water_id, is_purifier, borewell_count, is_borewell, is_storage, purifier_capacity from drinking_water where school_id = ?";
 	    try {
@@ -640,17 +1063,27 @@ public String updatePlaygroundDetails(Boolean is_playground, Double playground_a
 	        e.printStackTrace();
 	        return Collections.emptyMap(); 
 	    }
-	}
-	
+	}*/
 	@Transactional
+	public Map<String, Object> checkWaterDetails(int school_id) {
+		String sql = "select drinking_water_id, is_purifier, borewell_count, is_borewell, is_storage, purifier_capacity from drinking_water where school_id = ? ORDER BY drinking_water_id DESC LIMIT 1";
+	    try {
+	        return jdbcTemplate.queryForMap(sql, school_id);
+	    } catch (Exception e) {
+	        e.printStackTrace();
+	        return Collections.emptyMap(); 
+	    }
+	}
+	//initial
+	/*@Transactional
 	public List<Map<String, Object>> checkWaterSource(int school_id) {
 		String sql = "select ws.water_supply_id, ws.source_water_id, ws.supply_type, sw.water_type "
-				+ "FROM " 
-				+ "drinking_water dw "
-				+ "	INNER JOIN "
-				+ "    water_supply ws ON dw.drinking_water_id = ws.drinking_water_id "
-				+ "	INNER JOIN "
-				+ "    source_water sw ON ws.source_water_id = sw.source_water_id "
+				+ "FROM "
+				+ "drinking_water dw\r\n"
+				+ "INNER JOIN "
+				+ "    water_supply ws ON dw.drinking_water_id = ws.drinking_water_id\r\n"
+				+ "INNER JOIN "
+				+ "    source_water sw ON ws.source_water_id = sw.source_water_id\r\n"
 				+ "    WHERE "
 				+ "    dw.school_id = ? and ws.is_active = 1";
 	    try {
@@ -659,6 +1092,24 @@ public String updatePlaygroundDetails(Boolean is_playground, Double playground_a
 	        e.printStackTrace();
 	        return List.of();
 	    }
+	}*/
+	@Transactional
+	public List<Map<String, Object>> checkWaterSource(int school_id) {
+		String sql = "select ws.water_supply_id, ws.source_water_id, ws.supply_type, sw.water_type "
+				+ "FROM "
+				+ "drinking_water dw\r\n"
+				+ "INNER JOIN "
+				+ "    water_supply ws ON dw.drinking_water_id = ws.drinking_water_id\r\n"
+				+ "INNER JOIN "
+				+ "    source_water sw ON ws.source_water_id = sw.source_water_id\r\n"
+				+ "    WHERE "
+				+ "    dw.school_id = ? and ws.is_active = 1 ORDER BY water_supply_id";// DESC LIMIT 1";
+	    try {
+	        return jdbcTemplate.queryForList(sql, school_id);
+	    } catch (Exception e) {
+	        e.printStackTrace();
+	        return List.of();
+	    }
 	}
 //	@Transactional
 //	public String updateDrinkingWater(Boolean is_purifier, Double purifier_capacity, Boolean is_borewell,
@@ -693,7 +1144,7 @@ public String updatePlaygroundDetails(Boolean is_playground, Double playground_a
 	                                  List<Map<String, Object>> supply, List<Map<String, Object>> storage) {
 	    try {
 	        // Step 1: Update main table
-	        updateDrinkWater(is_purifier, purifier_capacity, is_borewell, borewell_count, is_storage, school_id, drinking_water_id);
+	        //updateDrinkWater(is_purifier, purifier_capacity, is_borewell, borewell_count, is_storage, school_id, drinking_water_id);
 
 	        // Step 2: UPSERT for water supply
 	        for (Map<String, Object> item : supply) {
@@ -784,12 +1235,12 @@ public String updatePlaygroundDetails(Boolean is_playground, Double playground_a
 	//ajith
 	@Transactional
 	public void updateDrinkWater(Boolean is_purifier, Double purifier_capacity, Boolean is_borewell,
-			int borewell_count, Boolean is_storage, int school_id, int drinking_water_id) {
-		System.out.println("===================helooo=================");
+			int borewell_count, Boolean is_storage, int school_id, int drinking_water_id,int drinkingwater_tap,int handwash_tap) {
+		
 		
-		String sql = "UPDATE drinking_water SET is_purifier = ?, purifier_capacity = ?, is_borewell = ?, borewell_count = ?, is_storage = ? WHERE drinking_water_id = ? and school_id = ? ";
+		String sql = "UPDATE drinking_water SET is_purifier = ?, purifier_capacity = ?, is_borewell = ?, borewell_count = ?, is_storage = ?,drinkingwater_tap=?,handwash_tap=? WHERE drinking_water_id = ? and school_id = ? ";
 		try {
-			jdbcTemplate.update(sql, is_purifier, purifier_capacity, is_borewell, borewell_count, is_storage, drinking_water_id, school_id);
+			jdbcTemplate.update(sql, is_purifier, purifier_capacity, is_borewell, borewell_count, is_storage,drinkingwater_tap, handwash_tap,drinking_water_id, school_id);
 		
 		}catch (DataAccessException e) {
 			e.printStackTrace();
@@ -841,16 +1292,16 @@ public String updatePlaygroundDetails(Boolean is_playground, Double playground_a
 		}
 	}
 
+	//initial
 	
-	
-	@Transactional
+	/*@Transactional
 	public List<Map<String, Object>> checkWaterStotage(int school_id) {
-		String sql = " select  wst.water_storage_id, wst.capacity, wstm.storage_type"
+		String sql = " select  wst.water_storage_id, wst.capacity, wstm.storage_type\r\n"
 				+ "    FROM "
-				+ "    drinking_water dw "
-				+ "    INNER JOIN"
+				+ "    drinking_water dw\r\n"
+				+ "    INNER JOIN\r\n"
 				+ "    water_storage wst ON dw.drinking_water_id = wst.drinking_water_id   "
-				+ "INNER JOIN"
+				+ "INNER JOIN\r\n"
 				+ "    water_storage_master wstm ON wst.storage_water_id = wstm.storage_water_id    "
 				+ "WHERE "
 				+ "    dw.school_id = ?  and wst.is_active = 1";
@@ -860,9 +1311,27 @@ public String updatePlaygroundDetails(Boolean is_playground, Double playground_a
 	        e.printStackTrace();
 	        return List.of();
 	    }
-	}
-
+	}*/
 	@Transactional
+	public List<Map<String, Object>> checkWaterStotage(int school_id) {
+		String sql = " select  wst.water_storage_id, wst.capacity, wstm.storage_type\r\n"
+				+ "    FROM "
+				+ "    drinking_water dw\r\n"
+				+ "    INNER JOIN\r\n"
+				+ "    water_storage wst ON dw.drinking_water_id = wst.drinking_water_id   "
+				+ "INNER JOIN\r\n"
+				+ "    water_storage_master wstm ON wst.storage_water_id = wstm.storage_water_id    "
+				+ "WHERE "
+				+ "    dw.school_id = ?  and wst.is_active = 1 ORDER BY water_storage_id"; //DESC LIMIT 1";
+	    try {
+	        return jdbcTemplate.queryForList(sql, school_id);
+	    } catch (Exception e) {
+	        e.printStackTrace();
+	        return List.of();
+	    }
+	}
+//initial
+	/*@Transactional
 	public List<Map<String, Object>> checkToiletDetails(int school_id) {
 		String sql = "SELECT * FROM toilet WHERE school_id = ?";
 		try {
@@ -871,14 +1340,24 @@ public String updatePlaygroundDetails(Boolean is_playground, Double playground_a
 			e.printStackTrace();
 			return List.of();
 		}
+	}*/
+	@Transactional
+	public List<Map<String, Object>> checkToiletDetails(int school_id) {
+		String sql = "SELECT * FROM toilet WHERE school_id = ? ORDER BY toilet_id DESC LIMIT 1";
+		try {
+			return jdbcTemplate.queryForList(sql, school_id);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return List.of();
+		}
 	}
 	
 	@Transactional
-	public String updateToiletDetails(int total_toiletBlocks, int total_male_urinals, int total_wc_male,
+	public String updateToiletDetails(Integer total_toiletBlocks, int total_male_urinals, int total_female_urinals,int staff_male_toilets,int staff_female_toilets,int total_wc_male,
 			int total_wc_female, int total_diffAbled_toilet, Boolean is_napkins, int school_id) {
-		String sql = "UPDATE toilet SET total_toiletBlocks = ?, total_male_urinals = ?, total_wc_male = ?, total_wc_female = ?, total_diffAbled_toilet = ?, is_napkins = ? WHERE school_id = ? ";
+		String sql = "UPDATE toilet SET total_toiletBlocks = ?, total_male_urinals = ?,total_female_urinals=?,staff_male_toilet=?,staff_female_toilet=?, total_wc_male = ?, total_wc_female = ?, total_diffAbled_toilet = ?, is_napkins = ? WHERE school_id = ? ";
 		try {
-			jdbcTemplate.update(sql, total_toiletBlocks, total_male_urinals, total_wc_male, total_wc_female,
+			jdbcTemplate.update(sql, total_toiletBlocks, total_male_urinals,total_female_urinals,staff_male_toilets,staff_female_toilets, total_wc_male, total_wc_female,
 					total_diffAbled_toilet, is_napkins, school_id);
 			return "Success";
 		} catch (DataAccessException e) {
@@ -909,11 +1388,11 @@ public String updatePlaygroundDetails(Boolean is_playground, Double playground_a
 		String sql="";
 		if(asset_id==2) {
 		 sql = "SELECT asm.asset_name, em.electrical_master_id, em.master_qty, em.mapped_qty, em.unmapped_qty, em.scrap_qty from electrical_master em "
-				+ " INNER JOIN asset_sub_master asm ON em.sub_asset_id = asm.sub_asset_id "
+				+ "INNER JOIN asset_sub_master asm ON em.sub_asset_id = asm.sub_asset_id\r\n"
 				+ " WHERE em.school_id = ?";
 		} else if(asset_id==3) {
 			sql = "SELECT asm.asset_name, fm.furniture_master_id, fm.master_qty, fm.mapped_qty, fm.unmapped_qty, fm.scrap_qty from furniture_master fm "
-					+ " INNER JOIN asset_sub_master asm ON fm.sub_asset_id = asm.sub_asset_id "
+					+ "INNER JOIN asset_sub_master asm ON fm.sub_asset_id = asm.sub_asset_id\r\n"
 					+ " WHERE fm.school_id = ?";
 		}
 		try {
@@ -957,7 +1436,108 @@ public String updatePlaygroundDetails(Boolean is_playground, Double playground_a
 		}
 	}
 	
+	public List<Map<String, Object>> getAnganwadiDetailsBySchId(int school_id) {
+		
+		String sql = "SELECT rd.room_id,rd.room_num AS room_name,bd.building_name, "
+				+ "rd.building_id,fl.floor_name AS floor, "
+				+ "rm.room_type,rd.school_id,rm.room_master_id,rd.anganwadi_unique_number, "
+				+ "fl.floors_id FROM room_details rd "
+				+ "JOIN buildings bd ON bd.buildng_id = rd.building_id "
+				+ "JOIN floor_list fl ON fl.floors_id = rd.floors_id "
+				+ "JOIN room_master rm ON rd.room_type = rm.room_master_id "
+				+ "WHERE rd.school_id = ? AND rd.is_active = 1 AND rd.is_delete = 0 AND rd.room_type='32' AND rd.anganwadi_check = 0";
+
+		return jdbcTemplate.queryForList(sql, school_id);
+	}
+	public String updateStaffStrength(int sgRegTeacher, int sgTempTeacher, int sgPtTeacher, int sgNgoTeacher,
+			int btRegTeacher, int btTempTeacher, int btPtTeacher, int btNgoTeacher, int pgRegTeacher, int pgTempTeacher,
+			int pgPtTeacher, int pgNgoTeacher, int kgRegTeacher, int kgTempTeacher, int petRegTeacher,
+			int petTempTeacher, int petGrade1Teacher, int petGrade2Teacher, int petPtTeacher, Boolean is_hm,
+			int stRegTeacher, int stPtTeacher, int totOa, int kgAyah, int compAss, String watchmen, int scavengers,
+			int maintenanceWork, int schoolId, List<String> specialCategoryId) {
+
+		try {
+			 updateStaffCounts(sgRegTeacher, sgTempTeacher, sgPtTeacher, sgNgoTeacher, btRegTeacher,
+					btTempTeacher, btPtTeacher, btNgoTeacher, pgRegTeacher, pgTempTeacher, pgPtTeacher, pgNgoTeacher,
+					kgRegTeacher, kgTempTeacher, petRegTeacher, petTempTeacher, petGrade1Teacher, petGrade2Teacher, petPtTeacher,
+					is_hm, stRegTeacher, stPtTeacher, totOa, kgAyah, compAss, watchmen, scavengers, maintenanceWork, schoolId);
+			 
+		  if(specialCategoryId.isEmpty()) {
+			  deactivateSpecialCategory(schoolId); 
+		  }
+			
+		  if(!specialCategoryId.isEmpty()) {
+			 
+			int staffId=getstaffId(schoolId);
+			if(staffId!=0) {
+				    deactivateSpecialCategory(schoolId);
+					for(String special_category_id : specialCategoryId) {
+						saveSpecialCategoryDetails(special_category_id, schoolId, staffId);
+					}
+				}
+				
+			}
+		  
+			
+			return "Staff Details Updated Sucessfully";
+			} catch (Exception e) {
+				e.printStackTrace();
+				return "Error";
+			}
+	}
 	
+	private int getstaffId(int schoolId) {
+		
+		String sql = "SELECT staff_id FROM staff_strength_1 WHERE school_id = ? ORDER BY staff_id DESC LIMIT 1";
+		try {
+	        return jdbcTemplate.queryForObject(sql, new Object[]{schoolId}, Integer.class);
+	    } catch (DataAccessException e) {
+	        e.printStackTrace();
+	        return 0; // or any default/fallback value
+	    }	
+	}
+
+	@Transactional
+	public void deactivateSpecialCategory(int schoolId) {
+		
+		String sql = "UPDATE special_category_details SET is_active = 0 AND is_delete = 1 WHERE school_id = ? ";
+		try {
+			jdbcTemplate.update(sql, schoolId);		
+		}catch (DataAccessException e) {
+			e.printStackTrace();			
+		}	
+		
+	}
 
+	private void updateStaffCounts(int sgRegTeacher, int sgTempTeacher, int sgPtTeacher, int sgNgoTeacher,
+			int btRegTeacher, int btTempTeacher, int btPtTeacher, int btNgoTeacher, int pgRegTeacher, int pgTempTeacher,
+			int pgPtTeacher, int pgNgoTeacher, int kgRegTeacher, int kgTempTeacher, int petRegTeacher,
+			int petTempTeacher, int petGrade1Teacher, int petGrade2Teacher, int petPtTeacher, Boolean is_hm,
+			int stRegTeacher, int stPtTeacher, int totOa, int kgAyah, int compAss, String watchmen, int scavengers,
+			int maintenanceWork, int schoolId) {
+		
+		String sql = "UPDATE staff_strength_1 SET "
+			    + "sg_reg_teacher = ?, sg_temp_teacher = ?, sg_pt_teacher = ?, sg_ngo_teacher = ?, "
+			    + "bt_reg_teacher = ?, bt_temp_teacher = ?, bt_pt_teacher = ?, bt_ngo_teacher = ?, "
+			    + "pg_reg_teacher = ?, pg_temp_teacher = ?, pg_pt_teacher = ?, pg_ngo_teacher = ?, "
+			    + "kg_reg_teacher = ?, kg_temp_teacher = ?, "
+			    + "pet_reg_teacher = ?, pet_temp_teacher = ?, pet_grade1_teacher = ?, pet_grade2_teacher = ?, pet_pt_teacher = ?, "
+			    + "is_hm = ?, st_reg_teacher = ?, st_pt_teacher = ?, tot_oa = ?, kg_ayah = ?, comp_ass = ?, "
+			    + "watchmen = ?, scavengers = ?, maintenance_work = ? "
+			    + "WHERE school_id = ?";
+
+		
+		try {
+						
+			 jdbcTemplate.update(sql, sgRegTeacher,  sgTempTeacher,  sgPtTeacher,  sgNgoTeacher,
+					 btRegTeacher,  btTempTeacher,  btPtTeacher,  btNgoTeacher,  pgRegTeacher,  pgTempTeacher,
+					 pgPtTeacher,  pgNgoTeacher,  kgRegTeacher,  kgTempTeacher,  petRegTeacher,
+					 petTempTeacher,  petGrade1Teacher,  petGrade2Teacher,  petPtTeacher, is_hm,
+					 stRegTeacher,  stPtTeacher,  totOa,  kgAyah,  compAss,  watchmen,  scavengers,
+					 maintenanceWork,  schoolId);
+		} catch (DataAccessException e) {
+			e.printStackTrace();
+		}
+	}
 
 }
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/school/Service/SchoolReportService.java b/src/main/java/in/gov/chennaicorporation/gccoffice/school/Service/SchoolReportService.java
index 842d7d4..dceac4d 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/school/Service/SchoolReportService.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/school/Service/SchoolReportService.java
@@ -1,6 +1,7 @@
 package in.gov.chennaicorporation.gccoffice.school.Service;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -14,15 +15,21 @@ import org.springframework.dao.DataAccessException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.stereotype.Service;
 
 @Service
 public class SchoolReportService {
 	private JdbcTemplate jdbcTemplate;
 
+	
+	private NamedParameterJdbcTemplate namedParameterJdbcTemplate;
+
 	@Autowired
 	public void setDataSourcemysql(@Qualifier("mysqlSchoolDataSource") DataSource dataSource) {
 		this.jdbcTemplate = new JdbcTemplate(dataSource);
+		this.namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
 	}
 
 	@Transactional
@@ -47,7 +54,7 @@ public class SchoolReportService {
 	public ResponseEntity<?> getAEOZone(String udise) {
 		Map<String, Object> result = new HashMap<>();
 
-		String sql = "SELECT DISTINCT zone AS zone FROM school_list WHERE udise In(" + udise + ")";
+		String sql = "SELECT DISTINCT zone FROM school_list WHERE udise In(" + udise + ") ORDER BY zone ASC";
 		try {
 			List<String> data = jdbcTemplate.queryForList(sql, String.class);
 			result.put("message", "Success");
@@ -65,7 +72,7 @@ public class SchoolReportService {
 	public ResponseEntity<?> getAEOWard(String udise, String zone) {
 		Map<String, Object> result = new HashMap<>();
 
-		String sql = "SELECT DISTINCT division AS Ward FROM school_list WHERE udise In(" + udise + ") and zone = ?";
+		String sql = "SELECT DISTINCT division AS Ward FROM school_list WHERE udise In(" + udise + ") and zone = ? ORDER BY Ward ASC";
 		try {
 			List<String> data = jdbcTemplate.queryForList(sql, String.class, zone);
 			result.put("message", "Success");
@@ -82,38 +89,45 @@ public class SchoolReportService {
 	@Transactional
 	public ResponseEntity<?> getAEOSchoolData(List<String> udise, String zone, String ward) {
 		Map<String, Object> response = new HashMap<>();
+		
 		List<Map<String,Object>> data = new ArrayList<Map<String,Object>>();
 		if(udise==null || udise.isEmpty()) {
 			udise=getUDISE();
 		}
 		for(String udises:udise) {
 		List<String> school = getschoolId(udises, zone, ward);
-			if(!school.isEmpty() && school!=null) {
-				for(String sch:school) {
-					//System.out.println("School_ID = "+sch);
-					Map<String, Object> result = new HashMap<>();
-					Map<String, Object> report = getSchoolReport(sch);
-					result.putAll(report);
-					String num = (String) report.get("udise");
-					Map<String, Object> report1 = getSchoolReport1(sch);
-					result.putAll(report1);
-					int pending=0;
-					for (Map.Entry<String, Object> entry : report1.entrySet()) {
-						if(entry.getValue().toString().equalsIgnoreCase("Pending")) {
-							
-							++pending;
-						}
-			        }
-					 result.put("overall_status", pending==0 ? "Completed" : "Pending");
-					 
-					 Map<String, Object> report2 = getAEO(num);
-					 result.putAll(report2);
-					data.add(result);
-				}
-				response.put("message", "Success");
-				response.put("data", data);
+		if(!school.isEmpty() && school!=null) {
+			for(String sch:school) {
+				//System.out.println("School_ID = "+sch);
+				
+				Map<String, Object> result = new HashMap<>();
+				Map<String, Object> report = getSchoolReport(sch);
+				result.putAll(report);
+				String num = (String) report.get("udise");
+				Map<String, Object> report1 = getSchoolReport1(sch);
+				result.putAll(report1);
+				int pending=0;
+				for (Map.Entry<String, Object> entry : report1.entrySet()) {
+					if(entry.getValue().toString().equalsIgnoreCase("Pending")) {
+						
+						++pending;
+					}
+		        }
+				 result.put("overall_status", pending==0 ? "Completed" : "Pending");
+				 
+				 Map<String, Object> report2 = getAEO(num);
+				 result.putAll(report2);
+				data.add(result);
+				
 			}
+			response.put("message", "Success");
+			response.put("data", data);			
+		} 
 		}
+//		System.out.println(data.get(0));
+//		System.out.println(data.get(1));
+		System.out.println(response.get("message"));
+//		System.out.println(response.get("data"));
 		return ResponseEntity.ok(response);
 
 	}
@@ -267,6 +281,7 @@ public class SchoolReportService {
 	private List<String> getschoolId(String udise, String zone, String ward) {
 		String sql = "";
 		if (zone != null && !zone.isEmpty() && ward != null && !ward.isEmpty()) {
+			//System.out.println("check1");
 	        sql = "SELECT id FROM school_list WHERE udise In(" + udise + ") and zone = ? and division = ?";
 	    } else if (zone != null && !zone.isEmpty() && (ward == null || ward.isEmpty())) {
 	        sql = "SELECT id FROM school_list WHERE udise In(" + udise + ") and zone = ?";
@@ -287,4 +302,239 @@ public class SchoolReportService {
 			return List.of();
 		}
 	}
+	
+	@Transactional
+	public ResponseEntity<?> getAEOStudentData(List<String> udise) {
+		Map<String, Object> response = new HashMap<>();
+		
+		List<Map<String,Object>> data = new ArrayList<Map<String,Object>>();
+		if(udise.isEmpty()) {
+			udise = getUDISE();
+			System.out.println("udise="+udise);
+		}
+		for(String udises:udise) {	
+			List<Map<String,Object>> school = getschoolsId(udises);
+		
+			if(!school.isEmpty() && school!=null) {
+				for(Map<String,Object> sch:school) {
+					Map<String, Object> result = new HashMap<>();
+					int id = (Integer)sch.get("id");
+					Map<String, Object> report = getTotalStudents(id);
+					result.putAll(report);
+					
+					String num = (String) sch.get("udise");
+					
+					String sch_name=(String)sch.get("school_name");
+					String hm_name=(String)sch.get("hm_name");
+					String hm_mob_num=(String)sch.get("hm_phone_number");
+					String zone=(String)sch.get("zone");
+					String division=(String)sch.get("division");
+					
+				
+					Map<String, Object> report1 = getStudentsReg(num);
+					result.putAll(report1);
+					long totalStud = (long) report.get("total_students");
+					long regStud = (long) report1.get("students_registered");
+					long pending =  totalStud - regStud;
+					result.put("pending", pending);
+					
+					result.put("udise", num);
+					
+					result.put("school_name",sch_name );
+					result.put("hm_name",hm_name );
+					result.put("hm_mobile", hm_mob_num);
+					result.put("zone", zone);
+					result.put("division",division );
+					
+					 
+					 Map<String, Object> report2 = getAEO(num);
+					 result.putAll(report2);
+					 
+					data.add(result);
+				}
+				response.put("Message", "Success");
+				response.put("data", data);
+				System.out.println("data="+data);
+			} else {
+				response.put("Message", "No Data");
+				response.put("data", "No Data Found");
+			}
+				
+			}
+		return ResponseEntity.ok(response);
+		}
+		
+	private Map<String, Object> getStudentsReg(String udises) {
+		String sql = "SELECT count(*) as students_registered FROM student_info WHERE udise = ? AND is_active = 1 AND is_delete = 0";
+		try {
+			return jdbcTemplate.queryForMap(sql, udises);
+
+		} catch (Exception e) {
+	        e.printStackTrace();
+	        return Map.of(); 
+	    } 
+	}
+
+	private Map<String, Object> getTotalStudents(int sch) {
+		String sql = "SELECT COALESCE((SELECT total_students FROM student_strength WHERE school_id = ?), 0) AS total_students";
+		try {
+			return jdbcTemplate.queryForMap(sql, sch);
+
+		} catch (Exception e) {
+	        e.printStackTrace();
+	        return Map.of(); 
+	    } 
+	}
+
+	
+
+	private List<Map<String,Object>> getschoolsId(String udises) {
+		String sql = "SELECT id, udise,school_name,hm_name,hm_phone_number,zone,division FROM school_list WHERE udise In(" + udises + ")";
+		try {
+			return jdbcTemplate.queryForList(sql);
+		} catch (DataAccessException e) {
+			e.printStackTrace();
+			return List.of();
+		}
+	}
+	
+	////////////////////////////////////////////////
+	
+	
+	@Transactional
+	public ResponseEntity<?> getAEOStudentsCount() {
+        Map<String, Object> response = new HashMap<>();
+		List<Map<String,Object>> data = new ArrayList<Map<String,Object>>();
+		
+		List<Map<String,Object>> aeos = getAeoDetails(); 
+		
+		for(Map<String,Object> aeo : aeos) {
+			
+			Map<String, Object> result = new HashMap<>();
+			
+			String aoeNum = (String) aeo.get("aeo_num");
+			result.put("aoe", aoeNum);
+			
+			String udises = (String) aeo.get("udise");
+			
+			List<Integer> schoolId = getSchoolId(udises);
+			int school_count = schoolId.size();
+			result.put("school_count", school_count);
+			
+			int total_stud = getTotalStudentsCount(schoolId);
+			result.put("total_students", total_stud);
+			
+			int students_registered = getRegisteredStudents(udises);
+			result.put("student_registered", students_registered);
+			
+			int pending = total_stud - students_registered;
+			result.put("pending", pending);
+			
+			data.add(result);
+		}
+		response.put("Message", "Success");
+		response.put("data", data);
+		return ResponseEntity.ok(response);
+	}
+
+	
+	private int getRegisteredStudents(String udises) {
+
+		String[] udiseArray = udises.split(",");
+
+		String placeholders = String.join(",", Collections.nCopies(udiseArray.length, "?"));
+
+		String sql = "SELECT COUNT(student_id) FROM student_info WHERE udise IN (" + placeholders
+				+ ") AND is_active = 1 AND is_delete = 0";
+
+		try {
+
+			Integer count = jdbcTemplate.queryForObject(sql, Integer.class, (Object[]) udiseArray);
+			return count != null ? count : 0;
+		} catch (DataAccessException e) {
+			e.printStackTrace();
+			return 0;
+		}
+	}
+
+
+
+	private int getTotalStudentsCount(List<Integer> schoolId) {
+	    String sql = "SELECT SUM(total_students) FROM student_strength WHERE school_id IN (:schoolId)";
+	    try {
+	        MapSqlParameterSource parameters = new MapSqlParameterSource();
+	        parameters.addValue("schoolId", schoolId);
+	        
+	        Integer total = namedParameterJdbcTemplate.queryForObject(sql, parameters, Integer.class);
+	        return total != null ? total : 0; 
+	    } catch (DataAccessException e) {
+	        e.printStackTrace();
+	        return 0; 
+	    }
+	}
+
+
+	private List<Integer> getSchoolId(String udises) {
+		String sql = "SELECT id FROM school_list WHERE FIND_IN_SET(udise, :udises) > 0";
+		try {
+			MapSqlParameterSource parameters = new MapSqlParameterSource();
+            parameters.addValue("udises", udises);
+            return namedParameterJdbcTemplate.queryForList(sql, parameters, Integer.class);
+		} catch (DataAccessException e) {
+			e.printStackTrace();
+			return List.of();
+		}
+	}
+
+	private List<Map<String, Object>> getAeoDetails() {
+		String sql = "SELECT aeo_num, udise FROM aeo_details";
+		try {
+			return jdbcTemplate.queryForList(sql);
+		} catch (DataAccessException e) {
+			e.printStackTrace();
+			return List.of();
+		}
+	}
+	
+	@Transactional
+	public ResponseEntity<?> getRegisteredStud(String udise) {
+		Map<String, Object> result = new HashMap<>();
+		String sql = "SELECT * "
+				+ " FROM student_info "
+				+ " WHERE udise = ? "
+				+ " AND is_active = 1 "
+				+ " AND is_delete = 0 "
+				+ " ORDER BY "
+				+ " CASE "
+				+ " WHEN std = 'PreKG' THEN 1 "
+				+ " WHEN std = 'LKG' THEN 2 "
+				+ " WHEN std = 'UKG' THEN 3 "
+				+ " WHEN std LIKE 'Class1' THEN 4 "
+				+ " WHEN std LIKE 'Class2' THEN 5 "
+				+ " WHEN std LIKE 'Class3' THEN 6 "
+				+ " WHEN std LIKE 'Class4' THEN 7 "
+				+ " WHEN std LIKE 'Class5' THEN 8 "
+				+ " WHEN std LIKE 'Class6' THEN 9 "
+				+ " WHEN std LIKE 'Class7' THEN 10 "
+				+ " WHEN std LIKE 'Class8' THEN 11 "
+				+ "    WHEN std LIKE 'Class9' THEN 12\r\n"
+				+ "    WHEN std LIKE 'Class10' THEN 13\r\n"
+				+ "    WHEN std LIKE 'Class11' THEN 14\r\n"
+				+ "    WHEN std LIKE 'Class12' THEN 15\r\n"
+				+ "    ELSE 100 \r\n"
+				+ "  END ";
+
+		try {
+			List<Map<String, Object>> data = jdbcTemplate.queryForList(sql, udise);
+			result.put("Message", "Success");
+			result.put("Data", data);
+			return ResponseEntity.ok(result);
+		} catch (Exception e) {
+			e.printStackTrace();
+			result.put("Message", "Error");
+			result.put("Error", "Failed to fetch AEO List: " + e.getMessage());
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(result);
+		}
+	}
+	
 }
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/school/Service/StudentInfoService.java b/src/main/java/in/gov/chennaicorporation/gccoffice/school/Service/StudentInfoService.java
new file mode 100644
index 0000000..b83f5e9
--- /dev/null
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/school/Service/StudentInfoService.java
@@ -0,0 +1,857 @@
+package in.gov.chennaicorporation.gccoffice.school.Service;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.sql.DataSource;
+import javax.transaction.Transactional;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.core.env.Environment;
+import org.springframework.dao.DataAccessException;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+@Service
+public class StudentInfoService {
+	private JdbcTemplate jdbcTemplate;
+	
+	private String fileBaseUrl;
+
+	@Autowired
+	public void setDataSourcemysql(@Qualifier("mysqlSchoolDataSource") DataSource dataSource) {
+		this.jdbcTemplate = new JdbcTemplate(dataSource);
+		this.fileBaseUrl=environment.getProperty("fileBaseUrl");
+	}
+	
+	 @Autowired
+	 private Environment environment;
+	 
+	 @Transactional
+	 public ResponseEntity<?> getStandards(String udise) {
+		 Map<String, Object> result = new HashMap<>();
+		 String standard =  getStandardsCount(udise);
+		 List<String> standards = Arrays.asList(standard.split(","));
+		 List<Map<String, Object>> updateSTD = new ArrayList<>();
+		 for (String std:standards) {
+			 Map<String, Object> data = new HashMap<>();
+			 String clas = std;
+			 String count = getStudentCount(udise, clas);
+			 data.put("Designation", clas);
+			 data.put("Student_Count", count);
+			 updateSTD.add(data);
+		 }
+		 if(!updateSTD.isEmpty()) {
+				result.put("Message", "Success");
+				result.put("Data", updateSTD);
+				return ResponseEntity.ok(result);
+		 } else {
+				result.put("Message", "Error");
+				result.put("Error", "Failed to fetch class List");
+				return ResponseEntity.ok(result);
+		 }
+		 
+	 }
+	 
+	 @Transactional
+		public ResponseEntity<?> getSections() {
+			Map<String, Object> result = new HashMap<>();
+			String sql = "SELECT id,section FROM class_sections_master WHERE is_active=1 AND is_delete=0 ORDER BY id";
+			try {
+				List<Map<String, Object>> data = jdbcTemplate.queryForList(sql);
+				result.put("Message", "Success");
+				result.put("Data", data);
+				return ResponseEntity.ok(result);
+			} catch (Exception e) {
+				e.printStackTrace();
+				result.put("Message", "Error");
+				result.put("Error", "Failed to fetch medium List: " + e.getMessage());
+				return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(result);
+			}
+		}
+	 
+	 @Transactional
+	private String getStudentCount(String udise, String clas) {
+		String sql = "SELECT count(student_id) FROM student_info where udise = ? AND std = ? AND is_active = 1 AND is_delete = 0 ";
+		try {
+			String data = jdbcTemplate.queryForObject(sql, new Object[]{udise, clas}, String.class);
+		return data;
+		}catch (Exception e) {
+			e.printStackTrace();
+			return "";
+		}
+	}
+	@Transactional
+	public String getStandardsCount(String udise) {
+		
+		String sql = "SELECT CONCAT_WS(',', "
+				+ "    IF(prekg = 1, 'PreKg', NULL), "
+				+ "    IF(lkg = 1, 'LKG', NULL), "
+				+ "    IF(ukg = 1, 'UKG', NULL), "
+				+ "    IF(class1 = 1, 'Class1', NULL), "
+				+ "    IF(class2 = 1, 'Class2', NULL), "
+				+ "    IF(class3 = 1, 'Class3', NULL), "
+				+ "    IF(class4 = 1, 'Class4', NULL), "
+				+ "    IF(class5 = 1, 'Class5', NULL), "
+				+ "    IF(class6 = 1, 'Class6', NULL), "
+				+ "    IF(class7 = 1, 'Class7', NULL), "
+				+ "    IF(class8 = 1, 'Class8', NULL), "
+				+ "    IF(class9 = 1, 'Class9', NULL), "
+				+ "    IF(class10 = 1, 'Class10', NULL), "
+				+ "    IF(class11 = 1, 'Class11', NULL), "
+				+ "    IF(class12 = 1, 'Class12', NULL) "
+				+ "  ) AS active_classes "
+				+ " FROM school_class_master "
+				+ " WHERE udise = ? ";
+
+		try {
+			String data = jdbcTemplate.queryForObject(sql, String.class, udise);
+			return data;
+		} catch (Exception e) {
+			e.printStackTrace();
+
+			//return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(result);
+			return null;
+		}
+		
+	}
+
+//	@Transactional
+//	public ResponseEntity<?> getStandards(String udise) {
+//		Map<String, Object> result = new HashMap<>();
+//		String sql = "SELECT Designation, Student_Count FROM ( "
+//				+ "SELECT 'PreKG' AS Designation, "
+//				+ " COUNT(si.student_id) AS Student_Count "
+//				+ " FROM student_enrollment_master sem "
+//				+ " LEFT JOIN student_info si "
+//				+ " ON sem.UDISE = si.udise AND si.std = 'PreKG' "
+//				+ " WHERE sem.UDISE = ? "
+//				+ " AND (PreKg_Boys > 0 OR PreKg_Girls > 0 OR PreKg_Transgen > 0) AND si.is_active = 1 AND si.is_delete = 0 "
+//				+ " UNION ALL "
+//				+ " SELECT 'LKG' AS Designation, "
+//				+ " COUNT(si.student_id) AS Student_Count " 
+//				+ " FROM student_enrollment_master sem "
+//				+ " LEFT JOIN student_info si "
+//				+ " ON sem.UDISE = si.udise AND si.std = 'LKG' "
+//				+ " WHERE sem.UDISE = ? "
+//				+ " AND (LKG_Boys > 0 OR LKG_Girls > 0 OR LKG_Transgen > 0) AND si.is_active = 1 AND si.is_delete = 0 "
+//				+ " UNION ALL "
+//				+ " SELECT 'UKG' AS Designation, "
+//				+ " COUNT(si.student_id) AS Student_Count "
+//				+ " FROM student_enrollment_master sem "
+//				+ " LEFT JOIN student_info si "
+//				+ " ON sem.UDISE = si.udise AND si.std = 'UKG' "
+//				+ " WHERE sem.UDISE = ? "
+//				+ " AND (UKG_Boys > 0 OR UKG_Girls > 0 OR UKG_Transgen > 0) AND si.is_active = 1 AND si.is_delete = 0 "
+//				+ " UNION ALL "
+//				+ " SELECT 'Class1' AS Designation, "
+//				+ " COUNT(si.student_id) AS Student_Count "
+//				+ " FROM student_enrollment_master sem "
+//				+ " LEFT JOIN student_info si "
+//				+ " ON sem.UDISE = si.udise AND si.std = 'Class1' "
+//				+ " WHERE sem.UDISE = ? "
+//				+ " AND (Class1_Boys > 0 OR Class1_Girls > 0 OR Class1_Transgen > 0) AND si.is_active = 1 AND si.is_delete = 0 "
+//				+ " UNION ALL "
+//				+ " SELECT 'Class2' AS Designation, "
+//				+ " COUNT(si.student_id) AS Student_Count "
+//				+ " FROM student_enrollment_master sem "
+//				+ " LEFT JOIN student_info si "
+//				+ " ON sem.UDISE = si.udise AND si.std = 'Class2' "
+//				+ " WHERE sem.UDISE = ? "
+//				+ " AND (Class2_Boys > 0 OR Class2_Girls > 0 OR Class2_Transgen > 0) AND si.is_active = 1 AND si.is_delete = 0 "
+//				+ " UNION ALL "
+//				+ " SELECT 'Class3' AS Designation, "
+//				+ " COUNT(si.student_id) AS Student_Count "
+//				+ " FROM student_enrollment_master sem "
+//				+ " LEFT JOIN student_info si "
+//				+ " ON sem.UDISE = si.udise AND si.std = 'Class3' "
+//				+ " WHERE sem.UDISE = ? "
+//				+ " AND (Class3_Boys > 0 OR Class3_Girls > 0 OR Class3_Transgen > 0) AND si.is_active = 1 AND si.is_delete = 0 "
+//				+ " UNION ALL "
+//				+ " SELECT 'Class4' AS Designation, "
+//				+ " COUNT(si.student_id) AS Student_Count "
+//				+ " FROM student_enrollment_master sem "
+//				+ " LEFT JOIN student_info si "
+//				+ " ON sem.UDISE = si.udise AND si.std = 'Class4' "
+//				+ " WHERE sem.UDISE = ? "
+//				+ " AND (Class4_Boys > 0 OR Class4_Girls > 0 OR Class4_Transgen > 0) AND si.is_active = 1 AND si.is_delete = 0 "
+//				+ " UNION ALL "
+//				+ " SELECT 'Class5' AS Designation, "
+//				+ " COUNT(si.student_id) AS Student_Count "
+//				+ " FROM student_enrollment_master sem "
+//				+ " LEFT JOIN student_info si "
+//				+ " ON sem.UDISE = si.udise AND si.std = 'Class5' "
+//				+ " WHERE sem.UDISE = ? "
+//				+ " AND (Class5_Boys > 0 OR Class5_Girls > 0 OR Class5_Transgen > 0) AND si.is_active = 1 AND si.is_delete = 0 "
+//				+ " UNION ALL "
+//				+ " SELECT 'Class6' AS Designation, "
+//				+ " COUNT(si.student_id) AS Student_Count "
+//				+ " FROM student_enrollment_master sem "
+//				+ " LEFT JOIN student_info si "
+//				+ " ON sem.UDISE = si.udise AND si.std = 'Class6' "
+//				+ " WHERE sem.UDISE = ? "
+//				+ " AND (Class6_Boys > 0 OR Class6_Girls > 0 OR Class6_Transgen > 0) AND si.is_active = 1 AND si.is_delete = 0 "
+//				+ " UNION ALL "
+//				+ " SELECT 'Class7' AS Designation, "
+//				+ " COUNT(si.student_id) AS Student_Count "
+//				+ " FROM student_enrollment_master sem "
+//				+ " LEFT JOIN student_info si "
+//				+ " ON sem.UDISE = si.udise AND si.std = 'Class7' "
+//				+ " WHERE sem.UDISE = ? "
+//				+ " AND (Class7_Boys > 0 OR Class7_Girls > 0 OR Class7_Transgen > 0) AND si.is_active = 1 AND si.is_delete = 0 "
+//				+ " UNION ALL "
+//				+ " SELECT 'Class8' AS Designation, "
+//				+ " COUNT(si.student_id) AS Student_Count "
+//				+ " FROM student_enrollment_master sem "
+//				+ " LEFT JOIN student_info si "
+//				+ " ON sem.UDISE = si.udise AND si.std = 'Class8' "
+//				+ " WHERE sem.UDISE = ? "
+//				+ " AND (Class8_Boys > 0 OR Class8_Girls > 0 OR Class8_Transgen > 0) AND si.is_active = 1 AND si.is_delete = 0 "
+//				+ " UNION ALL "
+//				+ " SELECT 'Class9' AS Designation, "
+//				+ " COUNT(si.student_id) AS Student_Count "
+//				+ " FROM student_enrollment_master sem "
+//				+ " LEFT JOIN student_info si "
+//				+ " ON sem.UDISE = si.udise AND si.std = 'Class9' "
+//				+ " WHERE sem.UDISE = ? "
+//				+ " AND (Class9_Boys > 0 OR Class9_Girls > 0 OR Class9_Transgen > 0) AND si.is_active = 1 AND si.is_delete = 0 "
+//				+ " UNION ALL "
+//				+ " SELECT 'Class10' AS Designation, "
+//				+ " COUNT(si.student_id) AS Student_Count "
+//				+ " FROM student_enrollment_master sem "
+//				+ " LEFT JOIN student_info si "
+//				+ " ON sem.UDISE = si.udise AND si.std = 'Class10' "
+//				+ " WHERE sem.UDISE = ? "
+//				+ " AND (Class10_Boys > 0 OR Class10_Girls > 0 OR Class10_Transgen > 0) AND si.is_active = 1 AND si.is_delete = 0 "
+//				+ " UNION ALL "
+//				+ " SELECT 'Class11' AS Designation, "
+//				+ " COUNT(si.student_id) AS Student_Count "
+//				+ " FROM student_enrollment_master sem "
+//				+ " LEFT JOIN student_info si "
+//				+ " ON sem.UDISE = si.udise AND si.std = 'Class11' "
+//				+ " WHERE sem.UDISE = ? "
+//				+ " AND (Class11_Boys > 0 OR Class11_Girls > 0 OR Class11_Transgen > 0) AND si.is_active = 1 AND si.is_delete = 0 "
+//				+ " UNION ALL "
+//				+ " SELECT 'Class12' AS Designation, "
+//				+ " COUNT(si.student_id) AS Student_Count " 
+//				+ " FROM student_enrollment_master sem "
+//				+ " LEFT JOIN student_info si "
+//				+ " ON sem.UDISE = si.udise AND si.std = 'Class12' "
+//				+ " WHERE sem.UDISE = ? "
+//				+ " AND (Class12_Boys > 0 OR Class12_Girls > 0 OR Class12_Transgen > 0)AND si.is_active = 1 AND si.is_delete = 0 "
+//				+ " ) AS result WHERE Student_Count > 0";
+//
+//		try {
+//			List<Map<String, Object>> data = jdbcTemplate.queryForList(sql, udise, udise, udise, udise, udise, udise, udise, udise, udise, udise, udise, udise, udise, udise, udise);
+//			result.put("Message", "Success");
+//			result.put("Data", data);
+//			return ResponseEntity.ok(result);
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//			result.put("Message", "Error");
+//			result.put("Error", "Failed to fetch class List: " + e.getMessage());
+//			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(result);
+//		}
+//		
+//	}
+	 
+//		@Transactional
+//		public ResponseEntity<?> getStandards(String udise) {
+//			Map<String, Object> result = new HashMap<>();
+//			String sql = "SELECT 'PreKG' AS Designation "
+//					+ " FROM student_enrollment_master "
+//					+ " WHERE UDISE = ? "
+//					+ "  AND (PreKg_Boys > 0 OR PreKg_Girls > 0 OR PreKg_Transgen > 0) "
+//					+ " UNION "
+//					+ " SELECT 'LKG' AS Designation "
+//					+ " FROM student_enrollment_master "
+//					+ " WHERE UDISE = ? "
+//					+ "  AND (LKG_Boys > 0 OR LKG_Girls > 0 OR LKG_Transgen > 0) "
+//					+ " UNION "
+//					+ " SELECT 'UKG' AS Designation "
+//					+ " FROM student_enrollment_master "
+//					+ " WHERE UDISE = ? "
+//					+ "  AND (UKG_Boys > 0 OR UKG_Girls > 0 OR UKG_Transgen > 0) "
+//					+ " UNION "
+//					+ " SELECT 'Class1' AS Designation "
+//					+ " FROM student_enrollment_master "
+//					+ " WHERE UDISE = ? "
+//					+ "  AND (Class1_Boys > 0 OR Class1_Girls > 0 OR Class1_Transgen > 0) "
+//					+ " UNION "
+//					+ " SELECT 'Class2' AS Designation "
+//					+ " FROM student_enrollment_master "
+//					+ " WHERE UDISE = ? "
+//					+ "  AND (Class2_Boys > 0 OR Class2_Girls > 0 OR Class2_Transgen > 0) "
+//					+ " UNION "
+//					+ " SELECT 'Class3' AS Designation "
+//					+ " FROM student_enrollment_master "
+//					+ " WHERE UDISE = ? "
+//					+ "  AND (Class3_Boys > 0 OR Class3_Girls > 0 OR Class3_Transgen > 0) "
+//					+ " UNION "
+//					+ " SELECT 'Class4' AS Designation "
+//					+ " FROM student_enrollment_master "
+//					+ " WHERE UDISE = ? "
+//					+ "  AND (Class4_Boys > 0 OR Class4_Girls > 0 OR Class4_Transgen > 0) "
+//					+ " UNION "
+//					+ " SELECT 'Class5' AS Designation "
+//					+ " FROM student_enrollment_master "
+//					+ " WHERE UDISE = ? "
+//					+ "  AND (Class5_Boys > 0 OR Class5_Girls > 0 OR Class5_Transgen > 0) "
+//					+ " UNION "
+//					+ " SELECT 'Class6' AS Designation "
+//					+ " FROM student_enrollment_master "
+//					+ " WHERE UDISE = ? "
+//					+ "  AND (Class6_Boys > 0 OR Class6_Girls > 0 OR Class6_Transgen > 0) "
+//					+ " UNION "
+//					+ " SELECT 'Class7' AS Designation "
+//					+ " FROM student_enrollment_master "
+//					+ " WHERE UDISE = ? "
+//					+ "  AND (Class7_Boys > 0 OR Class7_Girls > 0 OR Class7_Transgen > 0) "
+//					+ " UNION "
+//					+ " SELECT 'Class8' AS Designation "
+//					+ " FROM student_enrollment_master "
+//					+ " WHERE UDISE = ? "
+//					+ "  AND (Class8_Boys > 0 OR Class8_Girls > 0 OR Class8_Transgen > 0) "
+//					+ " UNION "
+//					+ " SELECT 'Class9' AS Designation "
+//					+ " FROM student_enrollment_master "
+//					+ " WHERE UDISE = ? "
+//					+ "  AND (Class9_Boys > 0 OR Class9_Girls > 0 OR Class9_Transgen > 0) "
+//					+ " UNION "
+//					+ " SELECT 'Class10' AS Designation "
+//					+ " FROM student_enrollment_master "
+//					+ " WHERE UDISE = ? "
+//					+ "  AND (Class10_Boys > 0 OR Class10_Girls > 0 OR Class10_Transgen > 0) "
+//					+ " UNION "
+//					+ " SELECT 'Class11' AS Designation "
+//					+ " FROM student_enrollment_master "
+//					+ " WHERE UDISE = ? "
+//					+ "  AND (Class11_Boys > 0 OR Class11_Girls > 0 OR Class11_Transgen > 0) "
+//					+ " UNION " 
+//					+ " SELECT 'Class12' AS Designation "
+//					+ " FROM student_enrollment_master "
+//					+ " WHERE UDISE = ? "
+//					+ "  AND (Class12_Boys > 0 OR Class12_Girls > 0 OR Class12_Transgen > 0)";
+//	
+//			try {
+//				List<Map<String, Object>> data = jdbcTemplate.queryForList(sql, udise, udise, udise, udise, udise, udise, udise, udise, udise, udise, udise, udise, udise, udise, udise);
+//				result.put("Message", "Success");
+//				result.put("Data", data);
+//				return ResponseEntity.ok(result);
+//			} catch (Exception e) {
+//				e.printStackTrace();
+//				result.put("Message", "Error");
+//				result.put("Error", "Failed to fetch class List: " + e.getMessage());
+//				return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(result);
+//			}
+//			
+//		}
+	@Transactional
+	public ResponseEntity<?> checkStudent(String udise, String student_name, String emis_no, String gender, String std,
+			String dob, String age, String parent_type,String section,String medium, String father_name, String mother_name, String guardian_name,
+			String father_mobile, String mother_mobile, String guardian_mobile, String father_aadhar,
+			String mother_aadhar, String guardian_aadhar, String student_aadhar, MultipartFile father_aadhar_file,
+			MultipartFile mother_aadhar_file, MultipartFile guardian_aadhar_file, MultipartFile student_aadhar_file) {
+		Map<String, Object> result = new HashMap<>();
+		int is_avbl = checkEmis(emis_no);
+		if(is_avbl==0) {
+			String data = saveStudent(udise, student_name, emis_no, gender, std, dob, age, parent_type,section,medium, father_name, mother_name, guardian_name, father_mobile, mother_mobile, guardian_mobile, father_aadhar, mother_aadhar, guardian_aadhar, student_aadhar, father_aadhar_file, mother_aadhar_file, guardian_aadhar_file, student_aadhar_file);
+			if (data.equalsIgnoreCase("sucess")) {
+			result.put("Message", "Saved Sucessfully");
+			result.put("Data", "Success");
+			} else {
+				result.put("Message", "Error");
+				result.put("Error", "Failed to save");
+			}
+			
+		} else if(is_avbl==1){
+			result.put("Message", "Duplicate");
+			result.put("Error", "EMIS No already registered");
+			
+		}else {
+			result.put("Message", "Error");
+			result.put("Error", "Failed to save");
+		}
+			return ResponseEntity.ok(result);
+			
+	}
+
+	private int checkEmis(String emis_no) {
+	    String sql = "SELECT CASE WHEN EXISTS (SELECT 1 FROM student_info WHERE emis_no = ? and is_active=1 and is_delete=0) THEN 1 ELSE 0 END AS result";
+	    try {
+	        return  jdbcTemplate.queryForObject(sql, Integer.class, emis_no);
+	        
+	    } catch (Exception e) {
+	        e.printStackTrace(); 
+	        return 5;
+	    }
+	}
+	@Transactional
+	public String saveStudent(String udise, String student_name, String emis_no, String gender, String std,
+			String dob, String age, String parent_type,String section,String medium, String father_name, String mother_name, String guardian_name, String father_mobile, String mother_mobile, String guardian_mobile,
+			String father_aadhar, String mother_aadhar, String guardian_aadhar, String student_aadhar, MultipartFile father_aadhar_file,
+			MultipartFile mother_aadhar_file, MultipartFile guardian_aadhar_file, MultipartFile student_aadhar_file) {
+		
+		String sql = "INSERT INTO student_info (udise, student_name, emis_no, gender, std, dob, age, parent_type,section,mediums, father_name, mother_name, guardian_name, father_mobile, mother_mobile, guardian_mobile, father_aadhar, mother_aadhar, guardian_aadhar, student_aadhar, father_aadhar_file, mother_aadhar_file, guardian_aadhar_file, student_aadhar_file) VALUES (?, ?, ?, ?, ?, ?, ?, ? ,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?)";
+		 try {
+			 String fatherUrl = null;
+			 String motherUrl = null;
+			 String guardianUrl = null;
+			 String studentUrl = null;
+			 
+			 if(student_aadhar.isEmpty()) {
+				 student_aadhar=null;
+			 }
+			 
+			 String sec=section.toUpperCase();
+			 
+			 if(father_aadhar_file!=null && !father_aadhar_file.isEmpty()) {
+				 fatherUrl = saveFile(father_aadhar_file);
+			 } 
+			 if(mother_aadhar_file!=null && !mother_aadhar_file.isEmpty()) {
+				 motherUrl = saveFile(mother_aadhar_file); 
+			 } 
+			 if(guardian_aadhar_file!=null && !guardian_aadhar_file.isEmpty()) {
+				 guardianUrl = saveFile(guardian_aadhar_file);
+			 } 
+			 if(student_aadhar_file!=null && !student_aadhar_file.isEmpty()) {
+				 studentUrl = saveFile(student_aadhar_file); 
+			 }
+			 
+			
+			 
+//			 System.out.println("----- Student Info -----");
+//			    System.out.println("UDISE: " + udise);
+//			    System.out.println("Student Name: " + student_name);
+//			    System.out.println("EMIS No: " + emis_no);
+//			    System.out.println("Gender: " + gender);
+//			    System.out.println("Class: " + std);
+//			    System.out.println("DOB: " + dob);
+//			    System.out.println("Age: " + age);
+//			    System.out.println("Parent Type: " + parent_type);
+//
+//			    System.out.println("----- Parent Details -----");
+//			    System.out.println("Father Name: " + father_name);
+//			    System.out.println("Mother Name: " + mother_name);
+//			    System.out.println("Guardian Name: " + guardian_name);
+//
+//			    System.out.println("Father Mobile: " + father_mobile);
+//			    System.out.println("Mother Mobile: " + mother_mobile);
+//			    System.out.println("Guardian Mobile: " + guardian_mobile);
+//
+//			    System.out.println("Father Aadhar: " + father_aadhar);
+//			    System.out.println("Mother Aadhar: " + mother_aadhar);
+//			    System.out.println("Guardian Aadhar: " + guardian_aadhar);
+//			    System.out.println("Student Aadhar: " + student_aadhar);
+//			    
+//			    System.out.println("----- Uploaded Files -----");
+//			    System.out.println("Father Aadhar File: " + (father_aadhar_file != null ? father_aadhar_file.getOriginalFilename() : "null"));
+//			    System.out.println("Mother Aadhar File: " + (mother_aadhar_file != null ? mother_aadhar_file.getOriginalFilename() : "null"));
+//			    System.out.println("Guardian Aadhar File: " + (guardian_aadhar_file != null ? guardian_aadhar_file.getOriginalFilename() : "null"));
+//			    System.out.println("Student Aadhar File: " + (student_aadhar_file != null ? student_aadhar_file.getOriginalFilename() : "null"));
+
+			 
+			jdbcTemplate.update(sql, udise, student_name, emis_no, gender, std, dob, age, parent_type,sec,medium, father_name, mother_name, guardian_name, father_mobile, mother_mobile, guardian_mobile, father_aadhar, mother_aadhar, guardian_aadhar, student_aadhar, fatherUrl, motherUrl, guardianUrl, studentUrl);
+			return "sucess";
+		 } catch (IOException e) {
+			e.printStackTrace();
+			return "error";
+		}
+		
+	}
+	
+//	 private String saveFile(MultipartFile file) throws IOException {
+//	    	
+//	    	String uploadDirectory = environment.getProperty("file.upload.directory");
+//	        
+//	        String folderName = environment.getProperty("education.foldername");
+//	        	        
+//	        String fileName = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd_HHmmss")) + "_" + file.getOriginalFilename();
+//
+//	        String folderPath = uploadDirectory + "/" + folderName;
+//	       
+//	        Path dirPath = Paths.get(folderPath);
+//	        if (!Files.exists(dirPath)) {
+//	            Files.createDirectories(dirPath);
+//	        }
+//	               
+//	        Path filePath = dirPath.resolve(fileName);
+//	        
+//	        Files.write(filePath, file.getBytes());
+//	        
+//	        return filePath.toAbsolutePath().toString();
+//	    }
+	
+	private String saveFile(MultipartFile file) throws IOException {
+	    String uploadDirectory = environment.getProperty("file.upload.directory");
+	    String folderName = environment.getProperty("education.foldername");
+
+	    String fileName = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd_HHmmss")) + "_" + file.getOriginalFilename();
+
+	    String FilePath = "/"+ folderName +"/"+fileName;
+	    // Create the directory path
+	    Path dirPath = Paths.get(uploadDirectory, folderName);
+	    if (!Files.exists(dirPath)) {
+	        Files.createDirectories(dirPath);
+	    }
+
+	    // Create the full file path
+	    Path filePath = dirPath.resolve(fileName);
+
+	    // Save the file
+	    Files.write(filePath, file.getBytes());
+	    
+	    return FilePath;
+
+	    // Return the full file path as a string
+	    //return filePath.toString().replace("\\", "/");
+	}
+
+
+	 @Transactional
+	public ResponseEntity<?> getStudentsClass(String udise, String std) {
+		Map<String, Object> result = new HashMap<>();
+		String sql = "SELECT student_id, student_name, emis_no FROM student_info WHERE udise = ? AND std = ? AND is_active=1 AND is_delete=0";
+		try {
+			List<Map<String, Object>> data = jdbcTemplate.queryForList(sql, udise, std);
+			result.put("Message", "Success");
+			result.put("Data", data);
+			return ResponseEntity.ok(result);
+		} catch (Exception e) {
+			e.printStackTrace();
+			result.put("Message", "Error");
+			result.put("Error", "Failed to fetch students in class List: " + e.getMessage());
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(result);
+		}
+		
+	}
+
+	 @Transactional
+	public ResponseEntity<?> getStudentsDetails(String studentId) {
+		 Map<String, Object> result = new HashMap<>();
+		 String sql = "SELECT *, " +
+	             "CONCAT('" + fileBaseUrl + "/gcc/files', father_aadhar_file) AS view_father_aadhar_file, " +
+	             "CONCAT('" + fileBaseUrl + "/gcc/files', mother_aadhar_file) AS view_mother_aadhar_file, " +
+	             "CONCAT('" + fileBaseUrl + "/gcc/files', guardian_aadhar_file) AS view_guardian_aadhar_file, " +
+	             "CONCAT('" + fileBaseUrl + "/gcc/files', student_aadhar_file) AS view_student_aadhar_file " +
+	             " FROM student_info WHERE student_id = ?";
+			try {
+				List<Map<String, Object>> data = jdbcTemplate.queryForList(sql, studentId);
+				result.put("Message", "Success");
+				result.put("Data", data);
+				return ResponseEntity.ok(result);
+			} catch (Exception e) {
+				e.printStackTrace();
+				result.put("Message", "Error");
+				result.put("Error", "Failed to fetch student detail: " + e.getMessage());
+				return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(result);
+			}
+	}
+	 
+	 @Transactional
+		public ResponseEntity<?> getMedium() {
+			Map<String, Object> result = new HashMap<>();
+			String sql = "SELECT * FROM medium_master ORDER BY execution_order ASC";
+			try {
+				List<Map<String, Object>> data = jdbcTemplate.queryForList(sql);
+				result.put("Message", "Success");
+				result.put("Data", data);
+				return ResponseEntity.ok(result);
+			} catch (Exception e) {
+				e.printStackTrace();
+				result.put("Message", "Error");
+				result.put("Error", "Failed to fetch medium List: " + e.getMessage());
+				return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(result);
+			}
+		}
+	 
+	 private String logEntry(String student_id, String user_id, String action_type) {
+			String sql="INSERT INTO student_info_log (student_id, udise, student_name, emis_no, gender, mediums, std, section, dob, age, parent_type, father_name, mother_name, guardian_name, father_mobile, mother_mobile, guardian_mobile, father_aadhar, mother_aadhar, guardian_aadhar, student_aadhar, father_aadhar_file, mother_aadhar_file, guardian_aadhar_file, student_aadhar_file, user_id, action_type) "
+					+ " SELECT student_id, udise, student_name, emis_no, gender, mediums, std, section, dob, age, parent_type, father_name, mother_name, guardian_name, father_mobile, mother_mobile, guardian_mobile, father_aadhar, mother_aadhar, guardian_aadhar, student_aadhar, father_aadhar_file, mother_aadhar_file, guardian_aadhar_file, student_aadhar_file, ?, ? FROM student_info WHERE student_id = ?";
+			
+			try {
+				jdbcTemplate.update(sql, user_id, action_type, student_id);
+				return "sucess";
+				
+			} catch (DataAccessException e) {
+				e.printStackTrace();
+				return "failure";
+				
+			}
+			
+		}
+	 
+	 @Transactional
+		public ResponseEntity<?> deleteProcess(String student_id, String user_id, String action_type) {
+	 Map<String, Object> result = new HashMap<>();
+			 
+			 String data = logEntry(student_id, user_id, action_type); 
+			 String data1 = "";
+			 if(data.equalsIgnoreCase("sucess")) {
+				data1 = deleteStudent(student_id); 
+			 } else {
+				 result.put("Message", "Error");
+				 result.put("Data", "Failed");
+				 return ResponseEntity.ok(result);
+			 }
+			 if(data1.equalsIgnoreCase("sucess")) {
+				 result.put("Message", "Success");
+					result.put("Data", "Deleted sucessfully");
+			 }else {
+				 result.put("Message", "Error");
+				 result.put("Data", "Failed to Delete");
+			 }
+			 return ResponseEntity.ok(result);
+		}
+		
+		private String deleteStudent(String student_id) {
+			String sql="UPDATE student_info SET is_delete = 1, is_active = 0 WHERE student_id = ? ";
+		
+			
+			try {
+				jdbcTemplate.update(sql, student_id);
+				return "sucess";
+			} catch (DataAccessException e) {
+				e.printStackTrace();
+				return "failure";
+			}
+		}
+
+
+		@Transactional
+		public ResponseEntity<?> updateProcess(String student_id, String user_id, String action_type, String udise,
+				String student_name, String emis_no, String gender, String mediums, String std, String section, String dob,
+				String age, String parent_type, String father_name, String mother_name, String guardian_name,
+				String father_mobile, String mother_mobile, String guardian_mobile, String father_aadhar,
+				String mother_aadhar, String guardian_aadhar, String student_aadhar, MultipartFile father_aadhar_file,
+				MultipartFile mother_aadhar_file, MultipartFile guardian_aadhar_file, MultipartFile student_aadhar_file, String raw_father_aadhar, String raw_mother_aadhar, String raw_guardian_aadhar, String raw_student_aadhar) {
+			 Map<String, Object> result = new HashMap<>();
+			 			
+				 String data = logEntry(student_id, user_id, action_type); 
+				 String data1 = "";
+				 if(data.equalsIgnoreCase("sucess")) {
+					data1 = updateStudent(student_id, udise, student_name, emis_no, gender, mediums, std, section, dob, age, parent_type, father_name, mother_name, guardian_name, father_mobile, mother_mobile, guardian_mobile, father_aadhar, mother_aadhar, guardian_aadhar, student_aadhar, father_aadhar_file, mother_aadhar_file, guardian_aadhar_file, student_aadhar_file, raw_father_aadhar, raw_mother_aadhar, raw_guardian_aadhar, raw_student_aadhar); 
+				 }
+				 else {
+					 result.put("Message", "Error");
+					 result.put("Data", "Failed");
+					 return ResponseEntity.ok(result);
+				 }
+				 
+				 if(data1.equalsIgnoreCase("sucess")) {
+					 result.put("Message", "Success");
+						result.put("Data", "Updated successfully");
+				 }else {
+					 result.put("Message", "Error");
+					 result.put("Data", "Failed to update");
+				 }
+
+			 return ResponseEntity.ok(result);
+		}
+		 
+		private String updateStudent(String student_id, String udise, String student_name, String emis_no, String gender,
+				String mediums, String std, String section, String dob, String age, String parent_type, String father_name,
+				String mother_name, String guardian_name, String father_mobile, String mother_mobile,
+				String guardian_mobile, String father_aadhar, String mother_aadhar, String guardian_aadhar,
+				String student_aadhar, MultipartFile father_aadhar_file, MultipartFile mother_aadhar_file,
+				MultipartFile guardian_aadhar_file, MultipartFile student_aadhar_file, String raw_father_aadhar, String raw_mother_aadhar, String raw_guardian_aadhar, String raw_student_aadhar) {
+			    
+			    String sql = "";
+			    
+			    String fatherUrl = null;
+				 String motherUrl = null;
+				 String guardianUrl = null;
+				 String studentUrl = null;
+
+				 
+				 try {
+					 
+					 //// for parent
+					 if("Parent".equalsIgnoreCase(parent_type)) {
+						 
+						 if(raw_father_aadhar!=null && !raw_father_aadhar.isEmpty() ) {
+							 fatherUrl = raw_father_aadhar;
+							 if(father_aadhar_file!=null && !father_aadhar_file.isEmpty()) {
+								 fatherUrl = saveFile(father_aadhar_file);
+							 }							 
+							 
+						 }
+						 else {
+							 if(father_aadhar_file!=null && !father_aadhar_file.isEmpty()) {
+								 fatherUrl = saveFile(father_aadhar_file);
+							 }
+							 else {
+								 fatherUrl = null;
+							 }
+							 
+						 }
+					
+						 if(raw_mother_aadhar!=null && !raw_mother_aadhar.isEmpty() ) {
+							 
+							 motherUrl = raw_mother_aadhar;
+							 if(mother_aadhar_file!=null && !mother_aadhar_file.isEmpty()) {
+								
+								 motherUrl = saveFile(mother_aadhar_file); 
+							 } 
+							
+						 }
+						 else {
+							 
+							 if(mother_aadhar_file!=null && !mother_aadhar_file.isEmpty()) {
+								 motherUrl = saveFile(mother_aadhar_file); 
+							 }
+							 else {
+								 motherUrl =null;
+							 }
+							
+						 }
+						 
+					 }
+					 
+					 else {
+						 if (father_aadhar_file != null && !father_aadhar_file.isEmpty()) {
+							    fatherUrl = saveFile(father_aadhar_file);
+							} else {
+							    //fatherUrl = (raw_father_aadhar != null) ? raw_father_aadhar : null;
+							    fatherUrl = (raw_father_aadhar != null && !raw_father_aadhar.isEmpty()) ? raw_father_aadhar : null;
+							}
+						 
+						 if (mother_aadhar_file != null && !mother_aadhar_file.isEmpty()) {
+							 	motherUrl = saveFile(mother_aadhar_file);
+							} else {
+								//motherUrl = (raw_mother_aadhar != null) ? raw_mother_aadhar : null;
+								motherUrl = (raw_mother_aadhar != null && !raw_mother_aadhar.isEmpty()) ? raw_mother_aadhar : null;
+							}
+					 }
+					 
+					 
+					 
+					 ////
+					 guardianUrl = raw_guardian_aadhar;
+					 if(guardian_aadhar_file!=null && !guardian_aadhar_file.isEmpty()) {
+						 guardianUrl = saveFile(guardian_aadhar_file);
+					 } 
+					
+					 ///
+					 studentUrl = raw_student_aadhar;
+					 if(student_aadhar_file!=null && !student_aadhar_file.isEmpty()) {
+						 studentUrl = saveFile(student_aadhar_file); 
+					 }
+					 
+					 //father_mobile mother_mobile
+					 if (father_mobile != null && father_mobile.trim().isEmpty()) {
+						 father_mobile = null;
+						}
+					 if (mother_mobile != null && mother_mobile.trim().isEmpty()) {
+						 mother_mobile = null;
+						}
+					 
+					// father_aadhar mother_aadhar  student_aadhar
+					 if (father_aadhar != null && father_aadhar.trim().isEmpty()) {
+						 father_aadhar = null;
+						}
+					 if (mother_aadhar != null && mother_aadhar.trim().isEmpty()) {
+						 mother_aadhar = null;
+						}
+					 
+					 if (student_aadhar != null && student_aadhar.trim().isEmpty()) {
+						    student_aadhar = null;
+						}
+					 
+					 ////////
+					 if(parent_type.equalsIgnoreCase("Parent")) {
+						 sql="UPDATE student_info SET udise = ?, student_name = ?, emis_no = ?, gender = ?, mediums = ?, std = ?, section = ?, dob = ?, age = ?, parent_type = ?, father_name = ?, mother_name = ?, father_mobile = ?, mother_mobile = ?, father_aadhar = ?, mother_aadhar = ?, student_aadhar = ?, father_aadhar_file = ?, mother_aadhar_file = ?, student_aadhar_file = ?  WHERE student_id = ? ";
+						 jdbcTemplate.update(sql, udise, student_name, emis_no, gender, mediums, std, section, dob, age, parent_type, father_name, mother_name, father_mobile, mother_mobile, father_aadhar, mother_aadhar, student_aadhar, fatherUrl, motherUrl, studentUrl, student_id);
+					 } else if(parent_type.equalsIgnoreCase("SingleParent_Father")) {
+						 sql="UPDATE student_info SET udise = ?, student_name = ?, emis_no = ?, gender = ?, mediums = ?, std = ?, section = ?, dob = ?, age = ?, parent_type = ?, father_name = ?, father_mobile = ?, father_aadhar = ?, student_aadhar = ?, father_aadhar_file = ?, student_aadhar_file = ?  WHERE student_id = ? ";
+						 jdbcTemplate.update(sql, udise, student_name, emis_no, gender, mediums, std, section, dob, age, parent_type, father_name, father_mobile, father_aadhar, student_aadhar, fatherUrl, studentUrl, student_id);
+					 } else if(parent_type.equalsIgnoreCase("SingleParent_Mother")) {
+						 sql="UPDATE student_info SET udise = ?, student_name = ?, emis_no = ?, gender = ?, mediums = ?, std = ?, section = ?, dob = ?, age = ?, parent_type = ?, mother_name = ?, mother_mobile = ?, mother_aadhar = ?, student_aadhar = ?, mother_aadhar_file = ?, student_aadhar_file = ?  WHERE student_id = ? ";
+						 jdbcTemplate.update(sql, udise, student_name, emis_no, gender, mediums, std, section, dob, age, parent_type, mother_name, mother_mobile, mother_aadhar, student_aadhar, motherUrl, studentUrl, student_id);
+					 } else if(parent_type.equalsIgnoreCase("Guardian")) {
+						 sql="UPDATE student_info SET udise = ?, student_name = ?, emis_no = ?, gender = ?, mediums = ?, std = ?, section = ?, dob = ?, age = ?, parent_type = ?, father_name = ?, mother_name = ?, guardian_name = ?, father_mobile = ?, mother_mobile = ?, guardian_mobile = ?, father_aadhar = ?, mother_aadhar = ?, guardian_aadhar = ?, student_aadhar = ?, father_aadhar_file = ?, mother_aadhar_file = ?, guardian_aadhar_file = ?, student_aadhar_file = ?  WHERE student_id = ? ";
+						 jdbcTemplate.update(sql, udise, student_name, emis_no, gender, mediums, std, section, dob, age, parent_type, father_name, mother_name, guardian_name, father_mobile, mother_mobile, guardian_mobile, father_aadhar, mother_aadhar, guardian_aadhar, student_aadhar, fatherUrl, motherUrl, guardianUrl, studentUrl, student_id);
+					 }
+					 return "sucess";
+				 }catch (Exception e) {
+					 e.printStackTrace();
+						return "failure";
+				}
+		}
+		
+		@Transactional
+		public ResponseEntity<?> checkStudent(String udise, String schoolId) {
+		    Map<String, Object> result = new HashMap<>();
+		    try {
+		        String stu_strength = studentStrength(schoolId);
+		        String aadhar_strength = aadharStrength(udise);
+
+		        if (!stu_strength.equalsIgnoreCase("error") && !aadhar_strength.equalsIgnoreCase("error")) {
+		            int allowable_strength = Integer.parseInt(stu_strength) - Integer.parseInt(aadhar_strength);
+		            result.put("Student_Strength", Integer.parseInt(stu_strength));
+		            result.put("Aadhar_strength", Integer.parseInt(aadhar_strength));
+		            result.put("Allowable_strength", allowable_strength);
+		            result.put("Message", "Sucessfully student count fetched");
+		            result.put("Status", "Sucess");
+		        } else if (stu_strength.equalsIgnoreCase("error") || aadhar_strength.equalsIgnoreCase("error")) {
+		            result.put("Status", "Error");
+		            result.put("Message", "Error in fetching students count");
+		        }
+		    } catch (Exception e) {
+		        e.printStackTrace();
+		        result.put("Status", "Error");
+		        result.put("Message", "Error in fetching students count");
+		    }
+		    return ResponseEntity.ok(result);
+		}
+		
+
+		private String aadharStrength(String udise) {
+			String sql = "SELECT count(*) FROM student_info WHERE udise = ? AND is_active = 1 AND is_delete = 0";
+		    String strength = "0"; 
+
+		    try {
+		        String result = jdbcTemplate.queryForObject(sql, String.class, udise);
+		        if (result != null && !result.isEmpty()) {
+		            strength = result;
+		        }
+		    }
+		    catch (Exception e) {
+		       System.out.println("Error fetching student strength: " + e.getMessage());
+		        strength = "error";
+		    }
+
+		    return strength;
+		}
+		private String studentStrength(String schoolId) {
+		    String sql = "SELECT total_students FROM student_strength WHERE school_id = ?";
+		    String strength = "0"; 
+
+		    try {
+		        String result = jdbcTemplate.queryForObject(sql, String.class, schoolId);
+		        if (result != null && !result.isEmpty()) {
+		            strength = result;
+		        }
+		    }
+		 	    catch (Exception e) {
+		        System.out.println("Error fetching student strength: " + e.getMessage());
+		        strength = "error";
+		    }
+
+		    return strength;
+		}
+		
+}
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/vendor/controller/ApiController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/vendor/controller/ApiController.java
new file mode 100644
index 0000000..e7b15b7
--- /dev/null
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/vendor/controller/ApiController.java
@@ -0,0 +1,480 @@
+package in.gov.chennaicorporation.gccoffice.vendor.controller;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.dao.DataAccessException;
+import org.springframework.http.HttpMethod;
+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 org.springframework.web.multipart.MultipartFile;
+
+import in.gov.chennaicorporation.gccoffice.configuration.AppConfig;
+import in.gov.chennaicorporation.gccoffice.vendor.service.StreetVendorService;
+import in.gov.chennaicorporation.gccoffice.vendor.service.createventService;
+
+@RestController("streetvendorApiController")
+@RequestMapping("/gcc/api/streetvendor")
+public class ApiController {
+	
+	private final RestTemplate restTemplate;
+	private final AppConfig appConfig;
+	
+	@Autowired
+	private StreetVendorService streetVendorService;
+	
+	@Autowired
+	public createventService createventservice;
+	
+	@Autowired  
+    public ApiController(RestTemplate restTemplate, AppConfig appConfig) {
+        this.restTemplate = restTemplate;
+        this.appConfig = appConfig;
+    }
+
+    @Autowired
+    private Environment environment;
+    
+    @GetMapping("/vendorCommiteeList")
+	 public String getVendorCommiteeDetails(){
+		 String apiUrl = appConfig.mobileservice + "/gccofficialapp/api/streetvendor/vendingCommiteeList";
+		 ResponseEntity<String> responseEntity = restTemplate.getForEntity(apiUrl, String.class);
+		 return responseEntity.getBody();		 
+	 }
+    
+//    @GetMapping("/vendorCommiteeListbyID")
+//    public String getVendorCommiteeDetailsByID(@RequestParam("id") Long id) {
+//        String apiUrl = appConfig.mobileservice + "/gccofficialapp/api/streetvendor/vendingCommiteeListbyId?id=" + id;
+//        ResponseEntity<String> responseEntity = restTemplate.getForEntity(apiUrl, String.class);
+//        return responseEntity.getBody();
+//    }
+    
+    @GetMapping("/vendorCommiteeListbyID")
+    public ResponseEntity<List<Map<String, Object>>> getVendorCommiteeDetailsByID(@RequestParam("id") Long id) {
+        String apiUrl = appConfig.mobileservice + "/gccofficialapp/api/streetvendor/vendingCommiteeListbyId?id=" + id;
+        ResponseEntity<List> responseEntity = restTemplate.exchange(apiUrl, HttpMethod.GET, null, List.class);
+        //System.out.println("responseEntity...."+responseEntity);
+        return ResponseEntity.ok(responseEntity.getBody());
+    }
+
+    @GetMapping("/vendingCommiteeList")
+    public ResponseEntity<List<Map<String, Object>>> getVendingCommiteeList(@RequestParam("date") String date) {
+        String apiUrl = appConfig.mobileservice + "/gccofficialapp/api/streetvendor/vendingCommiteeList?date=" + date;
+        ResponseEntity<List> responseEntity = restTemplate.exchange(apiUrl, HttpMethod.GET, null, List.class);
+        
+        List<String> saved_request_no=createventservice.removeSavedVendorDetails();
+        //System.out.println("saved_request_no="+saved_request_no);
+        
+     // Filter out matching vendor_req_id entries
+        List<Map<String, Object>> originalList = responseEntity.getBody();
+        List<Map<String,Object>> filteredList = originalList.stream().filter(item -> !saved_request_no.contains(String.valueOf(item.get("vendor_req_id"))))
+        		.collect(Collectors.toList());
+        
+        return ResponseEntity.ok(filteredList);
+    }
+    
+    
+    @GetMapping("/vendorDetailsByReqId")
+    public ResponseEntity<List<Map<String, Object>>> getVendorDetailsByReqId(@RequestParam("requestId") String requestId) {
+        String apiUrl = appConfig.mobileservice + "/gccofficialapp/api/streetvendor/vendorDetailsByReqId?requestId=" + requestId;
+        ResponseEntity<List> responseEntity = restTemplate.exchange(apiUrl, HttpMethod.GET, null, List.class);
+        return ResponseEntity.ok(responseEntity.getBody());
+    }
+
+
+    @PostMapping("/savedetailsforvendor")
+    public ResponseEntity<Map<String, Object>> savedetailsforvendor(@RequestBody Map<String, Object> payload)
+    {
+    	return createventservice.saveVendorDetails(payload);
+    }
+    
+    @GetMapping("/vendingCommiteeDetails")
+    public List<Map<String, Object>> getvendingCommiteeDetails(@RequestParam("event_req_id") String event_req_id) {
+        
+        return createventservice.getCommiteeDetails(event_req_id);
+    }
+    
+    @GetMapping("/vendingDetailsWeb")
+    public List<Map<String, Object>> getvendingDetailsWeb(@RequestParam String cby) {
+        
+        return streetVendorService.getCommiteeDetailsWeb(cby);
+    }
+    
+    @GetMapping("/webVendorDetailsByReqId")
+    public List<Map<String, Object>> getwebVendorDetailsByReqId(@RequestParam("requestId") String requestId) {
+        
+        return streetVendorService.getwebVendorDetailsByReqId(requestId);
+    }
+    
+// sanjay
+    
+//    @GetMapping("/wards-by-zone")
+//    
+//    public List<Map<String, Object>> getWardsByZone(@RequestParam("zoneId") int zoneId) {
+//        return streetVendorService.fetchWardsByZone(zoneId);
+//    }
+    
+    
+
+//        @PostMapping("/saveDetails")
+//        public ResponseEntity<Map<String, Object>> saveVenderDetails(
+//        		
+//        		@RequestParam String latitude,
+//        		@RequestParam String longitude,
+//                @RequestParam String zone,
+//                @RequestParam String ward,
+//                @RequestParam String landmark,
+//                @RequestParam String vending_district,
+//                @RequestParam int vending_pincode,
+//                @RequestParam int vending_category,
+//                @RequestParam String vending_space,
+//                @RequestParam boolean pm_svanidhi_loan,
+//                @RequestParam boolean bank_acc_status,
+//                @RequestParam (required = false, name = "bank_passbook" )MultipartFile bank_passbook,
+//                @RequestParam MultipartFile street_vendor_photo,
+//                @RequestParam String name,
+//                @RequestParam String f_h_name,
+//                @RequestParam String mobile_number,
+//                @RequestParam String dob,
+//                @RequestParam String gender,
+//                @RequestParam int social_category,
+//                @RequestParam boolean diff_abled,
+//                @RequestParam int education_status,
+//                @RequestParam int marital_status,
+//                @RequestParam int no_of_fam_mem,
+//                @RequestParam boolean are_any_fam_mem_invol_str,
+////                @RequestParam String vending_address,
+//                
+//                @RequestParam String door_no,
+//                @RequestParam String streetname,
+//                @RequestParam String areaname,
+//                @RequestParam String present_district,
+//                @RequestParam int present_pincode,
+//                @RequestParam MultipartFile ration_card_photo,
+//                @RequestParam MultipartFile aadhar_front_photo,
+//                @RequestParam MultipartFile aadhar_back_photo,
+//                @RequestParam String aadharNo) {
+//
+//            String presentAddress = door_no + ", " + streetname + ", " + areaname;
+//
+//            System.out.println("bank_passbook...."+bank_passbook);
+//            System.out.println("ration_card_photo...."+ration_card_photo);
+//            System.out.println("street_vendor_photo...."+street_vendor_photo);
+//            System.out.println("aadhar_front_photo...."+aadhar_front_photo);
+//            System.out.println("aadhar_back_photo...."+aadhar_back_photo);
+//            
+//            String bankPassbookPath = "";
+//
+//            // Only upload passbook if status is true
+//            if (bank_acc_status) {
+//                if (bank_passbook != null && !bank_passbook.isEmpty()) {
+//                    bankPassbookPath = streetVendorService.fileUpload	(bank_passbook, "bank_passbook");
+//                } else {
+//                    return ResponseEntity.badRequest().body(Map.of(
+//                            "status", false,
+//                            "description", "Bank passbook is required when account status is Yes"
+//                    ));
+//                }
+//            }
+//            String rationCardPath = streetVendorService.fileUpload(ration_card_photo, "ration_card");
+//            String streetVendorPhotoPath = streetVendorService.fileUpload(street_vendor_photo, "vendor_photo");
+//            String aadharFrontPhotoPath = streetVendorService.fileUpload(aadhar_front_photo, "aadhar_front");
+//            String aadharBackPhotoPath = streetVendorService.fileUpload(aadhar_back_photo, "aadhar_back");
+//
+//            String saveStatus = streetVendorService.saveStreetVendorDetails(
+//            		latitude, longitude,zone, ward, landmark, vending_district, vending_pincode, vending_category, vending_space,
+//                    pm_svanidhi_loan, bank_acc_status, bankPassbookPath,
+//                    streetVendorPhotoPath, name, f_h_name, mobile_number,dob,
+//                    gender, social_category, diff_abled, education_status, marital_status,
+//                    no_of_fam_mem, are_any_fam_mem_invol_str,presentAddress, present_district, present_pincode,
+//                    rationCardPath,aadharFrontPhotoPath, aadharBackPhotoPath,aadharNo);
+//
+//            if (saveStatus == null || saveStatus.equals("error")) {
+//                return ResponseEntity.ok(Map.of(
+//                    "status", false,
+//                    "message", "failed",
+//                    "description", "Failed to save the details"
+//                ));
+//            }
+//
+//            return ResponseEntity.ok(Map.of(
+//                "status", true,
+//                "message", "success",
+//                "description", "Details saved successfully",
+//                "vendor_req_id", saveStatus
+//            ));
+//        }
+    
+    
+    @PostMapping("/saveDetails")
+    public ResponseEntity<Map<String, Object>> saveVenderDetails(
+    		
+    		@RequestParam (required = false)String latitude,
+    		@RequestParam (required = false)String longitude,
+            @RequestParam (required = false)String zone,
+            @RequestParam (required = false)String ward,
+            @RequestParam (required = false)String landmark,
+            @RequestParam (required = false)String vending_district,
+            @RequestParam (required = false)Integer vending_pincode,
+            @RequestParam Integer vending_category,
+            @RequestParam (required = false)String vending_space,
+            @RequestParam (required = false) Boolean pm_svanidhi_loan,
+            @RequestParam (required = false) Boolean bank_acc_status,
+            @RequestParam (required = false, name = "bank_passbook" )MultipartFile bank_passbook,
+            @RequestParam (required = false) MultipartFile street_vendor_photo,
+            @RequestParam String name,
+            @RequestParam (required = false)String f_h_name,
+            @RequestParam String mobile_number,
+            @RequestParam (required = false)String dob,
+            
+            @RequestParam (required = false)String gender,
+            @RequestParam (required = false)Integer social_category,
+            @RequestParam (required = false)Boolean diff_abled,
+            @RequestParam (required = false)Integer education_status,
+            @RequestParam (required = false)Integer marital_status,
+            @RequestParam (required = false)Integer no_of_fam_mem,
+            @RequestParam (required = false)Boolean are_any_fam_mem_invol_str,
+            
+            @RequestParam (required = false)String door_no,
+            @RequestParam (required = false)String streetname,
+            @RequestParam (required = false)String areaname,
+            @RequestParam (required = false)String present_district,
+            @RequestParam (required = false)Integer present_pincode,
+            @RequestParam (required = false)MultipartFile ration_card_photo,
+            @RequestParam (required = false)MultipartFile aadhar_front_photo,
+            @RequestParam (required = false)MultipartFile aadhar_back_photo,
+            @RequestParam (required = false)String aadharNo,
+            @RequestParam String userId) {
+
+        //String presentAddress = door_no + ", " + streetname + ", " + areaname;
+    	
+    	
+        
+    	String doorNoVal = (door_no != null && !door_no.trim().isEmpty()) ? door_no : "";
+    	String streetNameVal = (streetname != null && !streetname.trim().isEmpty()) ? streetname : "";
+    	String areaNameVal = (areaname != null && !areaname.trim().isEmpty()) ? areaname : "";
+    	
+    	
+
+    	String presentAddress = String.join(", ", doorNoVal, streetNameVal, areaNameVal);
+ 
+        String bankPassbookPath = null;
+
+        // Only upload passbook if status is true
+        if (Boolean.TRUE.equals(bank_acc_status)) {
+        	
+            if (bank_passbook != null && !bank_passbook.isEmpty()) {
+            	
+                bankPassbookPath = streetVendorService.fileUpload	(bank_passbook, "street_vendor_bank");
+            } else {
+                return ResponseEntity.badRequest().body(Map.of(
+                        "status", false,
+                        "description", "Bank passbook is required when account status is Yes"
+                ));
+            }
+        }
+        
+        
+        String rationCardPath=null;
+        String streetVendorPhotoPath=null;
+        String aadharFrontPhotoPath=null;
+        String aadharBackPhotoPath=null;
+        
+        if(ration_card_photo != null && !ration_card_photo.isEmpty()) 
+        {
+        	 rationCardPath = streetVendorService.fileUpload(ration_card_photo, "street_vendor_ration");
+        }
+        if (street_vendor_photo != null && !street_vendor_photo.isEmpty()) 
+        {
+        	 streetVendorPhotoPath = streetVendorService.fileUpload(street_vendor_photo, "street_vendor_photo");
+        }
+        if (aadhar_front_photo != null && !aadhar_front_photo.isEmpty()) 
+        {
+        	 aadharFrontPhotoPath = streetVendorService.fileUpload(aadhar_front_photo, "aadhar_front");
+        }
+        if (aadhar_back_photo != null && !aadhar_back_photo.isEmpty())
+        {
+        	  aadharBackPhotoPath = streetVendorService.fileUpload(aadhar_back_photo, "aadhar_back");
+        }
+        
+
+        String saveStatus = streetVendorService.saveStreetVendorDetails(
+        		latitude, longitude,zone, ward, landmark, vending_district, vending_pincode, vending_category, vending_space,
+                pm_svanidhi_loan, bank_acc_status, bankPassbookPath,
+                streetVendorPhotoPath, name, f_h_name, mobile_number,dob,
+                gender, social_category, diff_abled, education_status, marital_status,
+                no_of_fam_mem, are_any_fam_mem_invol_str,presentAddress, present_district, present_pincode,
+                rationCardPath,aadharFrontPhotoPath, aadharBackPhotoPath,aadharNo,userId);
+
+        if (saveStatus == null || saveStatus.equals("error")) {
+            return ResponseEntity.ok(Map.of(
+                "status", false,
+                "message", "failed",
+                "description", "Failed to save the details"
+            ));
+        }
+
+        
+        return ResponseEntity.ok(Map.of(
+            "status", true,
+            "message", "success",
+            "description", "Details saved successfully",
+            "vendor_req_id", saveStatus
+        ));
+    }
+        
+
+        
+        // check mobile number registered
+        @GetMapping("/check-mobile")
+        public ResponseEntity<Boolean> checkMobileNumber(@RequestParam String mobilenumber) {
+            boolean exists = streetVendorService.isMobileRegistered(mobilenumber);
+            return ResponseEntity.ok(exists);
+        }
+        
+        
+        
+        @PostMapping("/updateDetails")
+        public ResponseEntity<Map<String, Object>> updateVenderDetails(
+        		
+        		@RequestParam (required = false)String latitude,
+        		@RequestParam (required = false)String longitude,
+                @RequestParam (required = false)String zone,
+                @RequestParam (required = false)String ward,
+                @RequestParam (required = false)String landmark,
+                @RequestParam (required = false)String vending_district,
+                @RequestParam (required = false)Integer vending_pincode,
+                @RequestParam Integer vending_category,
+                @RequestParam (required = false)String vending_space,
+                @RequestParam (required = false) Boolean pm_svanidhi_loan,
+                @RequestParam (required = false) Boolean bank_acc_status,
+                @RequestParam (required = false, name = "bank_passbook" )MultipartFile bank_passbook,
+                @RequestParam (required = false) MultipartFile street_vendor_photo,
+                @RequestParam String name,
+                @RequestParam (required = false)String f_h_name,
+                @RequestParam String mobile_number,
+                @RequestParam (required = false)String dob,
+                
+                @RequestParam (required = false)String gender,
+                @RequestParam (required = false)Integer social_category,
+                @RequestParam (required = false)Boolean diff_abled,
+                @RequestParam (required = false)Integer education_status,
+                @RequestParam (required = false)Integer marital_status,
+                @RequestParam (required = false)Integer no_of_fam_mem,
+                @RequestParam (required = false)Boolean are_any_fam_mem_invol_str,
+                
+                @RequestParam (required = false)String door_no,
+                @RequestParam (required = false)String streetname,
+                @RequestParam (required = false)String areaname,
+                @RequestParam (required = false)String present_district,
+                @RequestParam (required = false)Integer present_pincode,
+                @RequestParam (required = false)MultipartFile ration_card_photo,
+                @RequestParam (required = false)MultipartFile aadhar_front_photo,
+                @RequestParam (required = false)MultipartFile aadhar_back_photo,
+                @RequestParam (required = false)String aadharNo,
+                @RequestParam (required = false)String raw_bank_passbook,
+                @RequestParam (required = false)String raw_street_vendor_photo,
+                @RequestParam (required = false)String raw_aadhar_front_photo,
+                @RequestParam (required = false)String raw_aadhar_back_photo,
+                @RequestParam (required = false)String raw_ration_card_photo,
+                @RequestParam String userId,
+                @RequestParam String vendor_req_id){
+        	
+        	
+        	String data = streetVendorService.logEntry(userId, vendor_req_id);
+        	
+        	if(data.equalsIgnoreCase("success")) {
+        	
+        	String bankPassbookPath = null;
+        	String rationCardPath=null;
+            String streetVendorPhotoPath=null;
+            String aadharFrontPhotoPath=null;
+            String aadharBackPhotoPath=null;
+            
+            System.out.println("raw_bank_passbook="+raw_bank_passbook);
+            System.out.println("raw_street_vendor_photo="+raw_street_vendor_photo);
+            System.out.println("raw_aadhar_front_photo="+raw_aadhar_front_photo);
+            System.out.println("raw_aadhar_back_photo="+raw_aadhar_back_photo);
+            System.out.println("raw_ration_card_photo="+raw_ration_card_photo);
+            
+            
+            bankPassbookPath=raw_bank_passbook;
+            if(bank_passbook!=null && !bank_passbook.isEmpty()) {
+            	bankPassbookPath = streetVendorService.fileUpload	(bank_passbook, "street_vendor_bank");
+			 }
+            
+            rationCardPath=raw_ration_card_photo;
+            if(ration_card_photo!=null && !ration_card_photo.isEmpty()) {
+            	rationCardPath = streetVendorService.fileUpload	(ration_card_photo, "street_vendor_ration");
+			 }
+            
+            streetVendorPhotoPath=raw_street_vendor_photo;
+            if(street_vendor_photo!=null && !street_vendor_photo.isEmpty()) {
+            	streetVendorPhotoPath = streetVendorService.fileUpload	(street_vendor_photo, "street_vendor_photo");
+			 }
+            
+            aadharFrontPhotoPath=raw_aadhar_front_photo;
+            if(aadhar_front_photo!=null && !aadhar_front_photo.isEmpty()) {
+            	aadharFrontPhotoPath = streetVendorService.fileUpload	(aadhar_front_photo, "aadhar_front");
+			 }
+            
+            aadharBackPhotoPath=raw_aadhar_back_photo;
+            if(aadhar_back_photo!=null && !aadhar_back_photo.isEmpty()) {
+            	aadharBackPhotoPath = streetVendorService.fileUpload	(aadhar_back_photo, "aadhar_back");
+			 }
+            
+            String doorNoVal = (door_no != null && !door_no.trim().isEmpty()) ? door_no : "";
+        	String streetNameVal = (streetname != null && !streetname.trim().isEmpty()) ? streetname : "";
+        	String areaNameVal = (areaname != null && !areaname.trim().isEmpty()) ? areaname : "";
+        	
+        	
+        	String presentAddress = String.join(", ", doorNoVal, streetNameVal, areaNameVal);
+        	
+        	String sts=streetVendorService.updateStreetVendorDetailsWeb(
+            		latitude, longitude,zone, ward, landmark, vending_district, vending_pincode, vending_category, vending_space,
+                    pm_svanidhi_loan, bank_acc_status, bankPassbookPath,
+                    streetVendorPhotoPath, name, f_h_name, mobile_number,dob,
+                    gender, social_category, diff_abled, education_status, marital_status,
+                    no_of_fam_mem, are_any_fam_mem_invol_str,presentAddress, present_district, present_pincode,
+                    rationCardPath,aadharFrontPhotoPath, aadharBackPhotoPath,aadharNo,userId,vendor_req_id);
+            
+            if(sts.equals("Error")) {
+            	return ResponseEntity.ok(Map.of(
+                        "status", false,
+                        "message", "failed",
+                        "description", "Failed to update the details"
+                    ));
+            }
+        	
+        	return ResponseEntity.ok(Map.of(
+                    "status", true,
+                    "message", "success",
+                    "description", "Details Updated successfully"                  
+                ));
+        	
+        }
+       
+        else {
+        	
+        	return ResponseEntity.ok(Map.of(
+                    "status", false,
+                    "message", "failed",
+                    "description", "Issues in log entry,So failed to update"
+                ));
+        }
+        	
+        }
+    }
+    
+    
+
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/vendor/controller/CreateEventAPIController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/vendor/controller/CreateEventAPIController.java
new file mode 100644
index 0000000..1be9453
--- /dev/null
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/vendor/controller/CreateEventAPIController.java
@@ -0,0 +1,126 @@
+package in.gov.chennaicorporation.gccoffice.vendor.controller;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import in.gov.chennaicorporation.gccoffice.vendor.service.createventService;
+
+@RequestMapping("/gcc/api/vending")
+@RestController
+public class CreateEventAPIController {
+	
+	 @Autowired
+	    private createventService createventservices; 
+	 
+	 @Autowired
+	 private Environment environment;
+
+	 @PostMapping("/save")
+	 public ResponseEntity<String> saveEventWithFile(
+	         @RequestParam("eventName") String eventName,
+	         @RequestParam("eventDate") String eventDateStr,
+	         @RequestParam("file") MultipartFile file) {
+
+	     try {
+	         if (eventName == null || eventDateStr == null || file.isEmpty()) {
+	             throw new IllegalArgumentException("Event Name, Date, and File must not be empty.");
+	         }
+	         
+	      // Debug logs
+	         System.out.println("Event Name: " + eventName);
+	         System.out.println("Event Date: " + eventDateStr);
+	         System.out.println("Original File Name: " + file.getOriginalFilename());
+
+	        String originalfilename = file.getOriginalFilename();
+	        boolean existfileurl = createventservices.isFileExists(originalfilename);
+	        String fileUrl = saveFile(file);
+	         // Save to DB
+	         LocalDate eventDate = LocalDate.parse(eventDateStr);
+	         createventservices.insertEvent(eventName, eventDate, fileUrl);
+
+	         return ResponseEntity.ok("Event saved successfully.");
+	     } catch (IllegalArgumentException e) {
+	         return ResponseEntity.badRequest().body("Validation Error: " + e.getMessage());
+	     } catch (Exception e) {
+	         return ResponseEntity.status(500).body("Internal Server Error: " + e.getMessage());
+	     }
+	 }
+	 
+	 
+	    //save file and get path
+	    private String saveFile(MultipartFile file) throws IOException {
+	    	
+	    	String uploadDirectory = environment.getProperty("file.upload.directory");
+	        
+	        String folderName = environment.getProperty("vending.foldername");
+	        	        
+	        String fileName = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd_HHmmss")) + "_" + file.getOriginalFilename();
+
+	        String folderPath = uploadDirectory + "/" + folderName + "/";
+	        
+	        
+	        Path dirPath = Paths.get(folderPath);
+	        if (!Files.exists(dirPath)) {
+	            Files.createDirectories(dirPath);
+	        }
+	               
+	        Path filePath = dirPath.resolve(fileName);
+	        
+	        Files.write(filePath, file.getBytes());
+	        
+	        return filePath.toAbsolutePath().toString();
+	    }
+
+	    
+	    @GetMapping("/dropdown-Event")
+	    public ResponseEntity<List<Map<String, Object>>> ViewDropdownEvent() {
+	        try {
+	            List<Map<String, Object>> result = createventservices.ViewDropdownEvent();
+	            return ResponseEntity.ok(result);
+	        } catch (Exception e) {
+	            Map<String, Object> error = new HashMap<>();
+	            error.put("error", "Unable to fetch event list");
+	            error.put("details", e.getMessage());
+	            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+	                                 .body(Collections.singletonList(error));
+	        }
+	    }
+	    
+	    
+	    @GetMapping("/committedropdown")
+	    public ResponseEntity<List<Map<String, Object>>> ViewCommitteeDropdownEvent() {
+	        try {
+	            List<Map<String, Object>> result = createventservices.ViewCommitteeDropdownEvent();
+	            System.out.println("result="+result);
+	            return ResponseEntity.ok(result);
+	        } catch (Exception e) {
+	            Map<String, Object> error = new HashMap<>();
+	            error.put("error", "Unable to fetch event list");
+	            error.put("details", e.getMessage());
+	            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+	                                 .body(Collections.singletonList(error));
+	        }
+	    }
+
+	    
+}
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/vendor/controller/MainController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/vendor/controller/MainController.java
new file mode 100644
index 0000000..228e70a
--- /dev/null
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/vendor/controller/MainController.java
@@ -0,0 +1,147 @@
+package in.gov.chennaicorporation.gccoffice.vendor.controller;
+
+import java.util.List;
+import java.util.Map;
+
+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;
+import in.gov.chennaicorporation.gccoffice.vendor.service.StreetVendorService;
+
+@RequestMapping("/gcc/vendor") 
+@Controller("vendorMainController")
+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;     
+    }
+	
+	@Autowired
+	private StreetVendorService streetVendorService;
+	
+	@GetMapping("/addevent")
+	public String viewAddEvent(Model model)
+	{	
+		String LoginUserId =  LoginUserInfo.getLoginUserId();
+		model.addAttribute("LoginUserId",LoginUserId);
+		
+		String UserRole = LoginUserInfo.getUserRole();
+		model.addAttribute("UserRole", UserRole);		
+        
+		return "modules/vendors/addevent";
+	}
+	
+	@GetMapping("/requestlist")
+	public String viewRequestList(Model model)
+	{	
+		String LoginUserId =  LoginUserInfo.getLoginUserId();
+		model.addAttribute("LoginUserId",LoginUserId);
+		
+		String UserRole = LoginUserInfo.getUserRole();
+		model.addAttribute("UserRole", UserRole);		
+        
+		return "modules/vendors/RequestList";
+	}
+	
+	@GetMapping("/eventlist")
+	public String viewEventList(Model model)
+	{	
+		String LoginUserId =  LoginUserInfo.getLoginUserId();
+		model.addAttribute("LoginUserId",LoginUserId);
+		
+		String UserRole = LoginUserInfo.getUserRole();
+		model.addAttribute("UserRole", UserRole);		
+        
+		return "modules/vendors/EventList";
+	}
+	
+	@GetMapping("/streetvendorform")
+	public String streetvendorform(Model model)
+	{	
+				
+		String LoginUserId =  LoginUserInfo.getLoginUserId();
+		model.addAttribute("LoginUserId",LoginUserId);
+		
+		String UserRole = LoginUserInfo.getUserRole();
+		model.addAttribute("UserRole", UserRole);		
+		
+		
+		
+		List<Map<String, Object>>communities=streetVendorService.fetchCommunities();
+	    //System.out.println("communities===="+communities);
+	    model.addAttribute("communities", communities);
+	    
+	    
+	    
+	    List<Map<String, Object>>maritalStatuses=streetVendorService.fetchMaritalStatus();
+	    //System.out.println("maritalStatuses===="+maritalStatuses);
+	    model.addAttribute("maritalStatuses", maritalStatuses);
+		
+	    
+	    
+	    List<Map<String, Object>>educationList=streetVendorService.fetchEducationStatus();
+	    //System.out.println("educationList===="+educationList);
+	    model.addAttribute("educationList", educationList);
+	    
+	    
+	    
+	    List<Map<String, Object>>vendingCategories=streetVendorService.fetchvendingCategory();
+	    //System.out.println("vendingCategory===="+vendingCategories);
+	    model.addAttribute("vendingCategories", vendingCategories);
+	    
+	    
+		//List<Map<String, Object>>zones=streetVendorService.fetchZones();
+	    //System.out.println("zones===="+zones);
+	    //model.addAttribute("zones", zones);
+	    
+	 
+	
+      
+		return "modules/vendors/streetVendorRequestForm";
+	}
+	
+	
+	@GetMapping("/streetvendorlist")
+	public String viewVendorRequestList(Model model)
+	{	
+		String LoginUserId =  LoginUserInfo.getLoginUserId();
+		model.addAttribute("LoginUserId",LoginUserId); 
+		
+		String UserRole = LoginUserInfo.getUserRole();
+		model.addAttribute("UserRole", UserRole);	
+		
+		
+		List<Map<String, Object>>communities=streetVendorService.fetchCommunities();	    
+	    model.addAttribute("communities", communities);
+	    
+	    	    
+	    List<Map<String, Object>>maritalStatuses=streetVendorService.fetchMaritalStatus();
+	    model.addAttribute("maritalStatuses", maritalStatuses);
+		
+	    	    
+	    List<Map<String, Object>>educationList=streetVendorService.fetchEducationStatus();
+	    model.addAttribute("educationList", educationList);
+	    
+	    	    
+	    List<Map<String, Object>>vendingCategories=streetVendorService.fetchvendingCategory();
+	    model.addAttribute("vendingCategories", vendingCategories);
+		
+		return "modules/vendors/streetVendorRequestList";
+	}
+	
+
+}
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/vendor/service/DateTimeUtil.java b/src/main/java/in/gov/chennaicorporation/gccoffice/vendor/service/DateTimeUtil.java
new file mode 100644
index 0000000..e6a6f90
--- /dev/null
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/vendor/service/DateTimeUtil.java
@@ -0,0 +1,37 @@
+package in.gov.chennaicorporation.gccoffice.vendor.service;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+import org.springframework.stereotype.Component;
+
+
+
+@Component("vendorDateTimeUtil") // For vendo
+public final class DateTimeUtil {
+	public static String getCurrentDateTime() {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("ddMMyyyyHHmmss");
+        LocalDateTime now = LocalDateTime.now();
+        return now.format(formatter);
+    }
+	public static String getCurrentYear() {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy");
+        LocalDateTime now = LocalDateTime.now();
+        return now.format(formatter);
+    }
+	public static String getCurrentMonth() {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MM");
+        LocalDateTime now = LocalDateTime.now();
+        return now.format(formatter);
+    }
+	public static String getCurrentDay() {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd");
+        LocalDateTime now = LocalDateTime.now();
+        return now.format(formatter);
+    }
+	public static String getCurrentDateTimeMysql() {
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+		LocalDateTime now = LocalDateTime.now();
+		return now.format(formatter);
+    }
+}
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/vendor/service/StreetVendorService.java b/src/main/java/in/gov/chennaicorporation/gccoffice/vendor/service/StreetVendorService.java
new file mode 100644
index 0000000..d38e4bb
--- /dev/null
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/vendor/service/StreetVendorService.java
@@ -0,0 +1,484 @@
+package in.gov.chennaicorporation.gccoffice.vendor.service;
+
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.security.SecureRandom;
+import java.sql.PreparedStatement;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import javax.imageio.ImageIO;
+import javax.imageio.ImageWriteParam;
+import javax.imageio.ImageWriter;
+import javax.imageio.stream.ImageOutputStream;
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.core.env.Environment;
+import org.springframework.dao.DataAccessException;
+import org.springframework.http.ResponseEntity;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+
+
+@Service
+public class StreetVendorService {
+	
+	
+	 @Autowired
+	    @Qualifier("vendorDateTimeUtil")
+	    private DateTimeUtil dateTimeUtil;
+	
+	
+	 private final Environment environment;
+	 
+	 private String fileBaseUrl;
+	
+	private JdbcTemplate jdbcTemplate;
+	
+	
+	@Autowired
+	public void setDataSource(@Qualifier("mysqlGccStreetVendorDataSource") DataSource dataSource) {
+		this.jdbcTemplate = new JdbcTemplate(dataSource);
+	}
+	
+	 private static final String CHARACTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+	    private static final int STRING_LENGTH = 15;
+	    private static final Random RANDOM = new SecureRandom();
+
+	
+	 public StreetVendorService(Environment environment) {
+	        this.environment = environment;
+	        this.fileBaseUrl = environment.getProperty("fileBaseUrl");
+	    }
+	
+	
+	 public List<Map<String, Object>> fetchCommunities() {
+	        String query = "SELECT id,category_name " +
+	                       "FROM social_category_master " +
+	                       "WHERE is_active=1 AND is_delete=0 ";
+	     
+	        
+	        return jdbcTemplate.queryForList(query);
+	    }
+	
+	
+	
+	 public List<Map<String, Object>> fetchMaritalStatus() {
+	        String query = "SELECT id,marital_status " +
+	                       "FROM marital_status_master " +
+	                       "WHERE is_active=1 AND is_delete=0 ";
+	     
+	        
+	        return jdbcTemplate.queryForList(query);
+	    }
+	
+	 
+
+	 public List<Map<String, Object>> fetchEducationStatus() {
+	        String query = "SELECT id,education " +
+	                       "FROM education_master " +
+	                       "WHERE is_active=1 AND is_delete=0 ";
+	     
+	        
+	        return jdbcTemplate.queryForList(query);
+	    }
+	 
+	 public List<Map<String, Object>> fetchvendingCategory() {
+	        String query = "SELECT id,vending_category_name " +
+	                       "FROM vending_category_master " +
+	                       "WHERE is_active=1 AND is_delete=0 ";
+	     
+	        
+	        return jdbcTemplate.queryForList(query);
+	    }
+	 
+	 
+//	 public List<Map<String, Object>> fetchZones() {
+//	        String query = "SELECT id,zone_name " +
+//	                       "FROM zone_master " +
+//	                       "WHERE is_active=1 AND is_delete=0 ";
+//	     
+//	        
+//	        return jdbcTemplate.queryForList(query);
+//	    }
+	 
+//	 public List<Map<String, Object>> fetchWardsByZone(int zoneId) {
+//	        String sql = "SELECT id, ward_name FROM ward_master WHERE zone_id = ? ";
+//	        return jdbcTemplate.queryForList(sql, zoneId);
+//	    }
+	
+	 
+//	 public String saveStreetVendorDetails(String latitude,String longitude,String zone, String ward, String landmark, String vending_district,
+//				int vending_pincode, int vending_category, String vending_space, boolean pm_svanidhi_loan,
+//				boolean bank_acc_status, String bankPassbookPath, String streetVendorPhotoPath, String name,
+//				String f_h_name, String mobile_number, String dob, String gender, int social_category, boolean diff_abled,
+//				int education_status, int marital_status, int no_of_fam_mem, boolean are_any_fam_mem_invol_str,
+//				String presentAddress, String present_district, int present_pincode, String rationCardPath,
+//				 String aadharFrontPhotoPath, String aadharBackPhotoPath,String aadharNo) {
+//
+//		 
+//		 
+//			String sql = "INSERT INTO vendor_details ("
+//					+ "latitude,longitude,zone, ward, vending_address,vending_district, vending_pincode, vending_category, vending_space, pm_svanidhi_loan, "
+//					+ "bank_acc_status, bank_passbook, street_vendor_photo, name, f_h_name, mob_no, "
+//					+ "dob,gender,social_category, diff_abled, education_status, marital_status,no_of_fam_mem, "
+//					+ "are_any_fam_mem_invol_str_ven,present_address, present_district, present_pincode, ration_card_photo, aadhar_front_photo, "
+//					+ "aadhar_back_photo,aadhar_no"
+//					+ ") VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?)";
+//
+//			KeyHolder keyHolder = new GeneratedKeyHolder();
+//
+//			try {
+//				int result = jdbcTemplate.update(connection -> {
+//					PreparedStatement ps = connection.prepareStatement(sql, new String[] { "id" });
+//					ps.setString(1, latitude);
+//					ps.setString(2, longitude);
+//					ps.setString(3, zone);
+//					ps.setString(4, ward);
+//					ps.setString(5, landmark);
+//					ps.setString(6, vending_district);
+//					ps.setInt(7, vending_pincode);
+//					ps.setInt(8, vending_category);
+//					ps.setString(9, vending_space);
+//					ps.setBoolean(10, pm_svanidhi_loan);
+//					ps.setBoolean(11, bank_acc_status);
+//					ps.setString(12, bankPassbookPath);
+//					ps.setString(13, streetVendorPhotoPath);
+//					ps.setString(14, name);
+//					ps.setString(15, f_h_name);
+//					ps.setString(16, mobile_number);
+//					ps.setString(17, dob);
+//					ps.setString(18, gender);
+//					ps.setInt(19, social_category);
+//					ps.setBoolean(20, diff_abled);
+//					ps.setInt(21, education_status);
+//					ps.setInt(22, marital_status);
+//					ps.setInt(23, no_of_fam_mem);
+//					ps.setBoolean(24, are_any_fam_mem_invol_str);
+//					ps.setString(25, presentAddress);
+//					ps.setString(26, present_district);
+//					ps.setInt(27, present_pincode);
+//		            ps.setString(28, rationCardPath);
+//		            ps.setString(29, aadharFrontPhotoPath);
+//		            ps.setString(30, aadharBackPhotoPath);
+//		            ps.setString(31, aadharNo);
+//					return ps;
+//				}, keyHolder);
+//				//return keyHolder.getKey().intValue();
+//				if (result > 0) {
+//		            int generatedId = keyHolder.getKey().intValue();
+//		            String prefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+//		            String refId = prefix + generatedId;
+//
+//		            String updateSql = " UPDATE vendor_details SET vendor_req_id = ? WHERE id = ? ";
+//		            jdbcTemplate.update(updateSql,refId, generatedId);
+//		            return refId;
+//		        }
+//		        //return "error";
+//			} catch (Exception e) {
+//				e.printStackTrace();
+//			}
+//			return "error";
+//		}
+	 
+	 
+	 public String saveStreetVendorDetails(String latitude,String longitude,String zone, String ward, String landmark, String vending_district,
+				Integer vending_pincode, Integer vending_category, String vending_space, Boolean pm_svanidhi_loan,
+				Boolean bank_acc_status, String bankPassbookPath, String streetVendorPhotoPath, String name,
+				String f_h_name, String mobile_number, String dob, String gender, Integer social_category, Boolean diff_abled,
+				Integer education_status, Integer marital_status, Integer no_of_fam_mem, Boolean are_any_fam_mem_invol_str,
+				String presentAddress, String present_district, Integer present_pincode, String rationCardPath,
+				 String aadharFrontPhotoPath, String aadharBackPhotoPath,String aadharNo,String userId) {
+
+		 	int isWeb=1;
+		 	String latitudeVal = (latitude != null && !latitude.trim().isEmpty()) ? latitude : null;
+		 	String longitudeVal = (longitude != null && !longitude.trim().isEmpty()) ? longitude : null;
+		 	String zoneVal = (zone != null && !zone.trim().isEmpty()) ? zone : null;
+		 	String wardVal = (ward != null && !ward.trim().isEmpty()) ? ward : null;
+		 	String dobVal = (dob != null && !dob.trim().isEmpty()) ? dob : null;
+		 	String vendingAddressVal = (landmark != null && !landmark.trim().isEmpty()) ? landmark : null;
+		 
+		 	
+		 	
+			String sql = "INSERT INTO vendor_details ("
+					+ "latitude,longitude,zone, ward, vending_address,vending_district, vending_pincode, vending_category, vending_space, pm_svanidhi_loan, "
+					+ "bank_acc_status, bank_passbook, street_vendor_photo, name, f_h_name, mob_no, "
+					+ "dob,gender,social_category, diff_abled, education_status, marital_status,no_of_fam_mem, "
+					+ "are_any_fam_mem_invol_str_ven,present_address, present_district, present_pincode, ration_card_photo, aadhar_front_photo, "
+					+ "aadhar_back_photo,aadhar_no,is_web,cby"
+					+ ") VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?,?)";
+
+			KeyHolder keyHolder = new GeneratedKeyHolder();
+
+			try {
+				int result = jdbcTemplate.update(connection -> {
+					PreparedStatement ps = connection.prepareStatement(sql, new String[] { "id" });
+					ps.setString(1, latitudeVal);
+					ps.setString(2, longitudeVal);
+					ps.setString(3, zoneVal);
+					ps.setString(4, wardVal);
+					ps.setString(5, vendingAddressVal);
+					ps.setString(6, vending_district);
+					if (vending_pincode != null) ps.setInt(7, vending_pincode);
+					else ps.setNull(7, java.sql.Types.INTEGER);
+
+					if (vending_category != null) ps.setInt(8, vending_category);
+					else ps.setNull(8, java.sql.Types.INTEGER);
+					ps.setString(9, vending_space);
+					if (pm_svanidhi_loan != null) ps.setBoolean(10, pm_svanidhi_loan);
+					else ps.setNull(10, java.sql.Types.BOOLEAN);
+
+					if (bank_acc_status != null) ps.setBoolean(11, bank_acc_status);
+					else ps.setNull(11, java.sql.Types.BOOLEAN);
+					ps.setString(12, bankPassbookPath);
+					ps.setString(13, streetVendorPhotoPath);
+					ps.setString(14, name);
+					ps.setString(15, f_h_name);
+					ps.setString(16, mobile_number);
+					ps.setString(17, dobVal); 
+					ps.setString(18, gender);
+					if (social_category != null) ps.setInt(19, social_category);
+					else ps.setNull(19, java.sql.Types.INTEGER);
+					if (diff_abled != null) ps.setBoolean(20, diff_abled);
+					else ps.setNull(20, java.sql.Types.BOOLEAN);
+					if (education_status != null) ps.setInt(21, education_status);
+					else ps.setNull(21, java.sql.Types.INTEGER);
+
+					if (marital_status != null) ps.setInt(22, marital_status);
+					else ps.setNull(22, java.sql.Types.INTEGER);
+
+					if (no_of_fam_mem != null) ps.setInt(23, no_of_fam_mem);
+					else ps.setNull(23, java.sql.Types.INTEGER);
+					if (are_any_fam_mem_invol_str != null) ps.setBoolean(24, are_any_fam_mem_invol_str);
+					else ps.setNull(24, java.sql.Types.BOOLEAN);
+					ps.setString(25, presentAddress);
+					ps.setString(26, present_district);
+					if (present_pincode != null) ps.setInt(27, present_pincode);
+					else ps.setNull(27, java.sql.Types.INTEGER);
+		            ps.setString(28, rationCardPath);
+		            ps.setString(29, aadharFrontPhotoPath);
+		            ps.setString(30, aadharBackPhotoPath);
+		            ps.setString(31, aadharNo);
+		            ps.setInt(32, isWeb);
+		            ps.setString(33, userId);
+					return ps;
+				}, keyHolder);
+				//return keyHolder.getKey().intValue();
+				if (result > 0) {
+		            int generatedId = keyHolder.getKey().intValue();
+		            String prefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+		            String refId = prefix + generatedId;
+
+		            String updateSql = " UPDATE vendor_details SET vendor_req_id = ? WHERE id = ? ";
+		            jdbcTemplate.update(updateSql,refId, generatedId);
+		            return refId;
+		        }
+		        //return "error";
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			return "error";
+		}
+	
+	 
+	 
+	 
+	 public String fileUpload(MultipartFile file, String name) {
+
+	        // Set the file path where you want to save it
+	        String uploadDirectory = environment.getProperty("file.upload.directory.mobile");
+	        String serviceFolderName = environment.getProperty("street_vendor_foldername");
+	        var year = DateTimeUtil.getCurrentYear();
+	        var month = DateTimeUtil.getCurrentMonth();
+
+	        uploadDirectory = uploadDirectory + serviceFolderName + "/" + year + "/" + month;
+
+	        try {
+	            // Create directory if it doesn't exist
+	            Path directoryPath = Paths.get(uploadDirectory);
+	            if (!Files.exists(directoryPath)) {
+	                Files.createDirectories(directoryPath);
+	            }
+
+	            // Datetime string
+	            String datetimetxt = DateTimeUtil.getCurrentDateTime();
+	           
+	            // File name
+	            String fileName = name + "_" + datetimetxt + "_" + file.getOriginalFilename();
+	            fileName = fileName.replaceAll("\\s+", ""); // Remove space on filename
+
+	            String filePath = uploadDirectory + "/" + fileName;
+
+	            String filepath_txt = "/" + serviceFolderName + "/" + year + "/" + month + "/" + fileName;
+
+	            // Create a new Path object
+	            Path path = Paths.get(filePath);
+
+	            // Get the bytes of the file
+	            byte[] bytes = file.getBytes();
+
+				/*
+				 * // Compress the image BufferedImage image = ImageIO.read(new
+				 * ByteArrayInputStream(bytes)); byte[] compressedBytes = compressImage(image,
+				 * 0.5f); // Compress with 50% quality
+				 * 
+				 * // Write the bytes to the file 
+				 * Files.write(path, compressedBytes);
+				 */
+	            
+	            Files.write(path, bytes);
+
+	            System.out.println(filePath);
+	            return filepath_txt;
+
+	        } catch (IOException e) {
+	            e.printStackTrace();
+	            return "Failed to save file " + file.getOriginalFilename();
+	        }
+	    }
+	 
+	 
+	 private byte[] compressImage(BufferedImage image, float quality) throws IOException {
+	        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+	        ImageOutputStream imageOutputStream = ImageIO.createImageOutputStream(byteArrayOutputStream);
+
+	        ImageWriter writer = ImageIO.getImageWritersByFormatName("jpg").next();
+	        writer.setOutput(imageOutputStream);
+
+	        ImageWriteParam param = writer.getDefaultWriteParam();
+	        if (param.canWriteCompressed()) {
+	            param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
+	            param.setCompressionQuality(quality);
+	        }
+
+	        writer.write(null, new javax.imageio.IIOImage(image, null, null), param);
+
+	        writer.dispose();
+	        imageOutputStream.close();
+
+	        return byteArrayOutputStream.toByteArray();
+	    }
+
+	 
+	 public static String generateRandomString() {
+	        StringBuilder result = new StringBuilder(STRING_LENGTH);
+	        for (int i = 0; i < STRING_LENGTH; i++) {
+	            result.append(CHARACTERS.charAt(RANDOM.nextInt(CHARACTERS.length())));
+	        }
+	        return result.toString();
+	    }
+
+
+	 
+	 
+	 public boolean isMobileRegistered(String mobilenumber) {
+	        String sql = "SELECT COUNT(*) FROM vendor_details WHERE mob_no = ?";
+	        Integer count = jdbcTemplate.queryForObject(sql, new Object[]{mobilenumber}, Integer.class);
+	        return count != null && count > 0;
+	    }
+	 
+	 public List<Map<String, Object>> getCommiteeDetailsWeb(String cby) {
+			String sql = "SELECT * "
+			 		+ "FROM vendor_details "
+			 		+ "WHERE is_web=1 AND cby=?";
+			return jdbcTemplate.queryForList(sql, cby);
+	     
+		}
+
+
+	public List<Map<String, Object>> getwebVendorDetailsByReqId(String requestId) {
+		
+		String sql="SELECT vd.*,em.education as education_name,mm.marital_status as marital_name,scm.category_name as category_name,vcm.vending_category_name as vending_category_name, "+
+				 "CONCAT(vd.present_address,',',vd.present_district) as residental_address, CONCAT(vd.vending_address,',',vending_district) as business_address, "+
+	             "CONCAT('" + fileBaseUrl + "/gccofficialapp/files', vd.bank_passbook) AS view_bank_passbook, " +
+	             "CONCAT('" + fileBaseUrl + "/gccofficialapp/files', vd.ration_card_photo) AS view_ration_card_photo, " +
+	             "CONCAT('" + fileBaseUrl + "/gccofficialapp/files', vd.street_vendor_photo) AS view_street_vendor_photo, " +
+	             "CONCAT('" + fileBaseUrl + "/gccofficialapp/files', vd.aadhar_front_photo) AS view_aadhar_front_photo, " +
+	             "CONCAT('" + fileBaseUrl + "/gccofficialapp/files', vd.aadhar_back_photo) AS view_aadhar_back_photo " +
+	             "FROM vendor_details vd "
+	             + "LEFT JOIN social_category_master scm on vd.social_category = scm.id "
+	             + "LEFT JOIN vending_category_master vcm ON vd.vending_category=vcm.id "
+	             + "LEFT JOIN education_master em on vd.education_status = em.id "
+	             + "LEFT JOIN marital_status_master mm on vd.marital_status = mm.id "
+	             + "WHERE vd.vendor_req_id = ?";
+		
+		return jdbcTemplate.queryForList(sql,requestId);
+	}
+
+
+	public String updateStreetVendorDetailsWeb(String latitude, String longitude, String zone, String ward,
+			String landmark, String vending_district, Integer vending_pincode, Integer vending_category,
+			String vending_space, Boolean pm_svanidhi_loan, Boolean bank_acc_status, String bankPassbookPath,
+			String streetVendorPhotoPath, String name, String f_h_name, String mobile_number, String dob, String gender,
+			Integer social_category, Boolean diff_abled, Integer education_status, Integer marital_status,
+			Integer no_of_fam_mem, Boolean are_any_fam_mem_invol_str, String presentAddress, String present_district,
+			Integer present_pincode, String rationCardPath, String aadharFrontPhotoPath, String aadharBackPhotoPath,
+			String aadharNo, String userId, String vendor_req_id) {
+
+
+		String latitudeVal = (latitude != null && !latitude.trim().isEmpty()) ? latitude : null;
+	 	String longitudeVal = (longitude != null && !longitude.trim().isEmpty()) ? longitude : null;
+	 	String zoneVal = (zone != null && !zone.trim().isEmpty()) ? zone : null;
+	 	String wardVal = (ward != null && !ward.trim().isEmpty()) ? ward : null;
+	 	String dobVal = (dob != null && !dob.trim().isEmpty()) ? dob : null;
+	 	String vendingAddressVal = (landmark != null && !landmark.trim().isEmpty()) ? landmark : null;
+	 	
+	 	String sql="UPDATE vendor_details SET "
+	 			+ "latitude =?,longitude=?,zone=?, ward=?, vending_address=?,vending_district=?, vending_pincode=?, vending_category=?, vending_space=?, pm_svanidhi_loan=?, "
+				+ "bank_acc_status=?, bank_passbook=?, street_vendor_photo=?, name=?, f_h_name=?, mob_no=?, "
+				+ "dob=?,gender=?,social_category=?, diff_abled=?, education_status=?, marital_status=?,no_of_fam_mem=?, "
+				+ "are_any_fam_mem_invol_str_ven=?,present_address=?, present_district=?, present_pincode=?, ration_card_photo=?, aadhar_front_photo=?, "
+				+ "aadhar_back_photo=?,aadhar_no=?,updated_date=NOW() "
+	 			+ " WHERE vendor_req_id = ? AND is_web=1 AND editable=1";
+		try {
+			int rows=jdbcTemplate.update(sql, latitudeVal, longitudeVal, zoneVal, wardVal, vendingAddressVal, vending_district,
+					vending_pincode, vending_category, vending_space, pm_svanidhi_loan, bank_acc_status, bankPassbookPath,
+					streetVendorPhotoPath, name, f_h_name, mobile_number, dobVal, gender, social_category, diff_abled,
+					education_status, marital_status, no_of_fam_mem, are_any_fam_mem_invol_str, presentAddress,
+					present_district, present_pincode, rationCardPath, aadharFrontPhotoPath, aadharBackPhotoPath, aadharNo,
+					vendor_req_id);
+			
+			if (rows==1) {
+				return "Success";
+			}
+			else {
+				return "Error";
+			}
+		}
+		catch (Exception e) {
+			e.printStackTrace();
+		}
+		return "error";
+	}
+
+
+	public String logEntry(String userId, String vendor_req_id) {
+		String sql="INSERT INTO vendor_details_web_log (name,f_h_name,gender,dob,social_category,diff_abled,mob_no,aadhar_no,present_address,present_district,present_pincode,vending_address,vending_district,vending_pincode,vending_category,vending_space,bank_acc_status,bank_passbook,ration_card_photo,street_vendor_photo,aadhar_front_photo,aadhar_back_photo,zone,ward,pm_svanidhi_loan,vendor_req_id,education_status,marital_status,no_of_fam_mem,are_any_fam_mem_invol_str_ven,latitude,longitude,cby) "
+				+ " SELECT name,f_h_name,gender,dob,social_category,diff_abled,mob_no,aadhar_no,present_address,present_district,present_pincode,vending_address,vending_district,vending_pincode,vending_category,vending_space,bank_acc_status,bank_passbook,ration_card_photo,street_vendor_photo,aadhar_front_photo,aadhar_back_photo,zone,ward,pm_svanidhi_loan,vendor_req_id,education_status,marital_status,no_of_fam_mem,are_any_fam_mem_invol_str_ven,latitude,longitude,? FROM vendor_details WHERE vendor_req_id=?";
+		
+		try {
+			jdbcTemplate.update(sql, userId,vendor_req_id);
+			return "success";
+			
+		} catch (DataAccessException e) {
+			e.printStackTrace();
+			return "failure";
+			
+		}
+	}
+
+}
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/vendor/service/createventService.java b/src/main/java/in/gov/chennaicorporation/gccoffice/vendor/service/createventService.java
new file mode 100644
index 0000000..b2bf294
--- /dev/null
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/vendor/service/createventService.java
@@ -0,0 +1,167 @@
+package in.gov.chennaicorporation.gccoffice.vendor.service;
+
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.sql.PreparedStatement;
+import java.sql.Statement;
+import java.time.LocalDate;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+@Service
+public class createventService {
+	
+private JdbcTemplate jdbcTemplate;
+	
+	@Autowired
+	public void setDataSource(@Qualifier("mysqlVendingCommitteDataSource") DataSource dataSource) {
+		this.jdbcTemplate = new JdbcTemplate(dataSource);
+	}
+
+	public boolean isFileExists(String originalFilename) {
+	    String sql = "SELECT COUNT(*) FROM vendingcommitte.create_event " +
+	                 "WHERE file_url LIKE ?";
+	    String filenamePattern = "%" + originalFilename; // Match filename at the end of the path
+	    Integer count = jdbcTemplate.queryForObject(sql, Integer.class, filenamePattern);
+	    return count != null && count > 0;
+	}
+	
+	public void insertEvent(String eventName, LocalDate eventDate, String fileUrl) {
+	    String sql = "INSERT INTO vendingcommitte.create_event (event_name, event_date, file_url) VALUES (?, ?, ?)";
+	    jdbcTemplate.update(sql, eventName, eventDate, fileUrl);
+	}
+	
+	//SELECT * FROM vendingcommitte.create_event
+	public List<Map<String, Object>> ViewDropdownEvent() {
+	    String sql = "SELECT * FROM create_event";
+	    return jdbcTemplate.queryForList(sql);
+	}
+	
+	public List<Map<String, Object>> ViewCommitteeDropdownEvent() {
+	    String sql = "SELECT distinct rl.event_req_id as event_req_id,ce.event_name as event_name,ce.event_date as event_date "
+	    		+ "FROM vendor_request_list rl "
+	    		+ "JOIN create_event ce ON ce.req_id=rl.event_req_id";
+	    return jdbcTemplate.queryForList(sql);
+	}
+
+	public ResponseEntity<Map<String, Object>> saveVendorDetails(Map<String, Object> payload) {
+		
+		Map<String, Object> response = new HashMap<>();
+		
+		String vendor_req_id = (String) payload.get("vendor_req_id");
+		String name = (String) payload.get("name");
+		String mob_no= (String) payload.get("mob_no");
+		String business_address= (String) payload.get("business_address");
+		String vending_pincode= (String) payload.get("vending_pincode");
+		String status = (String) payload.get("status");
+		final String remarks = (payload.get("remarks") == null || ((String) payload.get("remarks")).trim().isEmpty())
+		        ? "-"
+		        : (String) payload.get("remarks");
+		int event_req_id = Integer.parseInt((String) payload.get("event_req_id"));
+				
+		//System.out.println("values="+vendor_req_id+name+mob_no+business_address+vending_pincode+status+remarks+event_req_id);
+		
+		String sql = "INSERT INTO vendor_request_list (request_no,person_name, mobile_no, address, status, remarks, pincode,event_req_id) " +
+                "VALUES (?, ?, ?, ?, ?, ?,?,?)";
+		
+		try {
+	        int rows = jdbcTemplate.update(connection -> {
+	            PreparedStatement ps = connection.prepareStatement(sql);
+	            ps.setString(1, vendor_req_id);
+	            ps.setString(2, name);
+	            ps.setString(3, mob_no);
+	            ps.setString(4, business_address);
+	            ps.setString(5, status);
+	            ps.setString(6, remarks);
+	            ps.setString(7, vending_pincode);
+	            ps.setInt(8, event_req_id);
+	            return ps;
+	        });
+	        	        	        
+	        
+	        if(rows > 0) {
+	        	String result=sendWhatsappMsg(mob_no,status,vendor_req_id);
+	        	
+	        	if("200".equalsIgnoreCase(result)) {
+	        		response.put("status", "success");
+	        		response.put("message", "Data submitted successfully!");
+	        		
+	        	}
+	        	else {
+	        		response.put("status", "success");
+	        		response.put("message", "Data Submitted But Whatsapp Message not Sent");
+	        		
+	        	}
+	        }
+	        else {
+	        	response.put("status", "Error");
+        		response.put("message", "Error in saving Vendor Details");
+	        }
+	        return ResponseEntity.ok(response);  
+	        
+	    } catch (Exception e) {
+	        e.printStackTrace(); // Log the exception
+	        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+	                .body(Map.of("status", "Error", "message", "Error fetching to save vendor details: " + e.getMessage()));
+	    }
+	}
+
+	private String sendWhatsappMsg(String mob_no, String status,String vendor_req_id) {
+		String urlString="";
+		
+		if("Approved".equals(status)) {
+		 urlString="https://media.smsgupshup.com/GatewayAPI/rest?userid=2000233507&password=h2YjFNcJ&send_to="+mob_no+"&v=1.1&format=json&msg_type=TEXT&method=SENDMESSAGE&msg=You+are+recognized+as+a+roadside+vendor.+Registration+number%3A+"+vendor_req_id+".&isTemplate=true&footer=GCC+-+IT+Cell";
+		}
+		else {
+			urlString="https://media.smsgupshup.com/GatewayAPI/rest?userid=2000233507&password=h2YjFNcJ&send_to="+mob_no+"&v=1.1&format=json&msg_type=TEXT&method=SENDMESSAGE&msg=Your+application+is+rejected+because+your+roadside+vendor+details+are+incorrect.+%0A%0ARegistration+Number%3A+"+vendor_req_id+".";
+		}
+	
+		String res=hitURL(urlString);
+		return res;
+	}
+
+	private String hitURL(String urlString) {
+		String response = "";
+		try {
+            URL url = new URL(urlString);
+            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+            connection.setRequestMethod("GET");
+
+            int responseCode = connection.getResponseCode();
+            response = String.valueOf(responseCode);
+            System.out.println("Response Code for URL: " + urlString + " is " + responseCode);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+		System.out.println("response="+response);
+		return response;
+	}
+
+	public List<Map<String, Object>> getCommiteeDetails(String event_req_id) {
+		 String sql = "SELECT * "
+		 		+ "FROM vendor_request_list "
+		 		+ "WHERE event_req_id=? ";
+		    return jdbcTemplate.queryForList(sql,event_req_id);
+	}
+
+	public List<String> removeSavedVendorDetails() {
+		
+		String sql="SELECT request_no FROM vendor_request_list";
+		
+		return jdbcTemplate.queryForList(sql,String.class);
+	}
+
+	
+
+}
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/vtrack/service/VehicleService.java b/src/main/java/in/gov/chennaicorporation/gccoffice/vtrack/service/VehicleService.java
index 3766624..691d900 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/vtrack/service/VehicleService.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/vtrack/service/VehicleService.java
@@ -366,6 +366,52 @@ public class VehicleService {
     	        		+ "&media_url="+fileURL
     	        		+ "&isTemplate=true&footer=GCC+-+IT+Cell";
     	        break;
+    	        
+    	    case "11":
+    	        System.out.println("TempID is 11 (Still Catch Pit -> 1566758 - silt_catch_pit_cleaning )");
+    	        urlString="https://media.smsgupshup.com/GatewayAPI/rest?"
+    	        		+ "userid="+username
+    	        		+ "&password="+password
+    	        		+ "&send_to="+sendTo
+    	        		+ "&v=1.1&format=json"
+    	        		+ "&msg_type=IMAGE"
+    	        		+ "&method=SENDMEDIAMESSAGE"
+    	        		+ "&caption=%2AGCC+Silt+catch+Pit+Cleaning%2A%0A%0AToday%27s+%28"+msgDate+"%29+Zone+wise+Silt+Catch+Pit+cleaning+details+shared+above+for+your+reference%0A%0AFor+more+details%2C+please+click+the+link+below."
+    	        		+ "&media_url="+fileURL
+    	        		+ "&isTemplate=true&footer=GCC+-+IT+Cell";
+    	        break;
+    	        
+    	    case "12":
+    	        System.out.println("TempID is 12 (1590940 - tree_planting_gcc - IMAGE - STATIC)");
+    	        urlString="https://media.smsgupshup.com/GatewayAPI/rest?"
+    	        		+ "userid="+username
+    	        		+ "&password="+password
+    	        		+ "&send_to="+sendTo
+    	        		+ "&v=1.1&format=json"
+    	        		+ "&msg_type=IMAGE"
+    	        		+ "&method=SENDMEDIAMESSAGE"
+    	        		+ "&caption=%2AGCC+Tree+Planting%2A%0A%0AToday%27s+%28"+msgDate+"%29+Zone+wise+tree+planting+details+shared+above+for+your+reference%0A%0AFor+more+details%2C+please+click+the+link+below."
+    	        		+ "&media_url="+fileURL
+    	        		+ "&isTemplate=true&footer=GCC+-+IT+Cell";
+    	        break;
+    	        
+    	    case "13":
+    	        System.out.println("TempID is 13 (1590940 - Chennai Schools (userd of Com Temp ) - IMAGE - STATIC)");
+    	        urlString="https://media.smsgupshup.com/GatewayAPI/rest?"
+    	        		+ "userid="+username
+    	        		+ "&password="+password
+    	        		+ "&send_to="+sendTo
+    	        		+ "&v=1.1&format=json"
+    	        		+ "&msg_type=IMAGE"
+    	        		+ "&method=SENDMEDIAMESSAGE"
+    	        		//+ "&caption=%2AGCC+The+Chennai+School%2A%0A%0AToday%27s+%28"+msgDate+"%29+Zone+wise+Students+Aadhar+linked+details+shared+above+for+your+reference.%0A%0AFor+more+details%2C+please+click+the+link+below."
+    	        		+ "&caption=%2AGCC+The+Chennai+School%2A%0A%0AToday%27s+%28"+msgDate+"%29+Zone+wise+Students+Aadhar+linked+details+shared+above+for+your+reference.%0A%0AFor+more+details%2C+please+click+the+link+below."
+    	        		+ "&media_url="+fileURL
+    	        		+ "&isTemplate=true&footer=GCC+-+IT+Cell";
+    	        
+    	        
+    	        break;
+    	        
     	    default:
     	        System.out.println("TempID ("+tempid+") is unknown");
     	}
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/works/service/ERPEstimateService.java b/src/main/java/in/gov/chennaicorporation/gccoffice/works/service/ERPEstimateService.java
index 31535c7..36e1de4 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/works/service/ERPEstimateService.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/works/service/ERPEstimateService.java
@@ -255,21 +255,22 @@ public class ERPEstimateService {
         //////////////////////
         
         String accessData = getUserAccess(loginId);
-    	String where="";
+    	
+        String where="ew.`nonerp`=0 ";
     	
     	// Split the string using "_"
         String[] parts = accessData.split("_");
         
     	if(!parts[0].equals("all")) {
-    		where =" ew.`ward` IN ("+parts[0]+") ";
+    		where = where + " AND ew.`ward` IN ("+parts[0]+") ";
     	}
     	if(!parts[1].equals("all")) {
     		if(!where.equals(""))
     		{
-    			where = where + "AND `dm`.`dept_name` IN ("+getDepartmentName(parts[1])+")";
+    			where = where + " AND `dm`.`dept_name` IN ("+getDepartmentName(parts[1])+")";
     		}
     		else {
-    			where = where + "`dm`.`dept_name` IN ("+getDepartmentName(parts[1])+")";
+    			where = where + " AND`dm`.`dept_name` IN ("+getDepartmentName(parts[1])+")";
     		}
     	}
     	
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/works/service/EstimateService.java b/src/main/java/in/gov/chennaicorporation/gccoffice/works/service/EstimateService.java
index 63eb477..5301974 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/works/service/EstimateService.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/works/service/EstimateService.java
@@ -304,21 +304,21 @@ public class EstimateService {
     public List<Map<String, Object>> getAllERPWorks(String loginId) {
     	
         String accessData = getUserAccess(loginId);
-    	String where="";
+    	String where="ew.`nonerp`=0 ";
     	
     	// Split the string using "_"
         String[] parts = accessData.split("_");
         
     	if(!parts[0].equals("all")) {
-    		where =" ew.`ward` IN ("+parts[0]+") ";
+    		where =" AND ew.`ward` IN ("+parts[0]+") ";
     	}
     	if(!parts[1].equals("all")) {
     		if(!where.equals(""))
     		{
-    			where = where + "AND ew.`department` IN ("+parts[1]+")";
+    			where = where + " AND ew.`department` IN ("+parts[1]+")";
     		}
     		else {
-    			where = where + "ew.`department` IN ("+parts[1]+")";
+    			where = where + " AND ew.`department` IN ("+parts[1]+")";
     		}
     	}
     	
diff --git a/src/main/resources/.DS_Store b/src/main/resources/.DS_Store
index 4ed772d..7e1a9bc 100644
Binary files a/src/main/resources/.DS_Store and b/src/main/resources/.DS_Store differ
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 7b0618d..2456bed 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -52,6 +52,8 @@ server.servlet.session.tracking-modes=COOKIE
 
 file.upload.directory=${user.dir}/gccoffice_uploads/
 
+file.upload.directory.mobile=${user.dir}/gcc_mobile_service_uploads/
+
 server.address=0.0.0.0
 
 server.servlet.session.timeout=-1
@@ -111,3 +113,7 @@ minutes_files = gcc_minutes_files_uploads
 #/////////// For Vtrack (jtrack) -> WhatsApp Msg ////////////
 vtrack_foldername = gcc_vtrack_uploads
 
+education.foldername = school_aadhar_uploads
+
+street_vendor_foldername=street_vendor_files
+
diff --git a/src/main/resources/static/.DS_Store b/src/main/resources/static/.DS_Store
index 300989b..2346803 100644
Binary files a/src/main/resources/static/.DS_Store and b/src/main/resources/static/.DS_Store differ
diff --git a/src/main/resources/static/assets/node_modules/.DS_Store b/src/main/resources/static/assets/node_modules/.DS_Store
index efca971..9708921 100644
Binary files a/src/main/resources/static/assets/node_modules/.DS_Store and b/src/main/resources/static/assets/node_modules/.DS_Store differ
diff --git a/src/main/resources/static/assets/node_modules/ammap3/.DS_Store b/src/main/resources/static/assets/node_modules/ammap3/.DS_Store
new file mode 100644
index 0000000..3141ffc
Binary files /dev/null and b/src/main/resources/static/assets/node_modules/ammap3/.DS_Store differ
diff --git a/src/main/resources/static/assets/node_modules/ammap3/ammap/.DS_Store b/src/main/resources/static/assets/node_modules/ammap3/ammap/.DS_Store
new file mode 100644
index 0000000..7c3cc39
Binary files /dev/null and b/src/main/resources/static/assets/node_modules/ammap3/ammap/.DS_Store differ
diff --git a/src/main/resources/templates/.DS_Store b/src/main/resources/templates/.DS_Store
index a9650f9..d1b6c93 100644
Binary files a/src/main/resources/templates/.DS_Store and b/src/main/resources/templates/.DS_Store differ
diff --git a/src/main/resources/templates/fragments/.DS_Store b/src/main/resources/templates/fragments/.DS_Store
index 5e9cf7b..03905e0 100644
Binary files a/src/main/resources/templates/fragments/.DS_Store and b/src/main/resources/templates/fragments/.DS_Store differ
diff --git a/src/main/resources/templates/fragments/modules/.DS_Store b/src/main/resources/templates/fragments/modules/.DS_Store
index cd0444c..bd28d0e 100644
Binary files a/src/main/resources/templates/fragments/modules/.DS_Store and b/src/main/resources/templates/fragments/modules/.DS_Store differ
diff --git a/src/main/resources/templates/fragments/modules/com_petition/petition_view_script.html b/src/main/resources/templates/fragments/modules/com_petition/petition_view_script.html
index 89c4507..be2c590 100644
--- a/src/main/resources/templates/fragments/modules/com_petition/petition_view_script.html
+++ b/src/main/resources/templates/fragments/modules/com_petition/petition_view_script.html
@@ -69,6 +69,7 @@
 					$("#petitioner_pincode_value").html(petitionDetails[0].petitioner_pincode);
 					
 					$("#complaint_with_maping_value").html(petitionDetails[0].complaint_nature);
+					$("#remarks_with_value").html(petitionDetails[0].remarks);
 					
 					var petition_status = petitionDetails[0].status
 					
diff --git a/src/main/resources/templates/modules/.DS_Store b/src/main/resources/templates/modules/.DS_Store
index 6b8d902..589bb38 100644
Binary files a/src/main/resources/templates/modules/.DS_Store and b/src/main/resources/templates/modules/.DS_Store differ
diff --git a/src/main/resources/templates/modules/callcenter/assignagents.html b/src/main/resources/templates/modules/callcenter/assignagents.html
deleted file mode 100644
index 720fce7..0000000
--- a/src/main/resources/templates/modules/callcenter/assignagents.html
+++ /dev/null
@@ -1,692 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}">
- <style>
-         
-    </style>
-</head>
-<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-8">
-                                <div class="page-header-title">
-                                    <i class="fas fa-user-graduate bg-blue"></i>
-                                    <div class="d-inline">
-                                        <h5>Assign Agents</h5>
-                                        <span>1913 Assign agents for Campaign</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="/index"><i class="ik ik-home"></i></a>
-                                        </li>
-                                        <li class="breadcrumb-item">1913 Campaign</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Assign Agents</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-
-                 <hr>
-                 
-
-                  
-					  <!-- Card for Agent Assignment -->
-					  <div class="card">
-					    <div class="card-header">
-					      <h3>Agent Assign</h3>
-					    </div>
-					    <div class="card-body">
-					    
-					      <!-- Dropdown for Category -->
-					      <div class="row">
-						      <div class="form-group col-md-6 col-sm-12">
-						        <label for="category">Category</label>
-						        <select id="category" class="form-control">
-						          
-						        </select>
-						      </div>
-					
-						      <!-- Dropdown for Campaigns -->
-						      <div class="form-group col-md-6 col-sm-12">
-						        <label for="campaign">Campaign</label>
-						        <select id="campaign" class="form-control" disabled>						          
-						        </select>
-						      </div>
-						      
-						      
-						      <div class="form-group col-12 d-flex justify-content-center align-items-center">
-							        <!-- Centered button between the dropdowns -->
-							        <button id="searchBtn" class="btn btn-primary">Search</button>
-							        <button id="resetBtn" class="btn btn-secondary ml-3">Reset</button>
-							   </div>
-					     </div>
-					     
-					    </div>
-					  </div>
-					
-					  <!-- Card for Campaign Details -->
-					  <div class="card mt-3" id="campaignDetailsCard" style="display:none;">
-						    <div class="card-header">
-						      <h3>Campaign Details</h3>
-						    </div>
-						    
-						  				    
-					    <div class="card-body">
-					    
-						    <table class="table table-bordered">
-							  <tbody>
-							    <tr>
-							      <th >Name</th>
-							      <td class="fw-semibold" id="campaignName" style="padding: 0.45rem 0.45rem;"></td>
-							    </tr>
-							    <tr>
-							      <th>From Date</th>
-							      <td class="fw-semibold" id="campaignStartdate" style="padding: 0.45rem 0.45rem;"></td>
-							    </tr>
-							    <tr>
-							      <th>To Date</th>
-							      <td class="fw-semibold" id="campaignEnddate" style="padding: 0.45rem 0.45rem;"></td>
-							    </tr>
-							    <tr>
-							      <th>Agents Assigned</th>
-							      <td class="fw-semibold" id="campaignAgents" style="padding: 0.45rem 0.45rem;"></td>
-							    </tr>
-							    <tr>
-							      <th>Calls Assigned (per person)</th>
-							      <td class="fw-semibold" id="campaignCalls" style="padding: 0.45rem 0.45rem;"></td>
-							    </tr>
-							    <tr>
-							      <th>Description</th>
-							      <td class="fw-semibold" id="campaignDesc" style="padding: 0.45rem 0.45rem;"></td>
-							    </tr>
-							  </tbody>
-							</table>
-					    
-					    </div>
-					 </div>
-					  
-					  
-					  <div class="row" id="editagentCard" style="display:none;">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-                                    <div class="page-header-title" >
-										<h5 style="margin: 0;font-weight: bold;">Selected Agent List</h5><hr>
-								   </div> 
-										<table id="editagentsDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" >
-											    <thead class="thead-dark">
-											        <tr role="row">
-											            <th class="text-center no-sort" width="1%">S.No</th>
-											            <th class="text-center">Agent Id</th>
-											            <th class="text-center">Name of Agents</th>
-											            <th class="text-center">Select/Not Selected</th>
-											        </tr>
-											    </thead>
-											    <tbody id="editagentList" style="text-align:center;">
-											        <!-- Rows will be dynamically inserted here -->
-											    </tbody>
-											</table>
-                                            
-                                        </div>
-                                      
-                                    </div>
-                                     
-                                </div>
-                            </div>
-					  
-					  
-					  
-					  <div class="row" id="agentCard" style="display:none;">
-                            <div class="col-md-12">
-                                <div class="card">
-                                    
-                                    <div class="card-block">
-                                    <div class="page-header-title" >
-										<h5 style="margin: 0;font-weight: bold;">Overall Agent List</h5><hr>
-								   </div> 
-	                                          <div class=" d-flex justify-content-end mb-2">
-	                                          
-	                                          		<button class="btn btn-primary" id="selectedCount"><i class="ik ik-user-plus f-16 mr-2"></i>0</button>
-												    <!-- <button class="btn btn-warning ml-2" id="editAgentsBtn"><i class="ik ik-edit f-16 mr-2"></i>Edit</button> -->
-												    
-												  </div>
-												  												  
-											<table id="agentsDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" >
-											    <thead class="thead-dark">
-											        <tr role="row">
-											            <th class="text-center no-sort" width="1%">S.No</th>
-											            <th class="text-center">Agent Id</th>
-											            <th class="text-center">Name of Agents</th>
-											            <th class="text-center"><input type="checkbox" id="selectAllAgents"> Select All</th>
-											        </tr>
-											    </thead>
-											    <tbody id="agentList" style="text-align:center;">
-											        <!-- Rows will be dynamically inserted here -->
-											    </tbody>
-											</table>
-                                              <!-- Center the Submit button -->
-												    <div class="text-center">
-												      <button type="submit" class="btn btn-primary" id="submitBtn">Submit</button>
-												    </div>
-                                            
-                                        </div>
-                                      
-                                    </div>
-                                     
-                                </div>
-                            </div>
-                            
-                            
-                            
-                        
-					
-					  
-				
-					  
-					</div>
-
-
-
-             
-        </div>
-   
-     <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-      </div>
-</div>
-
-   
-    <!-- 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">
-
-    // Fetch category dropdown on page load
-    fetchCategoryDropdown();
-
-	    // Handle category change event to fetch campaigns
-	    $(document).on('change', '#category', function() {
-	    let selectedCategoryId = $(this).val();
-	    if (selectedCategoryId != '0') {
-	        fetchCampaignDropdown(selectedCategoryId);
-	    } else {
-	        $('#campaign').empty().prop('disabled', true);
-	    }
-	});
-   
-
-
-$("#searchBtn").click(function () {
-	let selectedCampaignId = $('#campaign').val();
-	
-	
-    if(selectedCampaignId == null || selectedCampaignId=='0'){
-    	 Swal.fire({
-             title: 'Info!',
-             text: 'Please Select Category and Campaign!',
-             icon: 'info',
-             timer: 2000,
-             //timerProgressBar: true,
-             showConfirmButton: false
-         })
-         hideCampaignAndAgentDetails();
-    }
-    else if (selectedCampaignId != '0') {
-        fetchCampaignDetails(selectedCampaignId);
-        checkCampaignInAssigned(selectedCampaignId);
-        
-     // Disable the category and campaign dropdowns after search
-        $('#category').prop('disabled', true);
-        $('#campaign').prop('disabled', true);
-    } 
-    else {
-    	
-        hideCampaignAndAgentDetails();
-        
-    }
-});
-
-
-
-//Approve button click event
-$("#submitBtn").click(function () {
-    handleSubmit();
-});
-
-$("#resetBtn").click(function () {
-    location.reload(); // Reloads the current page
-});
-
-
-// Initial binding for checkbox events
-bindCheckboxEvents();
-
-// Function to fetch category dropdown
-function fetchCategoryDropdown() {
-    $.ajax({
-        url: '/gcc/api/callcenter/admin/getcategory',
-        type: 'GET',
-        dataType: 'json'
-    })
-    .done(function (data) {
-        let categoryDropdown = $('#category');
-        categoryDropdown.empty();
-        categoryDropdown.append($('<option selected value="0"></option>').text('Select a category'));
-        $.each(data, function (index, category) {
-            categoryDropdown.append($('<option></option>').attr('value', category.category_id).text(category.category_name));
-        });
-    })
-    .fail(function (xhr, status, error) {
-        console.error('Error fetching category:', error);
-    });
-}
-
-// Function to fetch campaigns based on selected category
-function fetchCampaignDropdown(categoryId) {
-    $('#campaign').prop('disabled', false);
-    $.ajax({
-        url: '/gcc/api/callcenter/admin/getcampaignbycategory?id=' + categoryId,
-        type: 'GET',
-        dataType: 'json'
-    })
-    .done(function (data) {
-        let campaignDropdown = $('#campaign');
-        campaignDropdown.empty();
-        campaignDropdown.append($('<option selected value="0"></option>').text('Select a campaign'));
-        $.each(data, function (index, campaign) {
-            campaignDropdown.append($('<option></option>').attr('value', campaign.campaign_id).text(campaign.campaign_name));
-        });
-    })
-    .fail(function (xhr, status, error) {
-        console.error('Error fetching campaign:', error);
-    });
-}
-
-// Function to fetch campaign details
-function fetchCampaignDetails(campaignId) {
-    $.ajax({
-        url: '/gcc/api/callcenter/admin/getcampaignbyid?id=' + campaignId,
-        method: 'GET',
-        dataType: 'json',
-        success: function (response) {
-            if (response.length === 0) {
-                console.error("No campaign details found.");
-                return;
-            }
-
-            document.getElementById("campaignName").innerHTML = response[0].campaign_name;
-            document.getElementById("campaignStartdate").innerHTML = response[0].start_date;
-            document.getElementById("campaignEnddate").innerHTML = response[0].end_date;
-            document.getElementById("campaignAgents").innerHTML = response[0].no_of_agents;
-            document.getElementById("campaignCalls").innerHTML = response[0].calls_per_agent;
-            document.getElementById("campaignDesc").innerHTML = response[0].description;
-
-            // Show the campaign details card
-            document.getElementById('campaignDetailsCard').style.display = 'block';
-        },
-        error: function () {
-            console.error("An error occurred while fetching campaign details.");
-        }
-    });
-}
-
-// Function to check if campaign is already assigned and fetch agents
-function checkCampaignInAssigned(selectedCampaignId) {
-		
-    $.ajax({
-        url: '/gcc/api/callcenter/admin/getassignedcampaign?id=' + selectedCampaignId,
-        type: 'GET',
-        dataType: 'json',
-        success: function(response) {
-        	//console.log('checkCampaignInAssigned response:', response);
-            fetchAgentsForCampaign(selectedCampaignId); // Always fetch agents
-
-            if (response.length > 0) {
-                populateEditAgentList(response);
-                document.getElementById('editagentCard').style.display = 'block';
-                initializeEditAgentsDataTable();
-            }
-            else{
-            	document.getElementById('editagentCard').style.display = 'none';
-            }
-        },
-        error: function(xhr, status, error) {
-            console.error('Error fetching assigned agents:', error);
-        }
-    });
-}
-
-
-// Function to populate the edit agent list
-function populateEditAgentList(agents) {
-    let editagentList = $('#editagentList');
-    editagentList.empty();
-    
-    $.each(agents, function(index, agent) {
-    	 
-         
-    	let row = `
-    	    <tr data-assigned-id="${agent.assigned_id}">
-    	        <td>${index + 1}</td>
-    	        <td>${agent.agent_id}</td>
-    	        <td>${agent.agent_name}</td>
-    	        <td>
-    	            <button class="btn btn-warning" onclick="editagent(${agent.assigned_id})">Remove</button>
-    	        </td>            
-    	    </tr>
-    	`;
-        // Log the row HTML to debug
-       // console.log('Appending row:', row);
-        
-        editagentList.append(row);
-    });
-}
-
-function editagent(assignedId) {
-    
-        $.ajax({
-            url: '/gcc/api/callcenter/admin/deleteassignedbyid?id=' + assignedId,
-            type: 'GET',
-            dataType: 'json',
-            success: function(response) {
-            	$('tr[data-assigned-id="' + assignedId + '"]').remove();
-                Swal.fire({
-                    title: 'Success!',
-                    text: 'Agents have been removed!',
-                    icon: 'success',
-                    timer: 2000,
-                    //timerProgressBar: true,
-                    showConfirmButton: false
-                })
-            },
-            error: function(xhr, status, error) {
-                console.error('Error removing agents:', error);
-                reject(error); // Reject the promise in case of an error
-            }
-        });
-   
-}
-
-
-
-// Function to fetch agents for the selected campaign
-function fetchAgentsForCampaign(campaignId) {
-    $.ajax({
-        url: '/gcc/api/callcenter/admin/getagentsfortask?id=' +campaignId,
-        type: 'GET',
-        dataType: 'json',
-        success: function(response) {
-            let agentList = $('#agentList');
-            agentList.empty();
-
-            if (response.length > 0) {
-                $.each(response, function(index, agent) {
-                    let row = `
-                        <tr>
-                            <td>${index + 1}</td>
-                            <td>${agent.agent_id}</td>
-                            <td>${agent.agent_name}</td>
-                            <td><input type="checkbox" class="agentCheckbox" value="${agent.agent_id}"></td>
-                        </tr>
-                    `;
-                    agentList.append(row);
-                });
-
-                document.getElementById('agentCard').style.display = 'block';
-                initializeAgentsDataTable();
-            } else {
-                agentList.append('<tr><td colspan="4">No agents available</td></tr>');
-            }
-
-            bindCheckboxEvents(); // Rebind checkbox events after adding new checkboxes
-        },
-        error: function(xhr, status, error) {
-            console.error('Error fetching agents:', error);
-        }
-    });
-}
-
-// Function to hide campaign and agent details
-function hideCampaignAndAgentDetails() {
-    document.getElementById('campaignDetailsCard').style.display = 'none';
-    document.getElementById('agentCard').style.display = 'none';
-    document.getElementById('editagentCard').style.display = 'none';
-}
-
-// Function to bind checkbox events and handle "Select All" functionality
-function bindCheckboxEvents() {
-    $('#selectAllAgents').on('click', function() {
-        let campaignAgentsCount = parseInt($('#campaignAgents').text(), 10);
-        let totalCheckboxes = $('.agentCheckbox').length;
-
-        if ($(this).is(':checked')) {
-            if (campaignAgentsCount > totalCheckboxes) {
-                Swal.fire({
-                    title: 'Sorry!',
-                    text: 'You cannot select more checkboxes than available.',
-                    icon: 'error',
-                    timer: 2000
-                }).then(() => {
-                    $('#selectAllAgents').prop('checked', false);
-                });
-            } else {
-                let checkboxes = $('.agentCheckbox');
-                checkboxes.prop('checked', false);
-                for (let i = 0; i < campaignAgentsCount; i++) {
-                    if (checkboxes[i]) {
-                        $(checkboxes[i]).prop('checked', true);
-                    }
-                }
-            }
-        } else {
-            $('.agentCheckbox').prop('checked', false);
-        }
-
-        updateSelectedCount();
-    });
-
-    $(document).on('change', '.agentCheckbox', function () {
-        if ($('.agentCheckbox:checked').length === $('.agentCheckbox').length) {
-            $('#selectAllAgents').prop('checked', true);
-        } else {
-            $('#selectAllAgents').prop('checked', false);
-        }
-
-        updateSelectedCount();
-    });
-}
-
-// Function to update the selected count
-function updateSelectedCount() {
-    let selectedCount = $('.agentCheckbox:checked').length;
-    $('#selectedCount').html('<i class="ik ik-user-plus f-16 mr-2"></i>' + selectedCount);
-}
-
-// Function to handle form submission and assign agents
-function handleSubmit() {
-
-    let selectedCategoryId = $('#category').val();
-    let selectedCampaignId = $('#campaign').val();
-    let campaignAgentsCount = parseInt($('#campaignAgents').text(), 10); // Get the required agent count
-    let assignedAgentCount = $('#editagentList tr').length; // Count already assigned agents
-
-    // Ensure category and campaign are selected
-    if (selectedCategoryId == 0 || selectedCampaignId == 0) {
-        Swal.fire({
-            title: 'Info!',
-            text: 'Please select a category and campaign before proceeding.',
-            icon: 'info',
-            timer: 2000,
-            timerProgressBar: true
-        });
-        return;
-    }
-
-    let selectedAgentsCount = $(".agentCheckbox:checked").length; // Count of selected checkboxes
-
-    // Total agent count (new selections + already assigned)
-    let totalSelectedCount = selectedAgentsCount + assignedAgentCount;
-
-    // Validation: Check if total selected count matches the campaignAgentsCount
-    if (totalSelectedCount < campaignAgentsCount) {
-        Swal.fire({
-            title: 'Error!',
-            text: `You need to select ${campaignAgentsCount - totalSelectedCount} more agents to meet the required count.`,
-            icon: 'error',
-            timer: 3000,
-            timerProgressBar: true
-        });
-        return;
-    } else if (totalSelectedCount > campaignAgentsCount) {
-        Swal.fire({
-            title: 'Error!',
-            text: `You have selected more agents than allowed. Please reduce the number of selected agents.`,
-            icon: 'error',
-            timer: 3000,
-            timerProgressBar: true
-        });
-        return;
-    }
-
-    let requestData = [];
-    $(".agentCheckbox:checked").each(function () {
-        requestData.push({
-            categoryId: parseInt(selectedCategoryId),
-            campaignId: parseInt(selectedCampaignId),
-            agentId: parseInt($(this).val())
-        });
-    });
-
-    if (requestData.length === 0) {
-        Swal.fire({
-            title: 'Info!',
-            text: 'Please select at least one agent to assign.',
-            icon: 'info',
-            timer: 3000,
-            timerProgressBar: true
-        });
-        return;
-    }
-
-    // AJAX request to submit the data
-    $.ajax({
-        url: "/gcc/api/callcenter/admin/addagentsfortask",
-        type: "POST",
-        contentType: "application/json",
-        data: JSON.stringify(requestData),
-        success: function (response) {
-            Swal.fire({
-                title: 'Success!',
-                text: 'Agents have been successfully assigned!',
-                icon: 'success',
-                timer: 2000,
-                timerProgressBar: true,
-                showConfirmButton: false
-            }).then(() => {
-                location.reload(); // Reload after success
-            });
-        },
-        error: function (xhr, status, error) {
-            Swal.fire({
-                title: 'Error!',
-                text: 'There was an error while assigning agents.',
-                icon: 'error',
-                timer: 3000,
-                timerProgressBar: true
-            });
-        }
-    });
-}
-
-
-
-
-//Initialize the first table: agentsDatatable
-function initializeAgentsDataTable() {
-    if (!$.fn.DataTable.isDataTable('#agentsDatatable')) {
-        $('#agentsDatatable').DataTable({
-            dom: 'Bftip',
-            columnDefs: [{ targets: 'no-sort', orderable: false }],
-            lengthMenu: [
-                [50, 100, 200, 500, -1],
-                ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-            ],
-            scrollY: '30vh',
-            fixedColumns: { left: 1, right: 1 },
-            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' }
-            ],
-            fixedHeader: true,
-            autoWidth: true,
-            responsive: true,
-            searching: true,
-            select: false,
-            processing: false
-        });
-    } else {
-        $('#agentsDatatable').DataTable().clear().draw();
-    }
-}
-
-// Initialize the second table: editagentsDatatable
-function initializeEditAgentsDataTable() {
-    if (!$.fn.DataTable.isDataTable('#editagentsDatatable')) {
-        $('#editagentsDatatable').DataTable({
-            dom: 'Bftip',
-            columnDefs: [{ targets: 'no-sort', orderable: false }],
-            lengthMenu: [
-                [50, 100, 200, 500, -1],
-                ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-            ],
-            scrollY: '30vh',
-            fixedColumns: { left: 1, right: 1 },
-            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' }
-            ],
-            fixedHeader: true,
-            autoWidth: true,
-            responsive: true,
-            searching: true,
-            select: false,
-            processing: false
-        });
-    } else {
-        $('#editagentsDatatable').DataTable().clear().draw();
-    }
-}
-
-</script>
-
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenter/campaignreport.html b/src/main/resources/templates/modules/callcenter/campaignreport.html
index b4b3eeb..b36ffd5 100644
--- a/src/main/resources/templates/modules/callcenter/campaignreport.html
+++ b/src/main/resources/templates/modules/callcenter/campaignreport.html
@@ -20,10 +20,6 @@
 }
 
 
-
-
-
-
 /* #questionDatatable {
     table-layout: fixed !important;  
     width: 100% !important; 
@@ -178,6 +174,18 @@
    
   
       </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>
+      
          <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
 </div>
 </div>
@@ -365,15 +373,12 @@
  	                ],
  	                scrollY: '30vh',
  	                scrollX: true,  // Enable horizontal scrolling	
- 	                fixedColumns: {
- 	                    left: 1,
- 	                    right: 1
- 	                },
+ 	                
  	                buttons: buttons,
  	                fixedHeader: false,
- 	                autoWidth: false,
- 	                responsive: true,
- 	                searching: true,
+ 	                autoWidth: true, 
+ 	                responsive: false,
+              		searching: true,
  	                select: false,
  	                processing: false,
  	            });
@@ -393,10 +398,7 @@
                  ['50 rows', '100 rows', '200 rows', 'Show all']
              ],
              scrollY: '50vh',
-             fixedColumns: {
-                 left: 1,
-                 right: 1
-             },
+             scrollX: true,
              buttons: [
                  {
                      extend: 'pageLength',
@@ -429,8 +431,8 @@
                  }
              ],
              fixedHeader: true,
-             autoWidth: true,
-             responsive: true,
+             autoWidth: false,
+             responsive: false,
              searching:true,
              select: false,
              processing: false
@@ -517,6 +519,7 @@
     // Fetch and Populate Table Data Function
     
      const fetchTableData = async (startDate = "", endDate = "") => {
+    	 $('#pageLoader').show();
         try {
             const params = new URLSearchParams();
             if (startDate) params.append("startDate", startDate);
@@ -558,6 +561,8 @@
       
         } catch (error) {
             console.error("Error fetching table data:", error);
+        }finally {
+            $('#pageLoader').hide(); // Hide loader in both success or error
         }
            
     };
@@ -575,10 +580,26 @@
         window.location.href = `/gcc/api/campaignreport/download-excel?categoryId=${categoryId}&campaignId=${campaignId}`;
     });
     
-   
+    let today = new Date();
+
+	// Get the first day of the current month (this should give 2024-11-01 for November)
+	let firstDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 1);
+
+	// Manually format the date as yyyy-mm-dd without relying on toISOString
+	let formattedFirstDay = firstDayOfMonth.getFullYear() + '-' + 
+	                        (firstDayOfMonth.getMonth() + 1).toString().padStart(2, '0') + '-' + 
+	                        firstDayOfMonth.getDate().toString().padStart(2, '0');
+
+	let formattedToday = today.getFullYear() + '-' + 
+	                     (today.getMonth() + 1).toString().padStart(2, '0') + '-' + 
+	                     today.getDate().toString().padStart(2, '0');
+	
+	// Set the date input values
+    $('#startDate').val(formattedFirstDay);
+    $('#endDate').val(formattedToday);
 
     // Example: Fetch Data initially without filters
-    fetchTableData();
+    fetchTableData(formattedFirstDay,formattedToday);
 
 
 // Function to Download Campaign Excel
@@ -634,7 +655,7 @@
 
 		    // Initial Load
 		    //fetchData(); // Load overall data initially
-            fetchTableData();
+            //fetchTableData();
 		});
  	 
   	 
@@ -685,6 +706,9 @@
             keyboard: false
         });
         $('#agentperformance').modal('show');
+        
+     	// Set default active tab
+        $('#performance-tab').tab('show');
  		 
         $.ajax({
             url: '/gcc/api/campaignreport/getReportCampaignid?campaign_id='+CampaignId,
@@ -697,10 +721,7 @@
                     // Populate form fields with response data
                     $('#campaign_id').val(campaign.campaign_id);
                     $('#category_id').val(campaign.category_id);
-                    /* $('#start_date').val(campaign.start_date);
-                    $('#end_date').val(campaign.end_date);
-                    $('#description_modal').val(campaign.description);
-                    $('#category').val(campaign.category_name); */
+
 
                     $('#start_date').text(campaign.start_date || 'N/A');
                     $('#end_date').text(campaign.end_date || 'N/A');
@@ -713,8 +734,6 @@
                       
                          <b>Created Date:</b> ${campaign.created_date}`
                     );
-
-                    /*  <b>Category:</b> ${campaign.category_name} |  */
                     
                     // Open modal
                     $('#agentperformance').modal('show');
@@ -931,7 +950,7 @@
 	 	                scrollY: '30vh',
 	 	                scrollX: true,  // Enable horizontal scrolling		 	                
 	 	                buttons: buttons,
-	 	                fixedHeader: false,
+	 	                fixedHeader: true,
 	 	                autoWidth: false,
 	 	                responsive: false,
 	 	                searching: true,
diff --git a/src/main/resources/templates/modules/callcenterqaqc/.DS_Store b/src/main/resources/templates/modules/callcenterqaqc/.DS_Store
index 2708302..2dd4572 100644
Binary files a/src/main/resources/templates/modules/callcenterqaqc/.DS_Store and b/src/main/resources/templates/modules/callcenterqaqc/.DS_Store differ
diff --git a/src/main/resources/templates/modules/callcenterqaqc/agentqaqccalls.html b/src/main/resources/templates/modules/callcenterqaqc/agentqaqccalls.html
index fe0c2ce..9c147fe 100644
--- a/src/main/resources/templates/modules/callcenterqaqc/agentqaqccalls.html
+++ b/src/main/resources/templates/modules/callcenterqaqc/agentqaqccalls.html
@@ -315,7 +315,7 @@
 															</tr>
 														</thead>
 														<tbody>
-															<tr th:each="call, iterStat : ${qaqcSubmitDetails}">
+															<!-- <tr th:each="call, iterStat : ${qaqcSubmitDetails}">
 																<td th:text="${iterStat.index + 1}" class="text-center"></td>
 																<td th:text="${call['complaint_number']}"
 																	class="text-center complaint-select"></td>
@@ -333,7 +333,7 @@
 																</td>
 																<td th:text="${call['call_status']}" class="text-center"></td>
 																<td th:text="${call['remarks']}" class="text-center"></td>
-															</tr>
+															</tr> -->
 														</tbody>
 													</table>
 												</div>
@@ -352,6 +352,17 @@
 
 				</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>
+			
 			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
 		</div>
 	</div>
@@ -411,6 +422,7 @@
 		
 		// Toggle functionality for Primary and Secondary buttons
 	    $('#primaryButton').click(function () {
+	    	//location.reload();
 	        $('#primaryTable').show();
 	        $('#secondaryTable').hide();
 	        
@@ -420,13 +432,115 @@
 	    });
 
 	    $('#secondaryButton').click(function () {
+	    	//location.reload();
 	        $('#primaryTable').hide();
 	        $('#secondaryTable').show();
 	        
 	        $(this).addClass('btn-success').removeClass('btn-secondary');
             $('#primaryButton').addClass('btn-secondary').removeClass('btn-success');
-	        $('#SecondaryDatatable').DataTable().columns.adjust().draw();
+	        //$('#SecondaryDatatable').DataTable().columns.adjust().draw();
 
+	        
+	        let userId = document.getElementById('userIdSpan').textContent;
+	        
+	        
+	        // Destroy previous instance if exists
+	        if ($.fn.DataTable.isDataTable('#SecondaryDatatable')) {
+	            $('#SecondaryDatatable').DataTable().clear().destroy();
+	        }
+	        $('#pageLoader').show();
+	        // AJAX call to get data
+	        $.ajax({
+	            url: '/gcc/api/callcenterqaqc/agent/qaqccalls/getqcsubmittedcalls', // Replace with your controller URL
+	            type: 'GET',
+	            data: { userId: userId },
+	            success: function (response) {
+	            	$('#pageLoader').hide();
+	                // Initialize DataTable with new data
+	                $('#SecondaryDatatable').DataTable({
+	                    data: response, // This should be an array of objects
+	                    columns: [
+	                        { data: null, render: function (data, type, row, meta) { return meta.row + 1; }, className: "text-center" },
+	                        { data: 'complaint_number', className: "text-center" },
+	                        { data: 'complaint_date', className: "text-center" },
+	                        { data: 'complaint_person_name', className: "text-center" },
+	                        { data: 'complaint_mobilenumber', className: "text-center" },
+	                        { data: 'complaint_type', className: "text-center" },
+	                        { 
+	                            data: 'complaint_number',
+	                            className: "text-center",
+	                            render: function (data, type, row) {
+	                                return `<button type="button" class="btn btn-info" data-complaint-number="${data}">View</button>`;
+	                            }
+	                        },
+	                        {
+	                            data: 'call_status',
+	                            className: "text-center"
+	                           
+	                        },
+	                        {
+	                            data: 'remarks',
+	                            className: "text-center"
+	                            
+	                        }
+	                    ],
+	                    dom: 'Bftip',
+	        	        columnDefs: [
+	        	            { targets: 'no-sort', orderable: false }
+	        	        ],
+	        	        lengthMenu: [
+	        	            [50, 100, 200, 500, -1],
+	        	            ['50 rows', '100 rows', '200 rows', 'Show all']
+	        	        ],
+	        	        scrollY: '50vh',
+	        	        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,
+	        	        responsive: false,
+	        	        searching: true,
+	        	        select: false,
+	        	        processing: false
+	                });
+	            },
+	            error: function () {
+	            	$('#pageLoader').hide();
+	            	Swal.fire("Error", "Failed to get Finished complaints.", "error");
+	            }
+	        });
+	        
+	        
+	        
 	    });
 		
 	    var table = $('#QaqcDatatable').DataTable({
@@ -439,10 +553,7 @@
 	            ['50 rows', '100 rows', '200 rows', 'Show all']
 	        ],
 	        scrollY: '50vh',
-	        fixedColumns: {
-	            left: 1,
-	            right: 1
-	        },
+	        scrollX:true,
 	        buttons: [
 	            {
 	                extend: 'pageLength',
@@ -475,8 +586,8 @@
 	            }
 	        ],
 	        fixedHeader: true,
-	        autoWidth: true,
-	        responsive: true,
+	        autoWidth: false,
+	        responsive: false,
 	        searching: true,
 	        select: false,
 	        processing: false
@@ -492,10 +603,7 @@
 	            ['50 rows', '100 rows', '200 rows', 'Show all']
 	        ],
 	        scrollY: '50vh',
-	        fixedColumns: {
-	            left: 1,
-	            right: 1
-	        },
+	        scrollX:true,
 	        buttons: [
 	            {
 	                extend: 'pageLength',
@@ -528,8 +636,8 @@
 	            }
 	        ],
 	        fixedHeader: true,
-	        autoWidth: true,
-	        responsive: true,
+	        autoWidth: false,
+	        responsive: false,
 	        searching: true,
 	        select: false,
 	        processing: false
@@ -594,6 +702,8 @@
 	
 	function submitComplaint(button) {
 		
+		
+		
 		// Access the userId from the hidden span
 	    var userId = document.getElementById('userIdSpan').textContent;
 
@@ -641,7 +751,7 @@
 	        return;
 	    }
 	    
-	    
+	    $('#pageLoader').show();
 	    //console.log("outside ajax");
 	    // AJAX Request
 	     $.ajax({
@@ -656,6 +766,7 @@
 	            userId:userId
 	        },	        
 	        success: function (response) {
+	        	 $('#pageLoader').hide();
 	            if (response === "Success") {
 	            	//console.log("Success");
 	            	
@@ -718,6 +829,7 @@
 	            }
 	        },
 	        error: function (xhr, status, error) {
+	        	$('#pageLoader').hide();
 	        	$('.submitid').prop('disabled', false).text('Submit');
 	            Swal.fire("Error", `An error occurred: ${xhr.responseText || error}`, "error");
 	        }
@@ -1008,6 +1120,18 @@ return detailsHtml;
        }
 	
 	</script>
+	
+	<script>
+    document.addEventListener("DOMContentLoaded", function () {
+        const today = new Date();
+        today.setDate(today.getDate() + 1); // Add 1 day to get tomorrow
+        const tomorrow = today.toISOString().split('T')[0];
+
+        document.querySelectorAll('.date-picker').forEach(function (input) {
+            input.setAttribute('min', tomorrow);
+        });
+    });
+</script>
 
 	<script>
 	//Swal.fire("Success", "Complaint updated successfully!", "success");
diff --git a/src/main/resources/templates/modules/callcenterqaqc/agentqaqcfollowupcalls.html b/src/main/resources/templates/modules/callcenterqaqc/agentqaqcfollowupcalls.html
index 7d58354..073713b 100644
--- a/src/main/resources/templates/modules/callcenterqaqc/agentqaqcfollowupcalls.html
+++ b/src/main/resources/templates/modules/callcenterqaqc/agentqaqcfollowupcalls.html
@@ -329,7 +329,7 @@
 															</tr>
 														</thead>
 														<tbody>
-															<tr th:each="call, iterStat : ${fcSubmitDetails}">
+															<!-- <tr th:each="call, iterStat : ${fcSubmitDetails}">
 																<td th:text="${iterStat.index + 1}" class="text-center"></td>
 																<td th:text="${call['complaint_number']}"
 																	class="text-center complaint-select"></td>
@@ -347,7 +347,7 @@
 																</td>
 																<td th:text="${call['call_status']}" class="text-center"></td>
 																<td th:text="${call['remarks']}" class="text-center"></td>
-															</tr>
+															</tr> -->
 														</tbody>
 													</table>
 												</div>
@@ -364,6 +364,17 @@
 					</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>
+			
 			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
 		</div>
 	</div>
@@ -438,8 +449,106 @@ $(document).ready(function() {
 	        $('#secondaryTable').show();
 	        
 	        $(this).addClass('btn-success').removeClass('btn-secondary');
-         $('#primaryButton').addClass('btn-secondary').removeClass('btn-success');
-	        $('#SecondaryDatatable').DataTable().columns.adjust().draw();
+         	$('#primaryButton').addClass('btn-secondary').removeClass('btn-success');
+	        //$('#SecondaryDatatable').DataTable().columns.adjust().draw();
+	        
+			let userId = document.getElementById('userIdSpan').textContent;
+	        
+	        
+	        // Destroy previous instance if exists
+	        if ($.fn.DataTable.isDataTable('#SecondaryDatatable')) {
+	            $('#SecondaryDatatable').DataTable().clear().destroy();
+	        }
+	        $('#pageLoader').show();
+	        // AJAX call to get data
+	        $.ajax({
+	            url: '/gcc/api/callcenterqaqc/agent/followupcalls/getoffsubmittedcalls', // Replace with your controller URL
+	            type: 'GET',
+	            data: { userId: userId },
+	            success: function (response) {
+	            	$('#pageLoader').hide();
+	                // Initialize DataTable with new data
+	                $('#SecondaryDatatable').DataTable({
+	                    data: response, // This should be an array of objects
+	                    columns: [
+	                        { data: null, render: function (data, type, row, meta) { return meta.row + 1; }, className: "text-center" },
+	                        { data: 'complaint_number', className: "text-center" },
+	                        { data: 'complaint_date', className: "text-center" },
+	                        { data: 'complaint_person_name', className: "text-center" },
+	                        { data: 'complaint_mobilenumber', className: "text-center" },
+	                        { data: 'complaint_type', className: "text-center" },
+	                        { 
+	                            data: 'complaint_number',
+	                            className: "text-center",
+	                            render: function (data, type, row) {
+	                                return `<button type="button" class="btn btn-info" data-complaint-number="${data}">View</button>`;
+	                            }
+	                        },
+	                        {
+	                            data: 'call_status',
+	                            className: "text-center"
+	                           
+	                        },
+	                        {
+	                            data: 'remarks',
+	                            className: "text-center"
+	                            
+	                        }
+	                    ],
+	                    dom: 'Bftip',
+	        	        columnDefs: [
+	        	            { targets: 'no-sort', orderable: false }
+	        	        ],
+	        	        lengthMenu: [
+	        	            [50, 100, 200, 500, -1],
+	        	            ['50 rows', '100 rows', '200 rows', 'Show all']
+	        	        ],
+	        	        scrollY: '50vh',
+	        	        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,
+	        	        responsive: false,
+	        	        searching: true,
+	        	        select: false,
+	        	        processing: false
+	                });
+	            },
+	            error: function () {
+	            	$('#pageLoader').hide();
+	            	Swal.fire("Error", "Failed to get Finished complaints.", "error");
+	            }
+	        });
 
 	    });
 				
@@ -454,10 +563,7 @@ $(document).ready(function() {
     	                 ['50 rows', '100 rows', '200 rows', 'Show all']
     	             ],
     	             scrollY: '50vh',
-    	             fixedColumns: {
-    	                 left: 1,
-    	                 right: 1
-    	             },
+    	             scrollX:true,
     	             buttons: [
     	                 {
     	                     extend: 'pageLength',
@@ -490,8 +596,8 @@ $(document).ready(function() {
     	                 }
     	             ],
     	             fixedHeader: true,
-    	             autoWidth: true,
-    	             responsive: true,
+    	             autoWidth: false,
+    	             responsive: false,
     	             searching: true, // Enable default search functionality
     	             select: false,
     	             processing: false
@@ -508,10 +614,7 @@ $(document).ready(function() {
     		            ['50 rows', '100 rows', '200 rows', 'Show all']
     		        ],
     		        scrollY: '50vh',
-    		        fixedColumns: {
-    		            left: 1,
-    		            right: 1
-    		        },
+    		        scrollX:true,
     		        buttons: [
     		            {
     		                extend: 'pageLength',
@@ -544,8 +647,8 @@ $(document).ready(function() {
     		            }
     		        ],
     		        fixedHeader: true,
-    		        autoWidth: true,
-    		        responsive: true,
+    		        autoWidth: false,
+    		        responsive: false,
     		        searching: true,
     		        select: false,
     		        processing: false
@@ -640,6 +743,7 @@ function submitComplaint(button) {
         return;
     }
 
+    $('#pageLoader').show();
     // AJAX Request
     $.ajax({
         url: '/gcc/api/callcenterqaqc/agent/followupcalls/update',
@@ -653,6 +757,7 @@ function submitComplaint(button) {
             userId:userId
         },       
         success: function (response) {
+        	$('#pageLoader').hide();
             if (response === "Success") {
                 Swal.fire({
                     icon: 'success',
@@ -692,6 +797,7 @@ function submitComplaint(button) {
             }
         },
         error: function (xhr, status, error) {
+        	$('#pageLoader').hide();
         	$('.submitid').prop('disabled', false).text('Submit');        	
             Swal.fire("Error", `An error occurred: ${xhr.responseText || error}`, "error");
         }
@@ -893,7 +999,17 @@ return detailsHtml;
   
 </script>
 
+<script>
+    document.addEventListener("DOMContentLoaded", function () {
+        const today = new Date();
+        today.setDate(today.getDate() + 1); // Add 1 day to get tomorrow
+        const tomorrow = today.toISOString().split('T')[0];
 
+        document.querySelectorAll('.date-picker').forEach(function (input) {
+            input.setAttribute('min', tomorrow);
+        });
+    });
+</script>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenterqaqc/agentqaqcinprogresscalls.html b/src/main/resources/templates/modules/callcenterqaqc/agentqaqcinprogresscalls.html
index 74bdc4a..cfe4761 100644
--- a/src/main/resources/templates/modules/callcenterqaqc/agentqaqcinprogresscalls.html
+++ b/src/main/resources/templates/modules/callcenterqaqc/agentqaqcinprogresscalls.html
@@ -327,7 +327,7 @@
 															</tr>
 														</thead>
 														<tbody>
-															<tr th:each="call, iterStat : ${inSubmitDetails}">
+															<!-- <tr th:each="call, iterStat : ${inSubmitDetails}">
 																<td th:text="${iterStat.index + 1}" class="text-center"></td>
 																<td th:text="${call['complaint_number']}"
 																	class="text-center complaint-select"></td>
@@ -345,7 +345,7 @@
 																</td>
 																<td th:text="${call['call_status']}" class="text-center"></td>
 																<td th:text="${call['remarks']}" class="text-center"></td>
-															</tr>
+															</tr> -->
 														</tbody>
 													</table>
 												</div>
@@ -364,6 +364,17 @@
 
 				</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>
+			
 			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
 		</div>
 	</div>
@@ -433,7 +444,106 @@
 	        
 	        $(this).addClass('btn-success').removeClass('btn-secondary');
             $('#primaryButton').addClass('btn-secondary').removeClass('btn-success');
-	        $('#SecondaryDatatable').DataTable().columns.adjust().draw();
+	        //$('#SecondaryDatatable').DataTable().columns.adjust().draw();
+	        
+	        
+			let userId = document.getElementById('userIdSpan').textContent;
+	        
+	        
+	        // Destroy previous instance if exists
+	        if ($.fn.DataTable.isDataTable('#SecondaryDatatable')) {
+	            $('#SecondaryDatatable').DataTable().clear().destroy();
+	        }
+	        $('#pageLoader').show();
+	        // AJAX call to get data
+	        $.ajax({
+	            url: '/gcc/api/callcenterqaqc/agent/inprogresscalls/getinprogresssubmittedcalls', // Replace with your controller URL
+	            type: 'GET',
+	            data: { userId: userId },
+	            success: function (response) {
+	            	$('#pageLoader').hide();
+	                // Initialize DataTable with new data
+	                $('#SecondaryDatatable').DataTable({
+	                    data: response, // This should be an array of objects
+	                    columns: [
+	                        { data: null, render: function (data, type, row, meta) { return meta.row + 1; }, className: "text-center" },
+	                        { data: 'complaint_number', className: "text-center" },
+	                        { data: 'complaint_date', className: "text-center" },
+	                        { data: 'complaint_person_name', className: "text-center" },
+	                        { data: 'complaint_mobilenumber', className: "text-center" },
+	                        { data: 'complaint_type', className: "text-center" },
+	                        { 
+	                            data: 'complaint_number',
+	                            className: "text-center",
+	                            render: function (data, type, row) {
+	                                return `<button type="button" class="btn btn-info" data-complaint-number="${data}">View</button>`;
+	                            }
+	                        },
+	                        {
+	                            data: 'call_status',
+	                            className: "text-center"
+	                           
+	                        },
+	                        {
+	                            data: 'remarks',
+	                            className: "text-center"
+	                            
+	                        }
+	                    ],
+	                    dom: 'Bftip',
+	        	        columnDefs: [
+	        	            { targets: 'no-sort', orderable: false }
+	        	        ],
+	        	        lengthMenu: [
+	        	            [50, 100, 200, 500, -1],
+	        	            ['50 rows', '100 rows', '200 rows', 'Show all']
+	        	        ],
+	        	        scrollY: '50vh',
+	        	        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,
+	        	        responsive: false,
+	        	        searching: true,
+	        	        select: false,
+	        	        processing: false
+	                });
+	            },
+	            error: function () {
+	            	$('#pageLoader').hide();
+	            	Swal.fire("Error", "Failed to get Finished complaints.", "error");
+	            }
+	        });
 
 	    });
 		
@@ -447,10 +557,7 @@
             ['50 rows', '100 rows', '200 rows', 'Show all']
         ],
         scrollY: '50vh',
-        fixedColumns: {
-            left: 1,
-            right: 1
-        },
+        scrollX:true,
         buttons: [
             {
                 extend: 'pageLength',
@@ -483,8 +590,8 @@
             }
         ],
         fixedHeader: true,
-        autoWidth: true,
-        responsive: true,
+        autoWidth: false,
+        responsive: false,
         searching: true,
         select: false,
         processing: true
@@ -500,10 +607,7 @@
             ['50 rows', '100 rows', '200 rows', 'Show all']
         ],
         scrollY: '50vh',
-        fixedColumns: {
-            left: 1,
-            right: 1
-        },
+        scrollX:true,
         buttons: [
             {
                 extend: 'pageLength',
@@ -536,8 +640,8 @@
             }
         ],
         fixedHeader: true,
-        autoWidth: true,
-        responsive: true,
+        autoWidth: false,
+        responsive: false,
         searching: true,
         select: false,
         processing: false
@@ -644,6 +748,7 @@
 	    	return;
 	    }
 
+		$('#pageLoader').show();
 	    // AJAX Request
 	    $.ajax({
 	        url: '/gcc/api/callcenterqaqc/agent/inprogresscalls/update',
@@ -657,6 +762,7 @@
 	            userId:userId
 	        },	        
 	        success: function (response) {
+	        	$('#pageLoader').hide();
 	            if (response === "Success") {
 	            	//console.log("inside ajax success");
 	                Swal.fire({
@@ -697,6 +803,7 @@
 	            }
 	        },
 	        error: function (xhr, status, error) {
+	        	$('#pageLoader').hide();
 	        	$('.submitid').prop('disabled', false).text('Submit');
 	            Swal.fire("Error", `An error occurred: ${xhr.responseText || error}`, "error");
 	        }
@@ -898,6 +1005,18 @@ return detailsHtml;
 
 </script>
 
+<script>
+    document.addEventListener("DOMContentLoaded", function () {
+        const today = new Date();
+        today.setDate(today.getDate() + 1); // Add 1 day to get tomorrow
+        const tomorrow = today.toISOString().split('T')[0];
+
+        document.querySelectorAll('.date-picker').forEach(function (input) {
+            input.setAttribute('min', tomorrow);
+        });
+    });
+</script>
+
 
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/callcenterqaqc/agentqaqcpublicfollowupcalls.html b/src/main/resources/templates/modules/callcenterqaqc/agentqaqcpublicfollowupcalls.html
index 36c3e72..b8090ab 100644
--- a/src/main/resources/templates/modules/callcenterqaqc/agentqaqcpublicfollowupcalls.html
+++ b/src/main/resources/templates/modules/callcenterqaqc/agentqaqcpublicfollowupcalls.html
@@ -331,7 +331,7 @@
 															</tr>
 														</thead>
 														<tbody>
-															<tr th:each="call, iterStat : ${fcSubmitDetails}">
+															<!-- <tr th:each="call, iterStat : ${fcSubmitDetails}">
 																<td th:text="${iterStat.index + 1}" class="text-center"></td>
 																<td th:text="${call['complaint_number']}"
 																	class="text-center complaint-select"></td>
@@ -349,7 +349,7 @@
 																</td>
 																<td th:text="${call['call_status']}" class="text-center"></td>
 																<td th:text="${call['remarks']}" class="text-center"></td>
-															</tr>
+															</tr> -->
 														</tbody>
 													</table>
 												</div>
@@ -366,6 +366,17 @@
 					</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>
+			
 			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
 		</div>
 	</div>
@@ -440,8 +451,106 @@ $(document).ready(function() {
 	        $('#secondaryTable').show();
 	        
 	        $(this).addClass('btn-success').removeClass('btn-secondary');
-         $('#primaryButton').addClass('btn-secondary').removeClass('btn-success');
-	        $('#SecondaryDatatable').DataTable().columns.adjust().draw();
+            $('#primaryButton').addClass('btn-secondary').removeClass('btn-success');
+	        //$('#SecondaryDatatable').DataTable().columns.adjust().draw();
+	        
+            let userId = document.getElementById('userIdSpan').textContent;
+	        
+	        
+	        // Destroy previous instance if exists
+	        if ($.fn.DataTable.isDataTable('#SecondaryDatatable')) {
+	            $('#SecondaryDatatable').DataTable().clear().destroy();
+	        }
+	        $('#pageLoader').show();
+	        // AJAX call to get data
+	        $.ajax({
+	            url: '/gcc/api/callcenterqaqc/agent/publicfollowupcalls/getpubsubmittedcalls', 
+	            type: 'GET',
+	            data: { userId: userId },
+	            success: function (response) {
+	            	$('#pageLoader').hide();
+	                
+	                $('#SecondaryDatatable').DataTable({
+	                    data: response, 
+	                    columns: [
+	                        { data: null, render: function (data, type, row, meta) { return meta.row + 1; }, className: "text-center" },
+	                        { data: 'complaint_number', className: "text-center" },
+	                        { data: 'complaint_date', className: "text-center" },
+	                        { data: 'complaint_person_name', className: "text-center" },
+	                        { data: 'complaint_mobilenumber', className: "text-center" },
+	                        { data: 'complaint_type', className: "text-center" },
+	                        { 
+	                            data: 'complaint_number',
+	                            className: "text-center",
+	                            render: function (data, type, row) {
+	                                return `<button type="button" class="btn btn-info" data-complaint-number="${data}">View</button>`;
+	                            }
+	                        },
+	                        {
+	                            data: 'call_status',
+	                            className: "text-center"
+	                           
+	                        },
+	                        {
+	                            data: 'remarks',
+	                            className: "text-center"
+	                            
+	                        }
+	                    ],
+	                    dom: 'Bftip',
+	        	        columnDefs: [
+	        	            { targets: 'no-sort', orderable: false }
+	        	        ],
+	        	        lengthMenu: [
+	        	            [50, 100, 200, 500, -1],
+	        	            ['50 rows', '100 rows', '200 rows', 'Show all']
+	        	        ],
+	        	        scrollY: '50vh',
+	        	        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,
+	        	        responsive: false,
+	        	        searching: true,
+	        	        select: false,
+	        	        processing: false
+	                });
+	            },
+	            error: function () {
+	            	$('#pageLoader').hide();
+	            	Swal.fire("Error", "Failed to get Finished complaints.", "error");
+	            }
+	        });
 
 	    });
 				
@@ -456,10 +565,7 @@ $(document).ready(function() {
     	                 ['50 rows', '100 rows', '200 rows', 'Show all']
     	             ],
     	             scrollY: '50vh',
-    	             fixedColumns: {
-    	                 left: 1,
-    	                 right: 1
-    	             },
+    	             scrollX:true,
     	             buttons: [
     	                 {
     	                     extend: 'pageLength',
@@ -492,8 +598,8 @@ $(document).ready(function() {
     	                 }
     	             ],
     	             fixedHeader: true,
-    	             autoWidth: true,
-    	             responsive: true,
+    	             autoWidth: false,
+    	             responsive: false,
     	             searching: true, // Enable default search functionality
     	             select: false,
     	             processing: false
@@ -510,10 +616,7 @@ $(document).ready(function() {
     		            ['50 rows', '100 rows', '200 rows', 'Show all']
     		        ],
     		        scrollY: '50vh',
-    		        fixedColumns: {
-    		            left: 1,
-    		            right: 1
-    		        },
+    		        scrollX:true,
     		        buttons: [
     		            {
     		                extend: 'pageLength',
@@ -546,8 +649,8 @@ $(document).ready(function() {
     		            }
     		        ],
     		        fixedHeader: true,
-    		        autoWidth: true,
-    		        responsive: true,
+    		        autoWidth: false,
+    		        responsive: false,
     		        searching: true,
     		        select: false,
     		        processing: false
@@ -650,6 +753,8 @@ function submitComplaint(button) {
         $('.submitid').prop('disabled', false).text('Submit');
         return;
     }
+    
+    $('#pageLoader').show();
 
     // AJAX Request
     $.ajax({
@@ -664,6 +769,7 @@ function submitComplaint(button) {
             userId:userId
         },       
         success: function (response) {
+        	$('#pageLoader').hide();
             if (response === "Success") {
             	
             	//Validate cellnumber
@@ -719,6 +825,7 @@ function submitComplaint(button) {
             }
         },
         error: function (xhr, status, error) {
+        	$('#pageLoader').hide();
         	$('.submitid').prop('disabled', false).text('Submit');        	
             Swal.fire("Error", `An error occurred: ${xhr.responseText || error}`, "error");
         }
@@ -963,6 +1070,18 @@ function sendWhatsAppMessageReopened(name,complaintNumber,cellnumber,complaintTy
   
 </script>
 
+<script>
+    document.addEventListener("DOMContentLoaded", function () {
+        const today = new Date();
+        today.setDate(today.getDate() + 1); // Add 1 day to get tomorrow
+        const tomorrow = today.toISOString().split('T')[0];
+
+        document.querySelectorAll('.date-picker').forEach(function (input) {
+            input.setAttribute('min', tomorrow);
+        });
+    });
+</script>
+
 
 
 </body>
diff --git a/src/main/resources/templates/modules/callcenterqaqc/pgrcomplaints.html b/src/main/resources/templates/modules/callcenterqaqc/pgrcomplaints.html
index 07d36fb..137c342 100644
--- a/src/main/resources/templates/modules/callcenterqaqc/pgrcomplaints.html
+++ b/src/main/resources/templates/modules/callcenterqaqc/pgrcomplaints.html
@@ -128,6 +128,15 @@
 		    background-color: white;
 		    border-radius: 4px;
 		  }
+		  
+		  
+		  /* Media query for mobile devices */
+			@media (max-width: 576px) {
+			  #pac-input {
+			     top: 55px;
+			     z-index: 5;
+			  }
+			}
 
 		#search-container {
 			position: absolute;
@@ -210,19 +219,19 @@
 	/* Initially hidden */
 }
 
-.row {
+ .row {
 		  display: flex;
 		  flex-wrap: wrap;
 		  margin-bottom: 15px;
-		  gap: 15px;
-		}
+		  
+		} 
 		
-		.col-md-6 {
+ 		.col-md-6 {
 		  flex: 0 0 48%;
 		  max-width: 48%;
 		  display: flex;
 		  flex-direction: column;
-		}
+		} 
 		
 		.col-md-6 label {
 		  font-weight: 600;
@@ -311,6 +320,10 @@ to {
 }
 }
 
+.input-error {
+	border: 1px solid red !important;
+}
+
 /*for snack bar*/
 </style>
 <body>
@@ -357,39 +370,47 @@ to {
 
 					<div class="row inside mt-4">
 
-						<div class="col-md-12">
+						<div class="col-md-12"><span th:text="${userId}" style="display:none;" id="userIdSpan"></span>
 							<div class="card" style="margin-top: 0px;">
-
+							<div class="card-header"><span th:text="${userId}" style="display:none;" id="userIdSpan"></span>
+							<h3 class="mb-0" style="font-weight: bold;font-size: large;"><span th:text="${agent[0]['agent_name']}" style="font-weight: bold;font-size: large;"></span>'s Complaints Registration</h3>	
+							</div>
+							
 								<div class="card-body">
 
-
+									
 									<!-- Step 1 -->
 									<!-- Step 1 -->
 									<div class=" form-step active" id="step-1">
-										<!-- <div class="card-body"> -->
+										<!-- <div class="card-body"> -->										
 										<h5 class="card-title">1. Complaining Person's Details:</h5>
 										<div class="form-row">
 											<div class="col-md-4">
-												<label for="mobile">Mobile Number:<span class="required">*</span></label>
-												<div class="input-group">
+												<label for="mobile">Mobile Number:<span class="required">*</span></label>												
 													<input type="text" id="mobileNo" name="mobileNo"
 														class="form-control mb-1"
 														placeholder="Enter Mobile Number" maxlength="10"
-														minlength="10" required>
-												</div>
+														required>																								
 											</div>
 										</div>
 										<div class="form-row">
-											<div class="col-md-4">
+											<div class="col-md-4 mb-2">
 												<label for="name">Name:<span class="required">*</span></label>
 												 <input type="text" class="form-control" id="name"
-													placeholder="Enter your name" required>
+													placeholder="Enter your name" required >
+											</div>
+																						
+
+											<div class="col-md-4 mb-2">
+												<label for="email">Email:</label> <input type="email"
+													class="form-control" id="email"
+													placeholder="Enter your email">
 											</div>
 											
-											<div class="col-md-4">
-												<label for="gender" class="ml-4">Gender/பாலினம்:<span
+											<div class="col-md-4 mb-2">
+												<label for="gender" >Gender/பாலினம்:<span
 													class="required">*</span></label>
-												<div class="radio-group mt-2 ml-4">
+												<div class="radio-group mt-2 ">
 													<div class="radio-item">
 														<input type="radio" id="male" name="gender" value="male"
 															> <label for="male">Male</label>
@@ -404,12 +425,7 @@ to {
 													</div>
 												</div>
 											</div>
-
-											<div class="col-md-4">
-												<label for="email">Email:</label> <input type="email"
-													class="form-control" id="email"
-													placeholder="Enter your email">
-											</div>
+											
 										</div>
 										<button id="nextStep1" class="btn btn-primary float-right"
 											onclick="nextStep('nextStep1')"
@@ -429,16 +445,16 @@ to {
 
 											<div class="col-md-12">
 							<!-- <div id="map"></div> -->
-							<div id="mapContainer" style="position: relative; height: 500px;">
+							<div id="mapContainer" style="position: relative; height: 500px;" class="mb-4 mt-2">
 							  <input id="pac-input" class="controls" type="text" placeholder="Search location">
-							  <div id="googleMap" style="height: 100%; width: 100%;"></div>
+							  <div id="googleMap" style="height: 100%; width: 100%;border:2px solid black;"></div>
 							</div>
 							<div id="search-container">
 								<!-- <input type="text" id="search-box" placeholder="Search for a location..."> -->
 								<div id="suggestions"></div>
 							</div>
 							<div class="row">
-								<div class="col-md-6">
+								<div class="col-md-6 mb-2">
 									<!-- <label for="street">Street:</label>
 									<input type="text" class="form-control" id="street"> -->
 									<label for="streetName">Street:</label>
@@ -447,25 +463,25 @@ to {
 									<input type="text" class="form-control" id="streetName"> -->
 								</div>
 
-								<div class="col-md-6">
+								<div class="col-md-6 mb-2">
 									<!-- <label for="longitude_field">Longtitude</label>
 									<input type="text" class="form-control" id="longitude_field" name="longtitude"> -->
 									<label for="longitude_field">Longtitude</label>
 									<input type="text" class="form-control" id="longitude_field" readonly>
 								</div>
-								<div class="col-md-6">
+								<div class="col-md-6 mb-2">
 									<!-- <label for="latitude_field">Latitide</label>
 									<input type="text" class="form-control" id="latitude_field"> -->
 									<label for="latitude_field">Latitude</label>
 									<input type="text" class="form-control" id="latitude_field" readonly>
 								</div>
-								<div class="col-md-6">
+								<div class="col-md-6 mb-2">
 									<!-- <label for="street_id">Street Id</label>
 									<input type="text" class="form-control" id="street_id"> -->
 									<label for="streetId">Street Id</label>
 									<input type="text" class="form-control" id="streetId" readonly>
 								</div>
-								<div class="col-md-6">
+								<div class="col-md-6 mb-2">
 									<!-- <label for="landmark">Landmark</label>
 									<input type="text" class="form-control" id="landmark"> -->
 									<label for="landmark">Landmark</label>
@@ -495,7 +511,7 @@ to {
 											<h5 class="card-title">3. Complaint Type:&nbsp;<span>(Please Select Complaint Type from Below...)</span></h5>
 
 											<!-- Icons -->
-											<div class="complaint-icons">
+											<!-- <div class="complaint-icons">
 												<div class="complaint-icon" data-type="specific"
 													data-id="112">
 													<img src="/gcc/assets/images/road.png" alt="Pothole">
@@ -542,20 +558,20 @@ to {
 													<img src="/gcc/assets/images/dog.png" alt="dog">
 													<p>Street Dog</p>
 												</div>
-												<!--<div class="complaint-icon" data-type="specific" data-id="">
+												<div class="complaint-icon" data-type="specific" data-id="">
 							<img src="images/bad-weather.png" alt="weather">
 							<p>Tree Fallen</p>
-						</div>-->
+						</div>
 
-												<!-- <div class="complaint-icon" data-type="others">
+												<div class="complaint-icon" data-type="others">
 													<img src="/gcc/assets/images/menu.png" alt="Others">
 													<p>Others</p>
-												</div> -->
-											</div>
+												</div>
+											</div> -->
 
 
 											<!-- Specific Complaint Fields -->
-											<div class="complaint-fields active" id="specific-fields">
+											<!-- <div class="complaint-fields active" id="specific-fields">
 												<div class="form-row">
 													<div class="col-md-6">
 														<label for="complaint-title">Complaint Title:</label> <input
@@ -585,7 +601,40 @@ to {
 													</div>
 
 												</div>
-											</div>
+											</div> -->
+											
+											
+											<!-- Specific Complaint Fields -->
+									        <div class="complaint-fields active" id="specific-fields">
+									            <div class="form-row">
+									                <div class="col-md-6">
+									                    <label for="specificComplaintType">Complaint Type:</label>
+									                    <select class="form-control" id="specificComplaintType">
+									                        <option value="">-- Select Complaint Type --</option>
+									                    </select>
+									                </div>
+									                <div class="col-md-6">
+									                    <label for="specificComplaintSubType">Complaint Sub-Type:</label>
+									                    <select class="form-control" id="specificComplaintSubType" disabled>
+									                        <option value="">-- Select Complaint Sub-Type --</option>
+									                    </select>
+									                </div>
+									            </div>
+									            <div class="form-row">
+									                <div class="col-md-6">
+									                    <label for="specificComplaintDetails">Details of Complaint:</label>
+									                    <textarea class="form-control" id="specificComplaintDetails" rows="3"
+									                        placeholder="Enter complaint details" maxlength="400"></textarea>
+									                </div>
+									                <div class="col-md-6">
+									                    <label for="specificComplaintImage">Upload Photo:
+									                        <p style="color: orange;">Note: Upload Photo Less Than 1MB.</p>
+									                    </label>
+									                    <input type="file" class="form-control" id="specificComplaintImage" name="Comp_Image"
+									                        accept="image/*">
+									                </div>
+									            </div>
+									        </div>
 
 											<!-- Others Complaint Fields -->
 											<div class="complaint-fields" id="others-fields">
@@ -708,6 +757,17 @@ to {
 
 
 			</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> 
 
 
 			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
@@ -739,6 +799,85 @@ to {
 			snackbar.className = "show";
 			setTimeout(function () {snackbar.className = snackbar.className.replace("show", "");}, 3000);
 		} 
+		
+		 $(document).ready(function () {
+				// Trigger on change
+				$('#mobileNo').on('change', validateMobileNumber);
+				
+				$('#name').on('change', validateName);
+
+				// Optional: Allow only numeric input
+				$('#mobileNo').on('input', function () {
+					this.value = this.value.replace(/[^0-9]/g, '');
+					$(this).removeClass('input-error');
+				});
+				
+				$('#name').on('input', function () {
+					this.value = this.value.replace(/[^a-zA-Z.\s]/g, ''); // allow letters, dot, and space
+					$(this).removeClass('input-error');
+				});
+			});
+		 
+		 function validateName(){
+			 			 
+			 const $inputname = $('#name');
+			 const namefield = $('#name').val().trim();
+			 
+			 $inputname.removeClass('input-error');
+			 			 
+				if (!/^[A-Za-z\s.]+$/.test(namefield)) {
+					showSnackbar("Name should contain only alphabets.");
+					$inputname.addClass('input-error');
+					return false;
+				}
+			 
+			 return true;
+		 }
+		 
+		 function validateMobileNumber() {				
+				
+				const $input = $('#mobileNo');
+				const mobileStr = $('#mobileNo').val().trim();
+				console.log("mobileNo1=" + mobileStr);
+				
+				// Reset previous error style
+				$input.removeClass('input-error');
+
+				if (mobileStr === '') {
+					showSnackbar("Mobile number is required.");
+					$input.addClass('input-error');
+					return false;
+				}
+
+				if (!/^\d{10}$/.test(mobileStr)) {
+					showSnackbar("Please enter a valid 10-digit mobile number.");
+					$input.addClass('input-error');
+					return false;
+				}
+
+				if (/^0{10}$/.test(mobileStr)) {
+					showSnackbar("Mobile number cannot be all zeros.");
+					$input.addClass('input-error');
+					return false;
+				}
+
+				if (mobileStr.startsWith('0')) {
+					showSnackbar("Mobile number cannot start with zero.");
+					$input.addClass('input-error');
+					return false;
+				}
+				
+				if (/^(\d)\1{9}$/.test(mobileStr)) {
+					showSnackbar("Mobile number cannot have all digits the same.");
+					$input.addClass('input-error');
+					return false;
+				}
+	
+				// All validations passed – remove error styling
+				$input.removeClass('input-error');
+				return true;
+			}
+
 
 		//for snackbar script
 
@@ -805,6 +944,22 @@ to {
 					showSnackbar("Please enter a valid 10-digit mobile number.");
 					return false;
 				}
+				
+				if (/^0{10}$/.test(mobileNo)) {
+					showSnackbar("Mobile number cannot be all zeros.");				
+					return false;
+				}
+				
+				if (mobileNo.startsWith('0')) {
+					showSnackbar("Mobile number cannot start with zero.");					
+					return false;
+				}
+				
+				if (/^(\d)\1{9}$/.test(mobileNo)) {
+					showSnackbar("Mobile number cannot have all digits the same.");					
+					return false;
+				}
+
 
 				// Validate name
 				if (!name) {
@@ -812,6 +967,11 @@ to {
 					showSnackbar("Please enter your name.");
 					return false;
 				}
+				
+				if (!/^[A-Za-z\s.]+$/.test(name)) {
+					showSnackbar("Name should contain only alphabets.");					
+					return false;
+				}
 
 				// Validate gender
 				if (!gender) {
@@ -820,7 +980,7 @@ to {
 				}
 				// Check email
 				if (email === '') {
-					email = 'N/A'; // Set N/A if empty
+					email = ''; // Set N/A if empty
 					$('#email').val(email); // Update the input field with N/A
 				} else if (!/^\S+@\S+\.\S+$/.test(email)) {
 					isValid = false;
@@ -838,7 +998,7 @@ to {
 				// Validate street
 				if (!streets) {
 					isValid = false;
-					showSnackbar("Please enter the street.");
+					showSnackbar("Please Select a street.");
 					return false;
 				}
 
@@ -880,7 +1040,7 @@ to {
 			const email = $('#email').val();
 
 			// Check if 'specific-fields' is active and use its values
-			if ($('#specific-fields').hasClass('active')) {
+			/* if ($('#specific-fields').hasClass('active')) {
 				const complaintTitle = $('#complaint-title').val();
 				const complaintid = $('#complaint-id').val();
 				const complaintDetails = $('#othercomplaint-details').val(); // Specific complaint details
@@ -897,7 +1057,17 @@ to {
 				$('#summaryComplaintTitle').text(complaintTitle + ' - ' + complaintSubType);
 				$('#summaryComplaintType').text('Other Complaint');
 				$('#summaryDescription').text(complaintDetails);
-			}
+			} */
+			
+			
+			const complaintTitle = $('#specificComplaintType option:selected').text(); // groupname
+			const complaintType = $('#specificComplaintSubType option:selected').text(); // complaintname
+			const complaintDetails = $('#specificComplaintDetails').val(); // Others complaint details
+
+			$('#summaryComplaintTitle').text(complaintTitle); // group
+			$('#summaryComplaintType').text(complaintType);   // sub-type
+			$('#summaryDescription').text(complaintDetails);
+
 
 
 			//const streetid = $('#street_id').val();
@@ -930,8 +1100,8 @@ to {
 
 			// If there's a separate image input for the specific form, handle it similarly:
 			// Check if specific fields section is active
-			if ($('#specific-fields').hasClass('active')) {
-				const specificFileInput = $('#complaint-image')[0]; // Example ID for specific form
+//			if ($('#specific-fields').hasClass('active')) {
+				const specificFileInput = $('#specificComplaintImage')[0]; // Example ID for specific form
 				if (specificFileInput.files && specificFileInput.files[0]) {
 					const reader = new FileReader();
 					reader.onload = function (e) {
@@ -941,9 +1111,9 @@ to {
 				} else {
 					$('#summaryImage').hide(); // Hide the image if no file is selected
 				}
-			}
+//			}
 			// Check if "Others" section is active
-			else if ($('#others-fields').hasClass('active')) {
+			 if ($('#others-fields').hasClass('active')) {
 				const fileInput = $('#uploadothers')[0]; // Assuming this is for the "Others" section
 				if (fileInput.files && fileInput.files[0]) {
 					const reader = new FileReader();
@@ -966,13 +1136,11 @@ to {
 
 
 		$(document).ready(function () {
+						
 			showStep(currentStep);
 		});
 
-
-
-
-
+		
 		$(document).ready(function () {
 			showStep(currentStep);
 		});
@@ -981,7 +1149,7 @@ to {
 		//for step3 onclick function
 		$(document).ready(function () {
 			// On icon click
-			$('.complaint-icon').click(function () {
+			/* $('.complaint-icon').click(function () {
 				const type = $(this).data('type'); // Get the type (specific or others)
 				const title = $(this).find('p').text().trim(); // Get the icon name (complaint title)
 				const complaintId = $(this).data('id'); // Get the complaint ID
@@ -1000,13 +1168,16 @@ to {
 					$('#complaint-title').val(''); // Clear the complaint title for 'Others'
 					$('#complaint-id').val(''); // Clear the complaint ID for 'Others'
 				}
-			});
+			}); */
 		});
+		
+		
+		
 
 
 
 		//for complaint group and complainttype wise options dropdown api
-		$(document).ready(function () {
+/* 		$(document).ready(function () {
 			const $type = $('#type');
 			const $subType = $('#sub-type');
 
@@ -1066,7 +1237,7 @@ to {
 					$subType.prop('disabled', true);
 				}
 			});
-		});
+		}); */
 
 		//api for saving
 		//for sweet alert
@@ -1211,8 +1382,15 @@ to {
 		document.getElementById("streetId").value = "";
 		document.getElementById("landmark").value = "";
 
-		fetch(streetURL)
-			.then(res => res.json())
+		// Timeout mechanism: 1 seconds
+		const timeout = new Promise((_, reject) =>
+			setTimeout(() => reject(new Error("Request timed out")), 1000)
+		);
+		
+		// Actual fetch
+		const fetchRequest = fetch(streetURL).then(res => res.json());
+
+		Promise.race([fetchRequest, timeout])
 			.then(data => {
 				const features = data.features;
 				if (!features || features.length === 0) {
@@ -1224,7 +1402,7 @@ to {
 					return;
 				}
 
-				streetsList = features.map(f => f.properties); // ✅ Save for use in dropdown
+				streetsList = features.map(f => f.properties); //Save for use in dropdown
 				streetsList.forEach((props, index) => {
 					const option = document.createElement("option");
 					option.value = index;
@@ -1387,8 +1565,8 @@ to {
 				var complainantAddr = $('#summaryStreet').text().trim();
 				var mobileNo = $('#summaryMobile').text().trim();
 				var email = $('#summaryEmail').text().trim();
-				var complaintType = $('#summaryComplaintType').text().trim();
-				var complaintTitle = $('#summaryComplaintTitle').text().trim();
+				var complaintType = $('#specificComplaintSubType').val();								
+				var complaintTitle = $('#specificComplaintSubType option:selected').text();
 				var complaintDetails = $('#summaryDescription').text().trim();
 				var streetId = $('#summaryStreetId').text().trim();
 				var landmark = $('#summaryLandmark').text().trim();
@@ -1396,8 +1574,9 @@ to {
 				var longtitude = $('#summaryLongitude').text().trim(); // Note the misspelling
 				var gender = $('#summaryGender').text().trim();
 				var imageSrc = $('#summaryImage').attr('src');
+				var userId = document.getElementById('userIdSpan').textContent;
 
-				/* console.log({
+				console.log({
 					ComplainantName: complainantName,
 					ComplainantAddr: complainantAddr,
 					MobileNo: mobileNo,
@@ -1410,8 +1589,9 @@ to {
 					latitude: latitude,
 					longtitude: longtitude,
 					Landmark: landmark,
-					gender: gender
-				}); */
+					gender: gender,
+					userId:userId
+				}); 
 
 				// AJAX call to your backend controller
 				$.ajax({
@@ -1430,7 +1610,8 @@ to {
 						latitude: latitude,
 						longtitude: longtitude,
 						Landmark: landmark,
-						gender: gender
+						gender: gender,
+						userId:userId
 					},
 					success: function (response) {
 						$('#submitButton').prop('disabled', false).text('Submit');
@@ -1440,44 +1621,51 @@ to {
 						
 						
 						if (typeof response === "string") {
-				        try {
-				            response = JSON.parse(response);
-				        } catch (error) {
-				            console.error("Failed to parse response:", error);
-				        }
-				    }
+					        try {
+					            response = JSON.parse(response);
+					        } 
+					        catch (error) {				        	
+					            console.error("Failed to parse response:", error);
+					            Swal.fire("Error", "Unexpected response from server.", "error");
+					            return;
+					        }
+				   		 }
 						
-						let complaintNumber = response["complaintNumber"];
-						if (!complaintNumber || complaintNumber === "null" || complaintNumber === null) {
-						    complaintNumber = "N/A"; 
-						}
-						
-						Swal.fire({
-							title: 'Success!',
-					        text: `Your complaint has been submitted successfully. Your Complaint Number is ${complaintNumber}. It will be sent to your mobile number.`,
-							icon: 'success',
-							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
-		                    showConfirmButton: true, // Ensure the confirm button is visible
-							confirmButtonText: 'OK'
-						}).then((result) => {
-							if (result.isConfirmed) {
-								
-								location.reload();
-							}
-						});
+						 if (response.complaintNumber) {
+						        let complaintNumber = response.complaintNumber;
+						        Swal.fire({
+						            title: 'Success!',
+						            text: `Your complaint has been submitted successfully. Your Complaint Number is ${complaintNumber}. It will be sent to your mobile number.`,
+						            icon: 'success',
+						            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
+				                    showConfirmButton: true, // Ensure the confirm button is visible
+						            confirmButtonText: 'OK'
+						        }).then(result => {
+						            if (result.isConfirmed) {
+						                location.reload();
+						            }
+						        });
+						    } else {
+						        Swal.fire("Error", "Complaint number not received. Please try again.", "error");
+						    }
+												
 					},
-					error: function (xhr, status, error) {
-						// Improved error handling
-						$('#submitButton').prop('disabled', false).text('Submit');
-						console.log('Error:', xhr.responseText, status, error);
-						//alert('Error: ' + xhr.status + ' ' + xhr.statusText);
-						Swal.fire({
-							title: 'Error!',
-							text: 'Submission failed. Please try again.',
-							icon: 'error'
-						});
+					error: function (xhr) {
+					    $('#submitButton').prop('disabled', false).text('Submit');
+					    let message = "Submission failed. Please try again.";
+
+					    try {
+					        const res = JSON.parse(xhr.responseText);
+					        if (res.error) {
+					            message = res.error;
+					        }
+					    } catch (e) {
+					        console.error("Error parsing error response:", e);
+					    }
+
+					    Swal.fire("Error", message, "error");
 					}
 				});
 			});
@@ -1829,52 +2017,56 @@ to {
 			$('#nextStep3').off('click').on('click', function (e) {
 				e.preventDefault();
 				
-				//const complaint_Title = $('#complaint-title').val().trim();
-			    const complaint_Type = $('#complaint-id').val();
-
-			    if (!complaint_Type) {
+				let complaintId = '';
+			    let complaintTitle = '';
+				
+				const selectedGroupId1 = $(specificComplaintType).val();
+				const selectedSubGroupId1=$(specificComplaintSubType).val();
+				
+				if (!selectedGroupId1) {
 			        Swal.fire({
 			            icon: 'warning',
-			            title: 'Missing Information',
-			            text: 'Please Select Complaint Type.',
+			            title: 'Complaint Type Required',
+			            text: 'Please select a complaint type before continuing.',
 			            confirmButtonText: 'OK'
 			        });
-			        return; // Stop further execution
+			        return;
+			    }
+				
+				if (!selectedSubGroupId1) {
+			        Swal.fire({
+			            icon: 'warning',
+			            title: 'Complaint Sub Type Required',
+			            text: 'Please select a complaint sub type before continuing.',
+			            confirmButtonText: 'OK'
+			        });
+			        return;
 			    }
 
-				const shareMobile = $('input[name="shareMobile"]:checked').val();
+
+				//const shareMobile = $('input[name="shareMobile"]:checked').val();
 				const mobileNo = $('#mobileNo').val().trim();
 				const streetName = $('#streetName option:selected').text().trim().toLowerCase();
 
-				if (shareMobile === 'no' || mobileNo === '') {
+/* 				if (shareMobile === 'no' || mobileNo === '') {
 					nextStep(); // Skip duplicate check if mobile not shared
 					return;
-				}
-
-				let complaintId = '';
-				let complaintTitle = '';
-
-				if ($('#specific-fields').hasClass('active')) {
-					complaintId = $('#complaint-id').val().trim();
-					complaintTitle = complaintTypeMap[complaintId] || "Selected complaint";
-				} else if ($('#others-fields').hasClass('active')) {
-					console.log("other fields...");
-					complaintId = $('#sub-type option:selected').val().trim(); // ✅ send ID
-					console.log("complaintId... "+complaintId);
-					//complaintId = $('#sub-type').val().trim(); // ✅ send ID
-					complaintTitle = $('#sub-type option:selected').text().trim(); // readable for alert
-				}
-
+				} */
+			
+				complaintId = selectedSubGroupId1;
+				
 				console.log("Checking for duplicate:", { complaintId, complaintTitle, streetName });
 
 				const backendUrl = `/gcc/api/callcenterqaqc/pgrcomplaint/checktypeforduplicate?mobileNo=${mobileNo}&complaintId=${complaintId}&streetName=${encodeURIComponent(streetName)}`;
-
+				$('#pageLoader').show();
 				$.get(backendUrl, function (response) {
+					 $('#pageLoader').hide();
+					const subTypeText = $('#specificComplaintSubType option:selected').text();
 					if (response.duplicate) {
 						Swal.fire({
 							icon: 'warning',
 							title: 'Duplicate Complaint Found',
-							text: `A similar complaint like "${complaintTitle}" already exists for this street within the last 7 days.`,
+							text: `A similar complaint like "${subTypeText}" already exists for this street within the last 7 days.`,
 							confirmButtonText: 'OK',
 							allowOutsideClick: false
 						}).then(() => {
@@ -1884,6 +2076,7 @@ to {
 						nextStep();
 					}
 				}).fail(function () {
+					 $('#pageLoader').hide();
 					Swal.fire({
 						icon: 'error',
 						title: 'Error',
@@ -1892,6 +2085,58 @@ to {
 				});
 			});
 		});
+		
+		
+		let complaintGroups = [];
+
+		$(document).ready(function () {  
+		    loadComplaintTypes();
+
+		    $('#specificComplaintType').on('change', function () {
+		        const selectedGroupId = $(this).val();
+		        const $subTypeDropdown = $('#specificComplaintSubType');
+
+		        // Clear previous options
+		        $subTypeDropdown.empty().append('<option value="">-- Select Complaint Sub-Type --</option>');
+
+		        // Find the group based on groupid
+		        const selectedGroup = complaintGroups.find(g => g.groupid === selectedGroupId);
+
+		        if (selectedGroup && selectedGroup.group && selectedGroup.group.length > 0) {
+		            selectedGroup.group.forEach(sub => {
+		                $subTypeDropdown.append(
+		                    `<option value="${sub.id}">${sub.complaintname}</option>`
+		                );
+		            });
+		            $subTypeDropdown.prop('disabled', false);
+		        } else {
+		            $subTypeDropdown.prop('disabled', true);
+		        }
+		    });
+		});
+
+		function loadComplaintTypes() {
+		    $.ajax({
+		        url: "/gcc/api/callcenterqaqc/pgrcomplaint/getComplaintCategories",
+		        dataType: "json",
+		        type: "GET",
+		        success: function (res) {
+		            complaintGroups = res?.ComplaintCategoryListResult || [];
+
+		            const $typeDropdown = $('#specificComplaintType');
+		            $typeDropdown.empty().append('<option value="">-- Select Complaint Type --</option>');
+
+		            complaintGroups.forEach(group => {
+		                $typeDropdown.append(
+		                    `<option value="${group.groupid}">${group.groupname}</option>`
+		                );
+		            });
+		        },
+		        error: function (xhr, status, error) {
+		            console.error("Error loading complaint categories:", status, error);
+		        }
+		    });
+		}
         
 
 		/*     html: `Your complaint has been submitted successfully. Your Complaint Number is <strong>${complaintNumber}</strong>. It will be sent to your mobile number.`, */
diff --git a/src/main/resources/templates/modules/callcenterqaqc/qaqcadminsettings.html b/src/main/resources/templates/modules/callcenterqaqc/qaqcadminsettings.html
index 311beaf..6e60d42 100644
--- a/src/main/resources/templates/modules/callcenterqaqc/qaqcadminsettings.html
+++ b/src/main/resources/templates/modules/callcenterqaqc/qaqcadminsettings.html
@@ -209,7 +209,7 @@
 						                </table>
 						
 						                <!-- Center the Submit button -->
-						                <div class="text-center">
+						                <div class="text-center mt-2">
 						                    <button type="button" class="btn btn-primary" id="submitBtn">Click to Assign</button>
 						                </div>
 						            </div>
@@ -222,6 +222,17 @@
                         
                     </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>
 
                 <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
             </div>
@@ -339,10 +350,8 @@
                     [ '200 rows','500 rows', 'Show all']
                 ],
                 scrollY: '80vh',
-                fixedColumns: {
-                    left: 1,
-                    right: 1
-                },
+                
+                scrollX: true,
                 buttons: [
                     {
                         extend: 'pageLength',
@@ -375,8 +384,8 @@
                     }
                 ],
                 fixedHeader: true,
-                autoWidth: true,
-                responsive: true,
+                autoWidth: false,
+                responsive: false,
                 searching: true,
                 select: false,
                 processing: false
@@ -488,6 +497,7 @@
                     return; // Stop further execution
                 }
 
+                $('#pageLoader').show();
                 // Send the selected agents and their calling types to the API
                 $.ajax({
                     type: "POST",
@@ -495,6 +505,7 @@
                     data: JSON.stringify(selectedAgents),
                     contentType: "application/json",
                     success: function (response) {
+                    	$('#pageLoader').hide();
                         // Success: Show success message with Swal
                         Swal.fire({
                             icon: 'success',
@@ -506,6 +517,7 @@
                         });
                     },
                     error: function (error) {
+                    	$('#pageLoader').hide();
                         // Error: Show error message with Swal
                         Swal.fire({
                             icon: 'error',
@@ -542,6 +554,7 @@
                 // Prepare the data to send
                 const data = { productivity_count: productivityCount };
 
+                $('#pageLoader').show();
                 // Send the data to the API using AJAX
                 $.ajax({
                     type: "POST",
@@ -549,6 +562,7 @@
                     data: JSON.stringify(data),
                     contentType: "application/json",
                     success: function (response) {
+                    	$('#pageLoader').hide();
                         // Show a success message using Swal
                         Swal.fire({
                             icon: 'success',
@@ -561,6 +575,7 @@
                         });
                     },
                     error: function (error) {
+                    	$('#pageLoader').hide();
                         // Show an error message using Swal
                         Swal.fire({
                             icon: 'error',
diff --git a/src/main/resources/templates/modules/callcenterqaqc/qaqcgrievancedashboard.html b/src/main/resources/templates/modules/callcenterqaqc/qaqcgrievancedashboard.html
index fe1d792..36b4969 100644
--- a/src/main/resources/templates/modules/callcenterqaqc/qaqcgrievancedashboard.html
+++ b/src/main/resources/templates/modules/callcenterqaqc/qaqcgrievancedashboard.html
@@ -37,61 +37,61 @@
     }
     
     #closedCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
+    transition: transform 0.2s ease; 
+    cursor: pointer; 
 }
 
 #closedCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
+    transform: scale(1.05); 
+    cursor: pointer; 
 }
 
-#inProgressCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
+/* #inProgressCard {
+    transition: transform 0.2s ease; 
+    cursor: pointer;
 }
 
 #inProgressCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
+    transform: scale(1.05); 
+    cursor: pointer; 
+} */
     
     #redressedCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
+    transition: transform 0.2s ease; 
+    cursor: pointer; 
 }
 
 #redressedCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
+    transform: scale(1.05); 
+    cursor: pointer; 
 }
     
-   #reopenedCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
+/*    #reopenedCard {
+    transition: transform 0.2s ease; 
+    cursor: pointer; 
 }
 
 #reopenedCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}
+    transform: scale(1.05); 
+    cursor: pointer; 
+} */
 
-#withdrawCard{
-	transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */ 
+/* #withdrawCard{
+	transition: transform 0.2s ease; 
+    cursor: pointer;  
 }
 #withdrawCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
-}    
+    transform: scale(1.05); 
+    cursor: pointer; 
+} */    
     #closedCard {
-    transition: transform 0.2s ease; /* Smooth scaling transition */
-    cursor: pointer; /* Default cursor change */
+    transition: transform 0.2s ease; 
+    cursor: pointer; 
 }
 
 #closedCard:hover {
-    transform: scale(1.05); /* Slightly scale up on hover */
-    cursor: pointer; /* Change cursor to hand symbol */
+    transform: scale(1.05); 
+    cursor: pointer; 
 }
 
 </style>
@@ -784,23 +784,23 @@ function loadDashboardData(startDate, endDate) {
             document.getElementById('closedCard').addEventListener('click', function () {
                 handleCardClick(sessionStorage.getItem('closedcount'), 'Closed', '/gcc/callcenterqaqc/admin/qaqcassigntaskagents');
             });
-
+			/*
             document.getElementById('reopenedCard').addEventListener('click', function () {
                 handleCardClick(sessionStorage.getItem('reopenedcount'), 'Reopened', '/gcc/callcenterqaqc/admin/qaqcassigntaskagents');
             });
-
+			
             document.getElementById('inProgressCard').addEventListener('click', function () {
                 handleCardClick(sessionStorage.getItem('inProgressCount'), 'In Progress', '/gcc/callcenterqaqc/admin/qaqcassigntaskagents');
             });
-
+			*/
             document.getElementById('redressedCard').addEventListener('click', function () {
                 handleCardClick(sessionStorage.getItem('redressedCount'), 'Redressed', '/gcc/callcenterqaqc/admin/qaqcassigntaskagents');
             });
-            
+            /*
             document.getElementById('withdrawCard').addEventListener('click', function () {
                 handleCardClick(sessionStorage.getItem('withdrawCount'), 'withdraw', '/gcc/callcenterqaqc/admin/qaqcassigntaskagents');
             });
-
+			*/
             // Update UI with fetched data
             document.getElementById('totalComplaints').textContent = data["Total Complaints"] || "0";
             document.getElementById('inProgressCount').textContent = data["In Progress"] || "0";
diff --git a/src/main/resources/templates/modules/callcenterqaqc/socialmediacomplaints.html b/src/main/resources/templates/modules/callcenterqaqc/socialmediacomplaints.html
index ac87387..86cc3d6 100644
--- a/src/main/resources/templates/modules/callcenterqaqc/socialmediacomplaints.html
+++ b/src/main/resources/templates/modules/callcenterqaqc/socialmediacomplaints.html
@@ -124,6 +124,17 @@
 						                    <input type="date" id="endDate" class="form-control">
 										</div>
 										
+										<div class="col-sm-2 mb-2">
+								            <label for="regiondropdown" style="font-size: medium;">Region:</label>
+								            <select id="regiondropdown" class="form-control">
+								            <option value="">Select</option>
+								            <option value="North Region">North Region</option>
+								            <option value="Central Region">Central Region</option>
+								            <option value="South Region">South Region</option>
+								            
+											</select>
+										</div>
+										
 										<div class="col-sm-2 mb-2">
 								            <label for="stsdropdown" style="font-size: medium;">Status:</label>
 								            <select id="stsdropdown" class="form-control">
@@ -283,6 +294,8 @@
 	    const complaintGroupDropdown = document.getElementById('dropdown4');
 	    const complaintModeDropdown = document.getElementById('dropdown3');
 	    const complaintZoneDropdown = document.getElementById('dropdown2');
+	    const regionDropdown = document.getElementById('regiondropdown');
+	    let allZones = [];
 
 	    // Load Complaint Groups
 	    fetch('/gcc/api/callcenterqaqc/getComplaintGroup') 
@@ -327,21 +340,40 @@
 	    });
 	    	    
 	    
-	 // Load all zones 
+	 // Load all zones and store them globally
 	    fetch('/gcc/api/callcenterqaqc/getZones') 
-	    .then(response => response.json())
-	    .then(data => {
-	        // Clear existing options
+	        .then(response => response.json())
+	        .then(data => {
+	            allZones = data; // Store zones globally
+	            updateZoneDropdown(); // Populate zones initially
+	        })
+	        .catch(error => console.error('Error fetching complaint zones:', error));
+
+	    // Event Listener for Region Dropdown Change
+	    regionDropdown.addEventListener('change', updateZoneDropdown);
+
+	    // Function to update Zone Dropdown based on Region selection
+	    function updateZoneDropdown() {
+	        const selectedRegion = regionDropdown.value;
 	        complaintZoneDropdown.innerHTML = `<option value="">Select</option>`;
 
-	        // Add options from the API response
-	        data.forEach(complaintZone => {
-	        	complaintZoneDropdown.innerHTML += `<option value="${complaintZone}">${complaintZone}</option>`;
+	        let filteredZones = [];
+
+	        if (selectedRegion === "North Region") {
+	            filteredZones = allZones.filter(zone => zone >= "N01" && zone <= "N05");
+	        } else if (selectedRegion === "Central Region") {
+	            filteredZones = allZones.filter(zone => zone >= "N06" && zone <= "N10");
+	        } else if (selectedRegion === "South Region") {
+	            filteredZones = allZones.filter(zone => zone >= "N11" && zone <= "N15");
+	        } else {
+	            // Show all if no region is selected
+	            filteredZones = allZones;
+	        }
+
+	        filteredZones.forEach(zone => {
+	            complaintZoneDropdown.innerHTML += `<option value="${zone}">${zone}</option>`;
 	        });
-	    })
-	    .catch(error => {
-	        console.error('Error fetching complaint groups:', error);
-	    });
+	    }
 	 
 	    const today = new Date();
 	    const year = today.getFullYear();
@@ -485,12 +517,14 @@
      	    let group= document.getElementById('dropdown4').value;
      	 	let type= document.getElementById('dropdown1').value;    	    
      	    let zone= document.getElementById('dropdown2').value;
+     	   let region=document.getElementById('regiondropdown').value;
      	    
      	   console.log("startdate: ",startDate);
     	   console.log("enddate: ",endDate);
     	   console.log("status: ",status);
     	   console.log("group: ",group);
     	   console.log("type: ",type);
+    	   console.log("region: ",region);
     	  
     	   console.log("zone: ",zone);
     	   if (!startDate && !endDate) {
@@ -509,7 +543,8 @@
     	        endDate: endDate,
     	        status: status,
     	        group: group,
-    	        type: type,    	        
+    	        type: type,
+    	        region:region,
     	        zone: zone
     	    });
     	   $('#pageLoader').show();
diff --git a/src/main/resources/templates/modules/cdwaste/approval.html b/src/main/resources/templates/modules/cdwaste/approval.html
index 1dd91fb..86d7644 100644
--- a/src/main/resources/templates/modules/cdwaste/approval.html
+++ b/src/main/resources/templates/modules/cdwaste/approval.html
@@ -1,6 +1,58 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 <head th:replace="~{fragments/modules/base/head :: head}"></head>
+
+<style>
+
+/* Main container */
+.container {
+    display: flex;
+    flex-direction: column;
+    gap: 15px;
+    width: 100%;
+}
+
+/* Row container to align 2 fields per row */
+.labelitems {
+    display: flex;
+    justify-content: space-between; /* Evenly distributes fields */
+    gap: 15px;
+}
+
+/* Individual field wrapper */
+.field-container {
+    display: flex;
+    align-items: center;
+    flex: 1; /* Ensures equal spacing */
+}
+
+/* Label styling */
+.field-label {
+    width: 120px;
+    font-weight: bold;
+    font-size:14px;
+}
+
+/* Input box styling */
+.field-input {
+    width: 200px; /* Adjusted width */
+    padding: 5px;
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    background-color: #f9f9f9;
+    font-size: 14px;
+}
+
+.modal-body {
+    max-height: 70vh; 
+    overflow-y: auto; 
+    overflow-x: hidden; 
+    padding-right: 15px; 
+}
+
+</style>
+
+
 <body>
     <div class="wrapper">
         <!-- Header -->
@@ -39,9 +91,9 @@
                     <div class="row">
                         <div class="col-md-12">
                             <div class="card">
-                             <div class="card-header">
+                             <div class="card-header" >
 				                				                
-				          
+				          <h5 style="font-weight:bold;">Approved List</h5>
 				                
 				            </div>
                                 <div class="card-block">
@@ -49,43 +101,38 @@
                                         <table id="worksDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="99.5%">
                                            <thead class="thead-dark">
         <tr role="row">
-            <th>S.No</th> <!-- Auto-increment index -->
-            <th>Name</th>
-            <th>Mobile No</th>
-            <th>Address</th>
-            <th>Vehicle Number</th>
-            <th>Vehicle Type</th>
-            <th>Accepted Date</th>
-            <th>Accepted By</th>
-            <th>Register ID</th>
+            <th class="text-center">S.No</th> <!-- Auto-increment index -->
+            <th class="text-center">Name</th>
+            <th class="text-center">Mobile No</th>
+            <th class="text-center">Address</th>
+            <th class="text-center">Vehicle Number</th>
+            <th class="text-center">Vehicle Type</th>
+           <!--  <th class="text-center">Accepted Date</th> -->
+            <th class="text-center">Accepted By</th>
+            <th class="text-center">Register ID</th>
+            <th class="text-center">Actions</th>
         </tr>
     </thead>
     <tbody>
         <tr th:each="approval, i : ${approvalDetails}">
-            <td th:text="${i.count}">0</td> <!-- Index counter -->
-            <td th:text="${approval.name}">Name</td>
-            <td th:text="${approval.mobile_no}">Mobile No</td>
-            <td th:text="${approval.address}">Address</td>
-            <td th:text="${approval.vehicle_num}">Vehicle Number</td>
-            <td th:text="${approval.vehicletype}">Vehicle Type</td>
-            <td th:text="${approval.accepteddate}">Accepted Date</td>
-            <td th:text="${approval.acceptedby}">Accepted By</td>
-            <td th:text="${approval.register_id}">Register ID</td>
+            <td class="text-center" th:text="${i.count}">0</td> <!-- Index counter -->
+            <td class="text-center" th:text="${approval.name}">Name</td>
+            <td class="text-center" th:text="${approval.mobile_no}">Mobile No</td>
+            <td class="text-center" th:text="${approval.address}">Address</td>
+            <td class="text-center" th:text="${approval.vehicle_num}">Vehicle Number</td>
+            <td class="text-center" th:text="${approval.vehicletype}">Vehicle Type</td>
+            <!-- <td class="text-center" th:text="${approval.accept}">Accepted Date</td> -->
+            <td class="text-center" th:text="${approval.acceptedby}">Accepted By</td>
+            <td class="text-center" th:text="${approval.register_id}">Register ID</td>
+            <td class="text-center">
+             <button class="btn btn-info" 
+				 th:attr="onclick='showModal(' + ${approval['register_id']} + ')'" 
+							             th:text="'View Details'">
+							                    </button>
+							                     </td>
         </tr>
     </tbody>
-    <tfoot class="thead-dark">
-        <tr>
-            <th>S.No</th>
-            <th>Name</th>
-            <th>Mobile No</th>
-            <th>Address</th>
-            <th>Vehicle Number</th>
-            <th>Vehicle Type</th>
-            <th>Accepted Date</th>
-            <th>Accepted By</th>
-            <th>Register ID</th>
-        </tr>
-    </tfoot>
+   
                                         </table>
                                     </div>
                                 </div>
@@ -93,6 +140,55 @@
                         </div>
                     </div>
                 </div>
+                
+                <div class="modal fade" id="detailModal" tabindex="-1" role="dialog" aria-labelledby="detailModalLabel" aria-hidden="true">
+						    <div class="modal-dialog modal-lg" role="document">
+						        <div class="modal-content">
+						            <div class="modal-header">
+						                <h5 class="modal-title" id="detailModalLabel">Register id: <span id="modal_register_id"></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 id="cduserinfoHTML">
+						                </div>
+						                 <hr>
+						                <div class="row labelitems">
+						                    <div class="col-md-12">
+						                        <p><strong>Adhaar Photo/Document:</strong></p>
+						                        <div id="modal_adhaar_container"></div>
+						                    </div>
+						                    <div class="col-md-12">
+						                        <p><strong>User Photo:</strong></p>
+						                        <div id="modal_user_photo_container"></div>
+						                    </div>
+						                    <div class="col-md-12">
+						                        <p><strong>RC Book Document:</strong></p>
+						                        <div id="modal_vehicle_doc_container"></div>
+						                    </div>
+						                    <div class="col-md-12">
+						                        <p><strong>Lease Vehicle Document:</strong></p>
+						                        <div id="modal_leasevehicle_doc_container"></div>
+						                    </div>
+						                </div>
+						
+						                <!-- Rejection Section -->
+						                 <!--<div id="rejectionSection" style="display: none; margin-top: 20px;">
+						                    <p><strong>Reason for Rejection <span class="text-danger">*</span></strong></p>
+						                    <textarea id="rejectionReason" rows="4" class="form-control"></textarea>
+						                    <button type="button" class="btn btn-danger mt-2" onclick="confirmRejection()">Confirm</button>
+						                </div> -->
+						            </div>
+						            <div class="modal-footer">
+						                
+						                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+						            </div>
+						        </div>
+						    </div>
+						</div>
+                
+                
             </div>
 
             <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
@@ -163,13 +259,143 @@
         });
        
     });
-    	   
+    
+    //function to show the view details
+    
+    function showModal(registerId) {
+        $.ajax({
+            url: '/gcc/api/registration/pendingbyid?registerId=' + registerId,
+            method: 'GET',
+            dataType: 'json',
+            success: function(data) {
+                console.log(data);
+                // Check if data is not empty
+                if (data.length > 0) {
+                    // Access the first item in the array
+                    const userData = data[0]; // Get the first object from the array
+                    
+                    const formattedAcceptedDate = userData.accepteddate ? userData.accepteddate.split('T')[0] : '';
 
+	                
+                    let userinfo = `
+                    	<div style="display: flex; flex-direction: column; gap: 15px;">
+                	    <div class="container">
+                	        <!-- First Row -->
+                	        <div class="row">
+                	            <div class="field-container">
+                	                <label class="field-label">Name:</label>
+                	                <input type="text" id="modal_name" value="${userData.name}" readonly class="field-input">
+                	            </div>
 
+                	            <div class="field-container">
+                	                <label class="field-label">Mobile No:</label>
+                	                <input type="text" id="modal_mobile_no" value="${userData.mobile_no}" readonly class="field-input">
+                	            </div>
+                	        </div>
 
-    
+                	        <!-- Second Row -->
+                	        <div class="row">
+                	            <div class="field-container">
+                	                <label class="field-label">Address:</label>
+                	                <input type="text" id="modal_address" value="${userData.address}" readonly class="field-input">
+                	            </div>
+
+                	            <div class="field-container">
+                	                <label class="field-label">Vehicle No:</label>
+                	                <input type="text" id="modal_vehicle_num" value="${userData.vehicle_num}" readonly class="field-input">
+                	            </div>
+                	        </div>
+
+                	        <!-- Third Row -->
+                	        <div class="row">
+                	            <div class="field-container">
+                	                <label class="field-label">Vehicle Type:</label>
+                	                <input type="text" id="modal_vehicletype" value="${userData.vehicletype}" readonly class="field-input">
+                	            </div>
+
+                	            <div class="field-container">
+                	                <label class="field-label">Ref Num:</label>
+                	                <input type="text" id="modal_ref_num" value="${userData.reference_num}" readonly class="field-input">
+                	            </div>
+                	        </div>
+                	        
+                	        <!-- Fourth Row -->
+                	        <div class="row">
+                	            <div class="field-container">
+                	                <label class="field-label">Accepted Date:</label>
+                	                <input type="date" id="modal_accepteddate" value="${formattedAcceptedDate}" readonly class="field-input">
+                	            </div>
+                	        </div>
+                	        
+                	    </div>
+                	</div>`;
 
+                    $("#cduserinfoHTML").html(userinfo);
+                    $("#modal_register_id").html(userData.register_id);
+
+                    console.log(userData.adhaarurl);
+				    
+                    // Display the files (Adhaar, User Photo, Vehicle Document)
+                    if (userData.adhaarurl!=null) {
+                    	displayFile('modal_adhaar_container', userData.adhaarurl);
+                    }
+                    if (userData.user_photourl) {
+                    	displayFile('modal_user_photo_container', userData.user_photourl);
+                    }
+                    if (userData.rcbookurl) {
+                    	displayFile('modal_vehicle_doc_container', userData.rcbookurl);
+                    }
+                    if (userData.leasedocurl) {
+                    	displayFile('modal_leasevehicle_doc_container', userData.leasedocurl);
+                    }
+                    
+                    // Hide rejection section initially
+                   /*  document.getElementById('rejectionSection').style.display = 'none';
+                    document.getElementById('rejectionReason').value = ''; // Clear previous input */
+                    // Show the modal
+                    $('#detailModal').modal({
+                        backdrop: 'static',
+                        keyboard: false
+                    });
+                } else {
+                    // Handle case where no data is returned
+                    alert('No data found for this registration ID.');
+                }
+            },
+            error: function(err) {
+                console.error(err);
+                alert('Failed to fetch data');
+            }
+        });
+    }
+    
+    //display file function
+    
+		    function displayFile(containerId, filePath) {
+		    const container = document.getElementById(containerId);
+		
+		    // Ensure the container exists before proceeding
+		    if (!container) {
+		        console.error(`Element with ID '${containerId}' not found.`);
+		        return;
+		    }
+		
+		    // Ensure filePath is valid before attempting to display
+		    if (!filePath) {
+		        container.innerHTML = '<p class="text-danger">No document available</p>';
+		        return;
+		    }
+		
+		    const fileExtension = filePath.split('.').pop().toLowerCase();
+		    console.log('Full Path:', filePath);
+		
+		    if (fileExtension === 'pdf') {
+		        container.innerHTML = `<embed src="${filePath}" type="application/pdf" width="100%" height="500px" />`;
+		    } else {
+		        container.innerHTML = `<img src="${filePath}" alt="Document" class="img-fluid img-thumbnail" />`;
+		    }
+		}
 
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/resources/templates/modules/cdwaste/pending.html b/src/main/resources/templates/modules/cdwaste/pending.html
index 74c7203..40c4d20 100644
--- a/src/main/resources/templates/modules/cdwaste/pending.html
+++ b/src/main/resources/templates/modules/cdwaste/pending.html
@@ -1,6 +1,57 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 <head th:replace="~{fragments/modules/base/head :: head}"></head>
+
+<style>
+
+/* Main container */
+.container {
+    display: flex;
+    flex-direction: column;
+    gap: 15px;
+    width: 100%;
+}
+
+/* Row container to align 2 fields per row */
+.labelitems {
+    display: flex;
+    justify-content: space-between; /* Evenly distributes fields */
+    gap: 15px;
+}
+
+/* Individual field wrapper */
+.field-container {
+    display: flex;
+    align-items: center;
+    flex: 1; /* Ensures equal spacing */
+}
+
+/* Label styling */
+.field-label {
+    width: 120px;
+    font-weight: bold;
+    font-size:14px;
+}
+
+/* Input box styling */
+.field-input {
+    width: 200px; /* Adjusted width */
+    padding: 5px;
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    background-color: #f9f9f9;
+    font-size: 14px;
+}
+
+.modal-body {
+    max-height: 70vh; 
+    overflow-y: auto; /* Enables vertical scrolling */
+    overflow-x: hidden; /* Hides horizontal scrolling */
+    padding-right: 15px; /* Prevents content cutoff */
+}
+
+
+</style>
 <body>
     <div class="wrapper">
         <!-- Header -->
@@ -41,22 +92,20 @@
                             <div class="card">
                              <div class="card-header">
 				                				                
-				          
+         				          <h5 style="font-weight:bold;"> Pending List</h5>
 				                
 				            </div>
 				            
-				            
-				            
 							<div class="card-block">
 							    <!-- Show the table structure -->
 							    <table id="worksDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="99.5%">
 							        <thead class="thead-dark">
 							            <tr role="row">
-							                <th>S.NO</th> <!-- Auto-incrementing index -->
-							                <th>Name</th>
-							                <th>Mobile No</th>
-							                <th>Address</th>
-							                <th>Actions</th>
+							                <th class="text-center">S.NO</th> <!-- Auto-incrementing index -->
+							                <th class="text-center">Name</th>
+							                <th class="text-center">Mobile No</th>
+							                <th class="text-center">Address</th>
+							                <th class="text-center">Actions</th>
 							            </tr>
 							        </thead>
 							        <tbody>
@@ -64,10 +113,10 @@
 							           
 							            <!-- Iterate over userDetails to display pending registrations -->
 							            <tr th:each="pendinglist, status : ${userDetails}">
-							                <td th:text="${status.index + 1}">1</td> <!-- Auto-incrementing index -->
-							                <td th:text="${pendinglist['name']}">Name</td>
-							                <td th:text="${pendinglist['mobile_no']}">Mobile No</td>
-							                <td th:text="${pendinglist['address']}">Address</td>
+							                <td class="text-center" th:text="${status.index + 1}">1</td> <!-- Auto-incrementing index -->
+							                <td class="text-center" th:text="${pendinglist['name']}">Name</td>
+							                <td class="text-center" th:text="${pendinglist['mobile_no']}">Mobile No</td>
+							                <td class="text-center" th:text="${pendinglist['address']}">Address</td>
 							                <td class="text-center">
 							                    <button class="btn btn-info" 
 							                            th:attr="onclick='showModal(' + ${pendinglist['register_id']} + ')'" 
@@ -76,15 +125,7 @@
 							                </td>
 							            </tr>
 							        </tbody>
-							        <tfoot class="thead-dark">
-							            <tr>
-							                <th>S.NO</th>
-							                <th>Name</th>
-							                <th>Mobile No</th>
-							                <th>Address</th>
-							                <th>Actions</th>
-							            </tr>
-							        </tfoot>
+							       
 							    </table>
 							</div>
 
@@ -99,7 +140,7 @@
                 <!-- Modal -->
 					<!-- Modal -->
 				<div class="modal fade" id="detailModal" tabindex="-1" role="dialog" aria-labelledby="detailModalLabel" aria-hidden="true">
-						    <div class="modal-dialog modal-lg" role="document">
+						    <div class="modal-dialog modal-lg modal-dialog-scrollable" role="document">
 						        <div class="modal-content">
 						            <div class="modal-header">
 						                <h5 class="modal-title" id="detailModalLabel">Register id: <span id="modal_register_id"></span></h5>
@@ -110,25 +151,29 @@
 						            <div class="modal-body">
 						                <div id="cduserinfoHTML">
 						                </div>
-						                
-						                <div class="row">
+						                <hr>
+						                <div class="row labelitems" >
 						                    <div class="col-md-12">
 						                        <p><strong>Adhaar Photo/Document:</strong></p>
 						                        <div id="modal_adhaar_container"></div>
 						                    </div>
+						                   
 						                    <div class="col-md-12">
 						                        <p><strong>User Photo:</strong></p>
 						                        <div id="modal_user_photo_container"></div>
 						                    </div>
+						                    
 						                    <div class="col-md-12">
 						                        <p><strong>RC Book Document:</strong></p>
 						                        <div id="modal_vehicle_doc_container"></div>
 						                    </div>
+					
 						                    <div class="col-md-12">
 						                        <p><strong>Lease Vehicle Document:</strong></p>
 						                        <div id="modal_leasevehicle_doc_container"></div>
 						                    </div>
 						                </div>
+						               	             
 						
 						                <!-- Rejection Section -->
 						                <div id="rejectionSection" style="display: none; margin-top: 20px;">
@@ -138,8 +183,8 @@
 						                </div>
 						            </div>
 						            <div class="modal-footer">
-						                <button type="button" class="btn btn-success" onclick="acceptAction()">Accept</button>
-						                <button type="button" class="btn btn-warning" onclick="showRejectionSection()">Reject</button>
+						                <button type="button" class="btn btn-success" onclick="acceptAction()" id="acceptbutton">Accept</button>
+						                <button type="button" class="btn btn-warning" onclick="showRejectionSection()" id="rejectbutton">Reject</button>
 						                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
 						            </div>
 						        </div>
@@ -237,14 +282,50 @@
                     // Access the first item in the array
                     const userData = data[0]; // Get the first object from the array
 	                
-                    let userinfo = ``;
-                    
-                    userinfo = `<p><strong>Name:</strong> <span id="modal_name">${userData.name}</span></p>
-				                <p><strong>Mobile No:</strong> <span id="modal_mobile_no">${userData.mobile_no}</span></p>
-				                <p><strong>Address:</strong> <span id="modal_address">${userData.address}</span></p>
-				                <p><strong>Vehicle No:</strong> <span id="modal_vehicle_num">${userData.vehicle_num}</span></p> <!-- Added Vehicle No -->
-				                <p><strong>Vehicle Type:</strong> <span id="modal_vehicletype">${userData.vehicletype}</span></p>
-				                <p ><strong>Ref Num:</strong> <span id="modal_ref_num">${userData.reference_num}</span></p>`;
+                    let userinfo = `
+                    	<div style="display: flex; flex-direction: column; gap: 15px;">
+                    	    <div class="container">
+                    	        <!-- First Row -->
+                    	        <div class="row">
+                    	            <div class="field-container">
+                    	                <label class="field-label">Name:</label>
+                    	                <input type="text" id="modal_name" value="${userData.name}" readonly class="field-input">
+                    	            </div>
+
+                    	            <div class="field-container">
+                    	                <label class="field-label">Mobile No:</label>
+                    	                <input type="text" id="modal_mobile_no" value="${userData.mobile_no}" readonly class="field-input">
+                    	            </div>
+                    	        </div>
+
+                    	        <!-- Second Row -->
+                    	        <div class="row">
+                    	            <div class="field-container">
+                    	                <label class="field-label">Address:</label>
+                    	                <input type="text" id="modal_address" value="${userData.address}" readonly class="field-input">
+                    	            </div>
+
+                    	            <div class="field-container">
+                    	                <label class="field-label">Vehicle No:</label>
+                    	                <input type="text" id="modal_vehicle_num" value="${userData.vehicle_num}" readonly class="field-input">
+                    	            </div>
+                    	        </div>
+
+                    	        <!-- Third Row -->
+                    	        <div class="row">
+                    	            <div class="field-container">
+                    	                <label class="field-label">Vehicle Type:</label>
+                    	                <input type="text" id="modal_vehicletype" value="${userData.vehicletype}" readonly class="field-input">
+                    	            </div>
+
+                    	            <div class="field-container">
+                    	                <label class="field-label">Ref Num:</label>
+                    	                <input type="text" id="modal_ref_num" value="${userData.reference_num}" readonly class="field-input">
+                    	            </div>
+                    	        </div>
+                    	    </div>
+                    	</div>`;
+
 				      
 				                $("#cduserinfoHTML").html(userinfo);
 				                
@@ -269,7 +350,6 @@
                     // Hide rejection section initially
                     document.getElementById('rejectionSection').style.display = 'none';
                     document.getElementById('rejectionReason').value = ''; // Clear previous input
-
                     // Show the modal
                     $('#detailModal').modal({
                         backdrop: 'static',
@@ -294,7 +374,9 @@
         const mobileNo = document.getElementById('modal_mobile_no').innerText;
         
         const refNum = document.getElementById('modal_ref_num').innerText;
-
+        
+        $('#acceptbutton').prop('disabled', true);
+        
         $.ajax({
             url: '/gcc/api/registration/acceptbyid',
             method: 'POST',
@@ -302,8 +384,9 @@
                 registerId: registerId
             },
             success: function(response) {
+            	$('#acceptbutton').prop('disabled', false);
                 console.log(response);
-
+				
                 // URL for accepted registration message
                 const acceptMessageUrl = `https://media.smsgupshup.com/GatewayAPI/rest?userid=2000233507&password=h2YjFNcJ&send_to=${mobileNo}&v=1.1&format=json&msg_type=IMAGE&method=SENDMEDIAMESSAGE&caption=Welcome+to+Greater+Chennai+Corporation%2C+%0A%0AYour+Registered+ID+is+%2A${registerId}%2A+.%0AYour+C%26D+waste+registration+has+been+approved+successfully.+%0A%0AFor+downloading+your+ID+card%2C+kindly+click+on+the+button+below+%F0%9F%91%87&media_url=https%3A%2F%2Fres.cloudinary.com%2Fdpub5muar%2Fimage%2Fupload%2Fv1729597847%2Fq2ihjs99puhhwkjzajyo.png&isTemplate=true&buttonUrlParam=userdetail%3Fregister_id%3D${refNum}`; 
                 //https://gccservices.chennaicorporation.gov.in/volunteer/wastecollectors/https://gccservices.chennaicorporation.gov.in/volunteer/wastecollectors/userdetail?register_id=5
@@ -325,6 +408,7 @@
                 });
             },
             error: function(error) {
+            	$('#acceptbutton').prop('disabled', false);
                 console.error(error);
                 Swal.fire({
                     title: 'Error!',
@@ -347,7 +431,6 @@
         const registerId = document.getElementById('modal_register_id').innerText; // Get register_id from the modal
         const rejectionReason = document.getElementById('rejectionReason').value; // Get the rejection reason
         const mobileNo = document.getElementById('modal_mobile_no').innerText; // Get mobile number from the modal
-
         const refNum = document.getElementById('modal_ref_num').innerText;
 
         if (!rejectionReason) {
@@ -359,6 +442,10 @@
             });
             return; // Stop if no reason is provided
         }
+        
+        
+        $('#rejectbutton').prop('disabled', true);
+        
 
         $.ajax({
             url: '/gcc/api/registration/rejectbyid', // API endpoint for rejection
@@ -368,11 +455,12 @@
                 reason: rejectionReason // Pass the rejection reason
             },
             success: function(response) {
+            	
+            	$('#rejectbutton').prop('disabled', false);
             	 // URL for rejected registration
                 const rejectMessageUrl = `https://media.smsgupshup.com/GatewayAPI/rest?userid=2000233507&password=h2YjFNcJ&send_to=${mobileNo}&v=1.1&format=json&msg_type=IMAGE&method=SENDMEDIAMESSAGE&caption=Welcome+to+Greater+Chennai+Corporation%2C%0A%0AYour+Registered+ID+is+%2A${registerId}%2A+.%0AYour+C%26D+waste+registration+has+been+Rejected.+%0A%0AKindly+click+on+the+button+below+for+viewing+the+status%F0%9F%91%87&media_url=https%3A%2F%2Fres.cloudinary.com%2Fdpub5muar%2Fimage%2Fupload%2Fv1729598221%2Fci7ybspyanctl9lackby.jpg&isTemplate=true&buttonUrlParam=userdetail%3Fregister_id%3D${refNum}`;
                 
                 //const acceptMessageUrl = `https://media.smsgupshup.com/GatewayAPI/rest?userid=2000233507&password=h2YjFNcJ&send_to=${mobileNo}&v=1.1&format=json&msg_type=IMAGE&method=SENDMEDIAMESSAGE&caption=Welcome+to+Greater+Chennai+Corporation%2C+%0A%0AYour+Registered+ID+is+%2A${registerId}%2A+.%0AYour+C%26D+waste+registration+has+been+approved+successfully.+%0A%0AFor+downloading+your+ID+card%2C+kindly+click+on+the+button+below+%F0%9F%91%87&media_url=https%3A%2F%2Fgccservices.in%2Fgcc%2Ffiles%2Fc_d%2F1_approved.jpg&isTemplate=true&buttonUrlParam=userdetail%3Fregister_id%3D${registerId}`;
-
                 sendWhatsAppMessage(mobileNo, rejectMessageUrl); // Call the WhatsApp function to send rejection message
                 Swal.fire({
                     title: 'Success!',
@@ -388,6 +476,7 @@
                 });
             },
             error: function(error) {
+            	$('#rejectbutton').prop('disabled', false);
                 console.error(error);
                 Swal.fire({
                     title: 'Error!',
@@ -443,4 +532,6 @@
 
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>
+
+
diff --git a/src/main/resources/templates/modules/cdwaste/rejected.html b/src/main/resources/templates/modules/cdwaste/rejected.html
index b0d160d..b426978 100644
--- a/src/main/resources/templates/modules/cdwaste/rejected.html
+++ b/src/main/resources/templates/modules/cdwaste/rejected.html
@@ -1,6 +1,62 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 <head th:replace="~{fragments/modules/base/head :: head}"></head>
+
+<style>
+
+/* Main container */
+.container {
+    display: flex;
+    flex-direction: column;
+    gap: 15px;
+    width: 100%;
+}
+
+/* Row container to align 2 fields per row */
+.labelitems {
+    display: flex;
+    justify-content: space-between; /* Evenly distributes fields */
+    gap: 15px;
+}
+
+/* Individual field wrapper */
+.field-container {
+    display: flex;
+    align-items: center;
+    flex: 1; /* Ensures equal spacing */
+}
+
+/* Label styling */
+.field-label {
+    width: 120px;
+    font-weight: bold;
+    font-size:14px;
+}
+
+/* Input box styling */
+.field-input {
+    width: 200px; /* Adjusted width */
+    padding: 5px;
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    background-color: #f9f9f9;
+    font-size: 14px;
+}
+
+.modal-body {
+    max-height: 70vh; 
+    overflow-y: auto; 
+    overflow-x: hidden; 
+    padding-right: 15px; 
+}
+
+
+
+</style>
+
+
+
+
 <body>
     <div class="wrapper">
         <!-- Header -->
@@ -40,53 +96,51 @@
                         <div class="col-md-12">
                             <div class="card">
                              <div class="card-header">
-
+									<h5 style="font-weight:bold;"> Rejected List</h5>
 				            </div>
                                 <div class="card-block">
                                     <div>
                                         <table id="worksDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="99.5%">
                                            <thead class="thead-dark">
 										        <tr role="row">
-										            <th>S.No</th> <!-- Auto-increment index -->
-										            <th>Name</th>
-										            <th>Mobile No</th>
-										            <th>Address</th>
-										            <th>Vehicle Number</th>
-										            <th>Vehicle Type</th>
-										            <th>Rejected Date</th>
-										            <th>Rejected By</th>
-										            <th>Reason</th>
-										            <th>Register ID</th>
+										            <th class="text-center">S.No</th> <!-- Auto-increment index -->
+										            <th class="text-center">Name</th>
+										            <th class="text-center">Mobile No</th>
+										            <th class="text-center">Address</th>
+										            <th class="text-center">Vehicle Number</th>
+										            <th class="text-center">Vehicle Type</th>
+										            <!-- <th class="text-center">Rejected Date</th> -->
+										            <th class="text-center">Rejected By</th>
+										            <th class="text-center">Reason</th>
+										            <th class="text-center">Register ID</th>
+										            <th class="text-center">Actions</th>
 										        </tr>
 										    </thead>
 										    <tbody>
 										        <tr th:each="rejected, i : ${rejectedDetails}">
-										            <td th:text="${i.count}">0</td> <!-- Index counter -->
-										            <td th:text="${rejected.name}">Name</td>
-										            <td th:text="${rejected.mobile_no}">Mobile No</td>
-										            <td th:text="${rejected.address}">Address</td>
-										            <td th:text="${rejected.vehicle_num}">Vehicle Number</td>
-										            <td th:text="${rejected.vehicletype}">Vehicle Type</td>
-										            <td th:text="${rejected.accepteddate}">Rejected Date</td>
-										            <td th:text="${rejected.acceptedby}">Rejected By</td>
-										            <td th:text="${rejected.reason}">Reason</td>
-										            <td th:text="${rejected.register_id}">Register ID</td>
+										            <td class="text-center" th:text="${i.count}">0</td> <!-- Index counter -->
+										            <td class="text-center" th:text="${rejected.name}">Name</td>
+										            <td class="text-center" th:text="${rejected.mobile_no}">Mobile No</td>
+										            <td class="text-center" th:text="${rejected.address}">Address</td>
+										            <td class="text-center" th:text="${rejected.vehicle_num}">Vehicle Number</td>
+							 			            <td class="text-center" th:text="${rejected.vehicletype}">Vehicle Type</td>
+										           <!-- <td class="text-center" th:text="${rejected.reject}">Rejected Date</td> -->
+										          
+										           <!-- <td class="text-center" 
+													    th:text="${rejected.reject != null} ? ${rejected.reject.split('-')[2]} + '/' + ${rejected.reject.split('-')[1]} + '/' + ${rejected.reject.split('-')[0]} : ''">
+													</td> -->
+										            <td class="text-center" th:text="${rejected.acceptedby}">Rejected By</td>
+										            <td class="text-center" th:text="${rejected.reason}">Reason</td>
+										            <td class="text-center" th:text="${rejected.register_id}">Register ID</td>
+										            <td class="text-center">
+												             <button class="btn btn-info" 
+																 th:attr="onclick='showModal(' + ${rejected['register_id']} + ')'" 
+														             th:text="'View Details'">
+														      </button>
+							                     </td>
 										        </tr>
 										    </tbody>
-										    <tfoot class="thead-dark">
-										        <tr>
-										            <th>S.No</th>
-										            <th>Name</th>
-										            <th>Mobile No</th>
-										            <th>Address</th>
-										            <th>Vehicle Number</th>
-										            <th>Vehicle Type</th>
-										            <th>Rejected Date</th>
-										            <th>Rejected By</th>
-										            <th>Reason</th>
-										            <th>Register ID</th>
-										        </tr>
-										    </tfoot>
+
                                         </table>
                                     </div>
                                 </div>
@@ -94,6 +148,56 @@
                         </div>
                     </div>
                 </div>
+                
+                
+                <div class="modal fade" id="detailModal" tabindex="-1" role="dialog" aria-labelledby="detailModalLabel" aria-hidden="true">
+						    <div class="modal-dialog modal-lg" role="document">
+						        <div class="modal-content">
+						            <div class="modal-header">
+						                <h5 class="modal-title" id="detailModalLabel">Register id: <span id="modal_register_id"></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 id="cduserinfoHTML">
+						                </div>
+						                 <hr>
+						                <div class="row labelitems">
+						                    <div class="col-md-12">
+						                        <p><strong>Adhaar Photo/Document:</strong></p>
+						                        <div id="modal_adhaar_container"></div>
+						                    </div>
+						                    <div class="col-md-12">
+						                        <p><strong>User Photo:</strong></p>
+						                        <div id="modal_user_photo_container"></div>
+						                    </div>
+						                    <div class="col-md-12">
+						                        <p><strong>RC Book Document:</strong></p>
+						                        <div id="modal_vehicle_doc_container"></div>
+						                    </div>
+						                    <div class="col-md-12">
+						                        <p><strong>Lease Vehicle Document:</strong></p>
+						                        <div id="modal_leasevehicle_doc_container"></div>
+						                    </div>
+						                </div>
+						
+						                <!-- Rejection Section -->
+						                 <!--<div id="rejectionSection" style="display: none; margin-top: 20px;">
+						                    <p><strong>Reason for Rejection <span class="text-danger">*</span></strong></p>
+						                    <textarea id="rejectionReason" rows="4" class="form-control"></textarea>
+						                    <button type="button" class="btn btn-danger mt-2" onclick="confirmRejection()">Confirm</button>
+						                </div> -->
+						            </div>
+						            <div class="modal-footer">
+						                
+						                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+						            </div>
+						        </div>
+						    </div>
+						</div>
+                
+                
             </div>
 
             <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
@@ -165,12 +269,141 @@
        
     });
     	   
+    
+//function to show the view details
+    
+    function showModal(registerId) {
+        $.ajax({
+            url: '/gcc/api/registration/pendingbyid?registerId=' + registerId,
+            method: 'GET',
+            dataType: 'json',
+            success: function(data) {
+                console.log(data);
+                // Check if data is not empty
+                if (data.length > 0) {
+                    // Access the first item in the array
+                    const userData = data[0]; // Get the first object from the array
+                    const formattedRejectedDate = userData.accepteddate ? userData.accepteddate.split('T')[0] : '';
+	                
+                    let userinfo = `
+                    	<div style="display: flex; flex-direction: column; gap: 15px;">
+                	    <div class="container">
+                	        <!-- First Row -->
+                	        <div class="row">
+                	            <div class="field-container">
+                	                <label class="field-label">Name:</label>
+                	                <input type="text" id="modal_name" value="${userData.name}" readonly class="field-input">
+                	            </div>
 
+                	            <div class="field-container">
+                	                <label class="field-label">Mobile No:</label>
+                	                <input type="text" id="modal_mobile_no" value="${userData.mobile_no}" readonly class="field-input">
+                	            </div>
+                	        </div>
 
+                	        <!-- Second Row -->
+                	        <div class="row">
+                	            <div class="field-container">
+                	                <label class="field-label">Address:</label>
+                	                <input type="text" id="modal_address" value="${userData.address}" readonly class="field-input">
+                	            </div>
 
-    
+                	            <div class="field-container">
+                	                <label class="field-label">Vehicle No:</label>
+                	                <input type="text" id="modal_vehicle_num" value="${userData.vehicle_num}" readonly class="field-input">
+                	            </div>
+                	        </div>
+
+                	        <!-- Third Row -->
+                	        <div class="row">
+                	            <div class="field-container">
+                	                <label class="field-label">Vehicle Type:</label>
+                	                <input type="text" id="modal_vehicletype" value="${userData.vehicletype}" readonly class="field-input">
+                	            </div>
 
+                	            <div class="field-container">
+                	                <label class="field-label">Ref Num:</label>
+                	                <input type="text" id="modal_ref_num" value="${userData.reference_num}" readonly class="field-input">
+                	            </div>
+                	        </div>
+                	        
+                	        <!-- Fourth Row -->
+                	        <div class="row">
+                	            <div class="field-container">
+                	                <label class="field-label">Rejected Date:</label>
+                	                <input type="date" id="modal_accepteddate" value="${formattedRejectedDate}" readonly class="field-input">
+                	            </div>
+                	        </div>
+                	        
+                	    </div>
+                	</div>`;
+
+                    $("#cduserinfoHTML").html(userinfo);
+                    $("#modal_register_id").html(userData.register_id);
+
+                    console.log(userData.adhaarurl);
+				    
+                    // Display the files (Adhaar, User Photo, Vehicle Document)
+                    if (userData.adhaarurl!=null) {
+                    	displayFile('modal_adhaar_container', userData.adhaarurl);
+                    }
+                    if (userData.user_photourl) {
+                    	displayFile('modal_user_photo_container', userData.user_photourl);
+                    }
+                    if (userData.rcbookurl) {
+                    	displayFile('modal_vehicle_doc_container', userData.rcbookurl);
+                    }
+                    if (userData.leasedocurl) {
+                    	displayFile('modal_leasevehicle_doc_container', userData.leasedocurl);
+                    }
+                    
+                    // Hide rejection section initially
+                   /*  document.getElementById('rejectionSection').style.display = 'none';
+                    document.getElementById('rejectionReason').value = ''; // Clear previous input */
+                    // Show the modal
+                    $('#detailModal').modal({
+                        backdrop: 'static',
+                        keyboard: false
+                    });
+                } else {
+                    // Handle case where no data is returned
+                    alert('No data found for this registration ID.');
+                }
+            },
+            error: function(err) {
+                console.error(err);
+                alert('Failed to fetch data');
+            }
+        });
+    }
+    
+    //display file function
+    
+		    function displayFile(containerId, filePath) {
+		    const container = document.getElementById(containerId);
+		
+		    // Ensure the container exists before proceeding
+		    if (!container) {
+		        console.error(`Element with ID '${containerId}' not found.`);
+		        return;
+		    }
+		
+		    // Ensure filePath is valid before attempting to display
+		    if (!filePath) {
+		        container.innerHTML = '<p class="text-danger">No document available</p>';
+		        return;
+		    }
+		
+		    const fileExtension = filePath.split('.').pop().toLowerCase();
+		    console.log('Full Path:', filePath);
+		
+		    if (fileExtension === 'pdf') {
+		        container.innerHTML = `<embed src="${filePath}" type="application/pdf" width="100%" height="500px" />`;
+		    } else {
+		        container.innerHTML = `<img src="${filePath}" alt="Document" class="img-fluid img-thumbnail" />`;
+		    }
+		}
 
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/resources/templates/modules/com_petition/petition_list.html b/src/main/resources/templates/modules/com_petition/petition_list.html
index e00581f..8ba2897 100644
--- a/src/main/resources/templates/modules/com_petition/petition_list.html
+++ b/src/main/resources/templates/modules/com_petition/petition_list.html
@@ -64,6 +64,7 @@
 						                                <th class="text-center">Date</th>
 						                                <th class="text-center">Status</th>
 						                                <th class="text-center">Petition Type</th>
+						                                <th class="text-center">Remarks</th>
 						                                <th class="text-center no-sort no-exportable no-print">Action</th>
 						                             </tr>
                                                 </thead>
@@ -83,6 +84,8 @@
 						                                <th class="text-center">Date</th>
 						                                <th class="text-center">Status</th>
 						                                <th class="text-center">Department</th>
+						                                <th class="text-center">Nature Of Complaint</th>
+						                                <th class="text-center">Remarks</th>
 						                                <th class="text-center no-sort no-exportable no-print">Action</th>
 													</tr>
                                                 </tfoot> -->
@@ -264,6 +267,7 @@
 	                    convertdate(row['cdate']),
 	                    row['status'],
 	                    row['petition_type_name'],
+	                    row['remarks'],
 	                    actionHTML
 	                ]).draw(false);
 	            });
diff --git a/src/main/resources/templates/modules/com_petition/petition_view_modal_page.html b/src/main/resources/templates/modules/com_petition/petition_view_modal_page.html
index ceba147..9d52c3d 100644
--- a/src/main/resources/templates/modules/com_petition/petition_view_modal_page.html
+++ b/src/main/resources/templates/modules/com_petition/petition_view_modal_page.html
@@ -46,6 +46,14 @@
 											        <tr>
 											        	<td colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;" id="complaint_with_maping_value"></td>
 											        </tr>
+											        <tr>
+											          <th colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;">குறிப்பு / Remarks:<br>
+											          <p class="fw-semibold mb-0" style="font-weight:normal;" id="remarks_value"></p>
+											          </th>
+											        </tr>
+											        <tr>
+											        	<td colspan="2" style="padding: 0.45rem 0.45rem;border: 0px;" id="remarks_with_value"></td>
+											        </tr>
 											      </tbody>
 											    </table>
 											</div>
diff --git a/src/main/resources/templates/modules/m_petition/petition_list.html b/src/main/resources/templates/modules/m_petition/petition_list.html
index 92c2889..6db50dd 100644
--- a/src/main/resources/templates/modules/m_petition/petition_list.html
+++ b/src/main/resources/templates/modules/m_petition/petition_list.html
@@ -107,7 +107,7 @@
 						                                <th class="text-center">Type of Complaint</th>
 						                                <th class="text-center">Date</th>
 						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Department</th>
+						                                <th class="text-center">Petition Type</th>
 						                                <th class="text-center no-sort no-exportable no-print">Action</th>
 						                             </tr>
                                                 </thead>
@@ -125,7 +125,7 @@
 						                                <th class="text-center">Type of Complaint</th>
 						                                <th class="text-center">Date</th>
 						                                <th class="text-center">Status</th>
-						                                <th class="text-center">Department</th>
+						                                <th class="text-center">Petition Type</th>
 						                                <th class="text-center no-sort no-exportable no-print">Action</th>
 													</tr>
                                                 </tfoot>
@@ -310,7 +310,7 @@
 	                    row['petitioner_complaint_txt'],
 	                    convertdate(row['cdate']),
 	                    row['status'],
-	                    row['created_by'],
+	                    row['petition_type_name'],
 	                    actionHTML
 	                ]).draw(false);
 	            });
diff --git a/src/main/resources/templates/modules/pensioner/.DS_Store b/src/main/resources/templates/modules/pensioner/.DS_Store
new file mode 100644
index 0000000..d608b1f
Binary files /dev/null and b/src/main/resources/templates/modules/pensioner/.DS_Store differ
diff --git a/src/main/resources/templates/modules/pensioner/department/.DS_Store b/src/main/resources/templates/modules/pensioner/department/.DS_Store
new file mode 100644
index 0000000..78b4fad
Binary files /dev/null and b/src/main/resources/templates/modules/pensioner/department/.DS_Store differ
diff --git a/src/main/resources/templates/modules/pensioner/department/dashboard.html b/src/main/resources/templates/modules/pensioner/department/dashboard.html
index cb32c50..48600ed 100644
--- a/src/main/resources/templates/modules/pensioner/department/dashboard.html
+++ b/src/main/resources/templates/modules/pensioner/department/dashboard.html
@@ -1,986 +1,968 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    /* Base Layout and Styling */
-
-/* Base Layout and Styling */
-body {
-    font-family: 'Arial', sans-serif;
-    background-color: #f8f9fa;
-}
-
-/* Card Styling */
-.card-box {
-    border-radius: 12px;
-    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
-    background-color: #ffffff;
-    padding: 20px;
-    transition: transform 0.3s ease-in-out;
-}
-
-.card-box:hover {
-    transform: translateY(-5px);
-}
-
-/* Title Styling */
-h3 {
-    font-size: 1.2rem;
-    color: #444;
-}
-
-/* Styling for Overall Pendency and Stage Wise Sections */
-.charts {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 30px; /* Increased gap between charts */
-    margin-top: 30px; /* Increased margin-top */
-}
-
-.chart {
-    flex: 1;
-    background: #ffffff; /* White background */
-    padding: 20px;
-    border-radius: 8px;
-    border: 2px solid #1e90ff; /* Add a colored border */
-    width: 100%;
-    box-sizing: border-box;
-    text-align: center;
-    transition: all 0.3s ease-in-out;
-}
-
-.chart:hover {
-    box-shadow: 0 6px 12px rgba(0, 0, 0, 0.2);
-}
-
-.chart h3 {
-    font-size: 1.2rem;
-    color: #333;
-    margin-bottom: 15px;
-}
-
-.chart canvas {
-    display: block;
-    max-width: 100%;
-    height: auto;
-}
-
-/* Stats Cards */
-.stats {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: center;
-    gap: 30px; /* Increased gap between stats cards */
-    margin-top: 30px; /* Increased margin-top */
-}
-
-.stat-card {
-    background: #ffffff;
-    border: 2px solid #1e90ff;
-    padding: 20px;
-    border-radius: 8px;
-    text-align: center;
-    flex: 1;
-    margin: 10px; /* Reduced margin for cleaner look */
-}
-
-.stat-card:hover {
-    transform: scale(1.05);
-    box-shadow: 0 6px 12px rgba(0, 0, 0, 0.2);
-}
-
-.stat-card h2 {
-    margin: 0;
-    font-size: 36px;
-    color: #007bff; 
-}
-
-.stat-card p {
-    margin: 5px 0 0;
-    font-size: 13px;
-    color: #555;
-    font-weight:bold;
-}
-
-/* Buttons */
-.btn-primary:hover {
-    background-color: #0056b3;
-}
-
-.btn-warning:hover {
-    background-color: #e0a800;
-}
-
-/* Container Styling */
-.container {
-    max-width: 1200px;
-    margin: 20px auto;
-    padding: 20px;
-    background: #fff;
-    border-radius: 8px;
-    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
-}
-
-/* Date Input Row */
-.row.mt-3.ml-2 {
-    margin-top: 20px; /* Increased margin-top */
-}
-
-/* Responsive Design */
-@media (min-width: 768px) {
-    .charts {
-        flex-direction: row;
-    }
-
-    .charts .chart {
-        width: calc(50% - 15px); /* Increased gap between charts */
-    }
-
-    .stats {
-        flex-direction: row;
-    }
-}
-
-@media (max-width: 576px) {
-    .charts,
-    .stats {
-        flex-direction: column;
-    }
-
-    .stat-card {
-        margin: 15px 0; /* Increased margin for better spacing */
-    }
-}
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}   
-
-#EmpcodeDetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-
-
-</style>
-
-<body>
-    <div class="wrapper">
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <div class="page-wrap">
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header 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>Dashboard</h5>
-                                        <span>Department Entries</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">Department Entries</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Dashboard</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row mt-4">
-                        <div class="col-md-12">
-                           
-                            <div class="card">
-					        <div class="card-block">
-                                        
-                                <h5 style="font-weight:bold;"><span th:text="${deptId}" id="deptId" style="display:none"></span></h5>
-                                  <h5 style="font-weight:bold;"><span th:text="${deptname}" id="deptname"></span> Department</h5>
-	                                      <div class="d-flex justify-content-end align-items-center">
-											    <label for="EmpCode" style="font-weight: bold; margin-right: 10px;" class="mb-0">EmpCode:</label>
-											    <input type="text" id="EmpCode" name="EmpCode" class="form-control" style="width: auto; min-width: 150px; margin-right: 10px;">
-											    <button id="searchEmpButton" class="btn btn-primary">Search</button>
-											</div>
-
-												<div class="row mt-3 ml-2 ">
-												    <div class="col-md-3">
-												        <label for="startDate" class="form-label">From Date:</label>
-												        <input type="date" id="startDate" class="form-control" onclick="this.showPicker()">
-												    </div>
-												    <div class="col-md-3">
-												        <label for="endDate" class="form-label">To Date:</label>
-												        <input type="date" id="endDate" class="form-control" onclick="this.showPicker()">
-												    </div>
-												   <div class="col-12 d-flex justify-content-center mt-3">
-												        <button id="searchButton" class="btn btn-primary mx-2">Search</button>
-												        <input type="reset" class="btn btn-warning mx-2" value="Reset">
-												    </div>
-												</div>
-												
-												
-												<div id="stats" class="stats"></div>
-
-                                            <div class="charts">
-                                                <div class="chart">
-                                                    <h3>File Category - Overall</h3>
-                                                    <div id="overallPieChart" style="width: 100%; height: 400px;"></div>
-                                                    
-                                                </div>
-                                                <div class="chart">
-                                                    <h3>File Category  Stages Wise</h3>
-                                                    <div id="stagesBarChart" style="width: 100%; height: 400px;"></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="zoneDetailsModal" tabindex="-1"
-		role="dialog" aria-labelledby="zoneDetailsModalLabel"
-		aria-hidden="true" data-backdrop="static" data-keyboard="false">
-		<div class="modal-dialog modal-lg" role="document">
-			<div class="modal-content">
-				<div id="zone-details-content"></div>
-			</div>
-		</div>
-	</div>
-	
-	
-	<div class="modal fade" id="EmpcodeDetailsModal" tabindex="-1"
-		role="dialog" aria-labelledby="zoneDetailsModalLabel"
-		aria-hidden="true" data-backdrop="static" data-keyboard="false">
-		<div class="modal-dialog modal-xl" role="document">
-			<div class="modal-content">
-				<div id="emp-details-content">
-				<div class="col-md-12 mt-4">
-					<h5>File History</h5>
-							<div id="fileHistoryContainer" class="file-history-list">
-								File History will be dynamically loaded here
-						</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>
-    <!-- Bootstrap 5 JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-      <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-
-    <script src="/assets/node_modules/amcharts3/amcharts/amcharts.js"></script>
-	<script src="/assets/node_modules/amcharts3/amcharts/serial.js"></script>
-	
-	<script src="/assets/node_modules/amcharts3/amcharts/pie.js"></script>
-	<script src="/assets/node_modules/amcharts3/amcharts/themes/light.js"></script>
-	
-    <script>
-    document.addEventListener('DOMContentLoaded', function () {
-        // Function to fetch data from /dashboard endpoint
-        
-    	   $('#searchEmpButton').on('click', function () {
-               const Empcode = document.getElementById('EmpCode').value.trim();
-               if (!Empcode) {
-                   Swal.fire({
-                       icon: "warning",
-                       title: "Enter Employee Code",
-                       text: "Please enter an Employee Code before searching.",
-                       confirmButtonText: "OK",
-                   });
-                   return;
-               }
-
-               // First API call to fetch employee details
-               $.ajax({
-                   url: `/fetchEmpDetails?Empcode=${Empcode}`,
-                   type: 'GET',
-                   success: function (response) {
-                       if (!response || response.length === 0) {
-                           Swal.fire({
-                               icon: "warning",
-                               title: "No Data Found",
-                               text: "No records found for the entered Employee Code.",
-                               confirmButtonText: "OK",
-                           });
-                           return;
-                       }
-
-                       const isGISEmployee = response.some(emp => emp.file_name === "GIS");
-
-                       // Second API call to check department validity (only if not GIS)
-                       $.ajax({
-                           url: '/gcc/api/department/newentry/employeedetails',
-                           type: 'GET',
-                           data: { empCode: Empcode },
-                           success: function (deptResponse) {
-                               if (deptResponse.list && deptResponse.list.length > 0) {
-                                   let employeeDetails = deptResponse.list[0];
-                                   const loggedInDeptId = $('#deptId').text().trim();
-
-                                   if (employeeDetails.ID_DEPT !== loggedInDeptId) {
-                                       Swal.fire({
-                                           icon: "error",
-                                           title: "Access Denied",
-                                           text: "This employee does not belong to your department.",
-                                           confirmButtonText: "OK",
-                                       });
-                                   } else {
-                                       renderEmpDetailsModal(response);
-                                   }
-                               } else {
-                                   if (isGISEmployee) {
-                                       renderEmpDetailsModal(response);
-                                   } else {
-                                       Swal.fire({
-                                           icon: "warning",
-                                           title: "No Data Found",
-                                           text: "No details found for this employee number.",
-                                           confirmButtonText: "OK",
-                                       });
-                                   }
-                               }
-                           },
-                           error: function () {
-                               Swal.fire({
-                                   icon: "error",
-                                   title: "Error",
-                                   text: "An error occurred while fetching department details.",
-                                   confirmButtonText: "OK",
-                               });
-                           }
-                       });
-                   },
-                   error: function (xhr) {
-                       console.error("Error fetching employee details:", xhr.status, xhr.responseText);
-                   }
-               });
-           });
-    	   function renderEmpDetailsModal(data) {
-   		    const Empcode = document.getElementById('EmpCode').value.trim();
-
-   		 
-   		    let modalContent = `
-   		        <div class="modal-header">
-   		            <h5 class="modal-title">Employee Details for ${Empcode}</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="table-responsive">
-   		                <table id="DashboardDatatable" class="table table-striped table-bordered table-hover dataTable">
-   		                    <thead class="thead-dark">
-   		                        <tr>
-   		                            <th class="text-center">S.NO</th>
-   		                            <th class="text-center">Department Name</th>
-   		                            <th class="text-center">File Name</th>
-   		                            <th class="text-center">File Status</th>
-   		                            <th class="text-center">History</th>
-   		                        </tr>
-   		                    </thead>
-   		                    <tbody>
-   		                        ${data.map((item, index) => `
-   		                            <tr data-temp-id="${item.temp_id}">
-   		                                <td>${index + 1}</td>
-   		                                <td>${item.dept_name}</td>
-   		                                <td>${item.file_name}</td>
-   		                                <td>${item.file_status}</td>
-   		                                <td class="file-history-column" id="history-${item.temp_id}">Loading...</td>
-   		                            </tr>
-   		                        `).join('')}
-   		                    </tbody>
-   		                </table>
-   		            </div>
-   		        </div>
-   		    `;
-
-   		    document.getElementById('emp-details-content').innerHTML = modalContent;
-
-   		   
-   		    let fetchPromises = data.map(item => fetchDetailsByTempId(item.temp_id));
-
-   		    Promise.all(fetchPromises).then(() => {
-   		        $('#EmpcodeDetailsModal').modal({
-   		            backdrop: 'static',
-   		            keyboard: false
-   		        });
-
-   		        // **Initialize DataTable AFTER Data is Loaded**
-   		        setTimeout(() => {
-   		            let table = $('#DashboardDatatable').DataTable({
-   		                dom: 'Bftip',
-   		                columnDefs: [{ targets: 'no-sort', orderable: false }],
-   		                lengthMenu: [
-   		                    [50, 100, 200, 500, -1],
-   		                    ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-   		                ],
-   		                scrollY: '50vh',
-   		                
-   		             buttons: [
-   		              { extend: 'pageLength', className: 'btn btn-warning' },
-   		              { 
-   		                  extend: 'copyHtml5', 
-   		                  text: 'Copy', 
-   		                  className: 'btn btn-secondary',
-   		                  exportOptions: { columns: ':visible', modifier: { page: 'all' } }
-   		              },
-   		              { 
-   		                  extend: 'excelHtml5', 
-   		                  text: 'Excel', 
-   		                  className: 'btn btn-secondary',
-   		                  customize: function (xlsx) {
-   		                      let sheet = xlsx.xl.worksheets['sheet1.xml'];
-   		                      $('row c[r]', sheet).attr('s', '55'); // Apply word-wrap formatting
-   		                  }
-   		              },
-   		              { 
-   		                  extend: 'csvHtml5', 
-   		                  text: 'CSV', 
-   		                  className: 'btn btn-secondary',
-   		                  exportOptions: { columns: ':visible' }
-   		              },
-   		              { 
-   		                  extend: 'pdfHtml5', 
-   		                  text: 'PDF', 
-   		                  className: 'btn btn-secondary',
-   		                  orientation: 'landscape',
-   		                  pageSize: 'A4',
-   		                  customize: function (doc) {
-   		                      doc.styles.tableBodyEven.alignment = 'left';
-   		                      doc.styles.tableBodyOdd.alignment = 'left';
-   		                      doc.styles.tableHeader.alignment = 'center';
-   		                      doc.defaultStyle.fontSize = 9;
-   		                      doc.styles.tableHeader.fontSize = 10;
-   		                      doc.content[1].table.widths = Array(doc.content[1].table.body[0].length + 1).join('*').split('');
-   		                  }
-   		              }
-   		          ],
-   		                responsive: false,
-   		                processing: false
-   		            });
-
-   		            // ✅ Adjust column width after table is fully initialized
-   		           
-   		        }, 200);
-   		    });
-   		}
-
-   		// **Ensure Header Aligns Properly When Modal is Opened**
-   	
-
-   		// **Fetch History & Update Table**
-   		function fetchDetailsByTempId(tempId) {
-   		    return new Promise((resolve, reject) => {
-   		        $.ajax({
-   		            url: `/fetchTempDetails?tempId=${tempId}`,
-   		            type: 'GET',
-   		            success: function (response) {
-   		                let historyContainer = $(`#history-${tempId}`);
-   		                if (response.length > 0) {
-   		                    let historyHtml = response.map(item => `
-   		                        <div class="file-history-item">
-   		                            <div class="file-history-date">${formatDateTime(item.file_moved_date)}</div>
-   		                            <div class="file-history-content">
-   		                                <div class="file-history-status">${item.file_status}</div>
-   		                                <div class="file-history-remarks">Comments/Remarks: ${item.remarks || 'N/A'}</div>
-   		                            </div>
-   		                        </div>
-   		                    `).join('');
-   		                    historyContainer.html(historyHtml);
-   		                    $('#EmpcodeDetailsModal').modal({
-   		                        backdrop: 'static',
-   		                        keyboard: false
-   		                    });
-   		                    $('#EmpcodeDetailsModal').modal('show');
-   		                    $('.close').click(function () {
-   		                        $('#EmpcodeDetailsModal').modal('hide');
-   		                    });
-   		                } else {
-   		                    historyContainer.html('<p>No file history available.</p>');
-   		                    $('#EmpcodeDetailsModal').modal({
-   		                        backdrop: 'static',
-   		                        keyboard: false
-   		                    });
-   		                    $('#EmpcodeDetailsModal').modal('show');
-   		                    $('.close').click(function () {
-   		                        $('#EmpcodeDetailsModal').modal('hide');
-   		                    });
-   		                }
-   		                resolve();
-   		            },
-   		            error: function () {
-   		                $(`#history-${tempId}`).html('<p>Failed to load file history.</p>');
-   		                $('#EmpcodeDetailsModal').modal({
-		                        backdrop: 'static',
-		                        keyboard: false
-		                    });
-		                    $('#EmpcodeDetailsModal').modal('show');
-		                    $('.close').click(function () {
-		                        $('#EmpcodeDetailsModal').modal('hide');
-		                    });
-   		                resolve();
-   		            }
-   		        });
-   		    });
-   		}
-
-   		// **Helper Function to Format Date**
-   		function formatDateTime(dateString) {
-   		    const options = { day: '2-digit', month: '2-digit', year: 'numeric' };
-   		    return new Date(dateString).toLocaleDateString('en-GB', options);
-   		}
-
-
-
-        
-    	function loadDashboardData() {
-    	    const deptId = $('#deptId').text().trim();
-    	    console.log(deptId);
-
-    	    $.ajax({
-    	        url: `/deparmentdashboard?deptId=${encodeURIComponent(deptId)}`,
-    	        type: 'GET',
-    	        contentType: 'application/json',
-    	        success: function (data) {
-    	            const statsDiv = document.getElementById('stats');
-    	            statsDiv.innerHTML = ''; // Clear previous stats
-
-    	            data.forEach(item => {
-    	                const statCard = document.createElement('div');
-    	                statCard.className = 'stat-card';
-    	                statCard.innerHTML = `
-    	                    <h2>${item.category_count}</h2>
-    	                    <p>${item.file_name}</p>
-    	                `;
-    	                statsDiv.appendChild(statCard);
-    	            });
-
-    	            // Call renderCharts after data is loaded
-    	            renderCharts();
-    	        },
-    	        error: function (xhr) {
-    	            console.error('Error fetching dashboard data:', xhr.status, xhr.responseText);
-    	        }
-    	    });
-    	}
-
-    	// Function to handle search button click
-    	document.getElementById('searchButton').addEventListener('click', function () {
-    	    const startDate = document.getElementById('startDate').value;
-    	    const endDate = document.getElementById('endDate').value;
-    	    const deptId = $('#deptId').text().trim();
-
-    	    if (!startDate || !endDate) {
-    	        Swal.fire({
-    	            icon: "warning",
-    	            title: "Incomplete Search",
-    	            text: "Please select the Date Before searching",
-    	            confirmButtonText: "OK",
-    	        });
-    	    } else {
-    	        $.ajax({
-    	            url: `/dashboardsearch?startdate=${startDate}&enddate=${endDate}&deptId=${encodeURIComponent(deptId)}`,
-    	            type: 'GET',
-    	            success: function (data) {
-    	                const statsDiv = document.getElementById('stats');
-    	                statsDiv.innerHTML = data.map(item => `
-    	                    <div class='stat-card'>
-    	                        <h2>${item.category_count}</h2>
-    	                        <p>${item.file_name}</p>
-    	                    </div>
-    	                `).join('');
-
-    	                // Re-render charts after search results load
-    	                renderCharts(startDate, endDate);
-    	            },
-    	            error: function (xhr) {
-    	                console.error('Error fetching search data:', xhr.status, xhr.responseText);
-    	            }
-    	        });
-    	    }
-    	});
-
-    	// Function to validate and set min-date for endDate
-    	/* function validateEndDate() {
-    	    const startDate = document.getElementById('startDate').value;
-    	    const endDateInput = document.getElementById('endDate');
-
-    	    if (startDate) {
-    	        const startDateObj = new Date(startDate);
-    	        const minEndDateISO = startDateObj.toISOString().split('T')[0];
-    	        endDateInput.setAttribute('min', minEndDateISO);
-
-    	        // Clear endDate if it's less than startDate
-    	        if (endDateInput.value && new Date(endDateInput.value) < startDateObj) {
-    	            endDateInput.value = '';
-    	        }
-    	    }
-    	}
-
-    	document.getElementById('startDate').addEventListener('change', validateEndDate);
- */
-    	function renderCharts(startDate = null, endDate = null) {
-    	    const deptId = $('#deptId').text().trim();
-
-    	    // Dispose existing amCharts instances
-    	    disposeExistingCharts();
-
-    	    function disposeExistingCharts() {
-    	        if (window.chart1) {
-    	            window.chart1.clear();
-    	            window.chart1 = null;
-    	        }
-    	        if (window.chart2) {
-    	            window.chart2.clear();
-    	            window.chart2 = null;
-    	        }
-    	    }
-
-    	    // Render pie chart
-    	  const fixedColors = {
-    "Retirement": "#6A0572", // Deep Purple
-    "Family Pension": "#2C3E50", // Dark Blue-Gray
-    "Pendency": "#A569BD", // Soft Lavender
-    "GIS": "#17A589", // Teal Green
-    "Provisional Retirement": "#D35400", // Warm Orange
-    "Contributory Pension Scheme": "#5D6D7E"  // Muted Gray-Blue
-};
-
-$.ajax({
-    url: `/categoryCounts`,
-    type: 'GET',
-    data: { deptId, startDate, endDate },
-    dataType: 'json',
-    success: function (data) {
-        const chartData = data.map((item, index) => ({
-            category: item.file_name,
-            value: item.category_count,
-            color: fixedColors[item.file_name], // Assign colors cyclically
-            id: item.id
-        }));
-
-        window.chart1 = AmCharts.makeChart("overallPieChart", {
-            type: "pie",
-            theme: "dark",
-            dataProvider: chartData,
-            valueField: "value",
-            titleField: "category",
-            colorField: "color",
-            radius: "40%", 
-            innerRadius: "50%", 
-            labelText: "[[[[title]]]] - [[[[value]]]]",
-            fontSize: 14,
-            
-            labelsEnabled: true,
-            pullOutRadius: 0,
-           
-            gradientRatio: [-0.4, -0.4, -0.4, -0.4, -0.4, -0.4, 0, 0.1, 0.2, 0.1, 0, -0.2, -0.5], 
-            export: {
-                enabled: true,
-            },
-            responsive: {
-                enabled: true,
-            },
-            
-            legend: {
-                position: "bottom",
-                markerType: "circle",
-                valueText: "[[[[value]]]]",
-                switchable: false,
-                markerSize: 12,
-                fontSize: 12
-                
-                
-            },
-            balloon: {
-                fixedPosition: true
-            },
-            listeners: [
-                {
-                    event: "clickSlice",
-                    method: function (event) {
-                        const FileId = event.dataItem.dataContext.id;
-                        const FileNumber = event.dataItem.dataContext.category;
-                        fetchempno(FileId, FileNumber);
-                    }
-                }
-            ]
-        });
-    },
-    error: function (xhr, status, error) {
-        console.error("AJAX Request Failed:", status, error);
-        console.error("Response Text:", xhr.responseText); 
-    }
-});
-
-    	    function fetchempno(FileId, FileNumber) {
-    	        $.ajax({
-    	            url: `/getEmpNoByFileName?file_id=${FileId}`,
-    	            type: 'GET',
-    	            success: function (response) {
-    	                renderEmpNoModal(FileNumber, response);
-    	            },
-    	            error: function (xhr) {
-    	                console.error("Error fetching region details:", xhr.status, xhr.responseText);
-    	            }
-    	        });
-    	    }
-
-    	    function renderEmpNoModal(FileNumber, empNos) {
-    	        console.log(empNos);
-    	        const modalContent = `
-    	            <div class="modal-header">
-    	                <h5 class="modal-title">Employee Numbers for ${FileNumber}</h5>
-    	                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-    	                    <span aria-hidden="true">&times;</span>
-    	                </button>
-    	            </div>
-    	            <div class="modal-body">
-    	                <table class="table table-bordered">
-    	                    <thead>
-    	                        <tr><th>Employee Number</th></tr>
-    	                    </thead>
-    	                    <tbody>
-    	                        ${empNos.map(empNo => `<tr><td>${empNo.emp_no}</td></tr>`).join('')}
-    	                    </tbody>
-    	                </table>
-    	            </div>
-    	        `;
-
-    	        document.getElementById('zone-details-content').innerHTML = modalContent;
-    	       // $('#zoneDetailsModal').modal('show');
-    	        $('.close').click(function () {
-    	            $('#zoneDetailsModal').modal('hide');
-    	        });
-    	    }
-    	    
-    	   
-
-    	    function getRandomColor() {
-    	        const letters = '0123456789ABCDEF';
-    	        let color = '#';
-    	        for (let i = 0; i < 6; i++) {
-    	            color += letters[Math.floor(Math.random() * 16)];
-    	        }
-    	        return color;
-    	    }
-
-    	    // Render bar chart
-    	    $.ajax({
-    	        url: `/stageWiseCounts`,
-    	        type: 'GET',
-    	        data: { deptId, startDate, endDate },
-    	        dataType: 'json',
-    	        success: function (data) {
-    	            const colorMapping = {
-	    	                "Audit Pending": "#FF5733",
-	    	                "Department Pending": "#FFC300",
-	    	                "Pension Pending": "#28B463",
-	    	                "Completed": "#3498DB"
-    	            };
-
-    	            const chartData = data.map(item => ({
-    	                category: item.category,
-    	                value: item.category_count,
-    	                color: colorMapping[item.category] || '#D3D3D3'
-    	            }));
-
-    	            window.chart2 = AmCharts.makeChart("stagesBarChart", {
-    	                 type: "serial",
-    	                 theme: "light",
-    	                 dataProvider: chartData,
-    	                 depth3D: 2,
-    	                 angle: 10,
-    	                 valueAxes: [{
-    	                     axisAlpha: 0,
-    	                     gridAlpha: 0,
-    	                     labelsEnabled: false,
-    	                     dashLength: 0
-    	                 }],
-    	                 startDuration: 1,
-    	                 startEffect: "easeInSine",
-    	                 graphs: [{
-    	                     balloonText: "[[[[category]]]]: [[[[value]]]]",
-    	                     fillAlphas: 0.8,
-    	                     lineAlpha: 0.3,
-    	                     topRadius: 1,
-    	                     type: "column",
-    	                     valueField: "value",
-    	                     fillColorsField: "color",
-    	                     columnWidth: 0.5,
-    	                     labelText: "[[[[value]]]]",
-    	                     labelPosition: "right",
-    	                     fontSize: 14,
-    	                     color: "#000000"
-    	                     
-    	                 }],
-    	                 categoryField: "category",
-    	                 categoryAxis: {
-    	                     gridPosition: "start",
-    	                     gridAlpha: 0,
-    	                     autoWrap: false,
-    	                     axisAlpha: 0,
-    	                     fontSize: 14,  // Increases the category label size
-    	                       // Makes category labels bold
-    	                     labelRotation: 0 
-    	                
-    	                 },
-    	                 rotate: true,
-    	                 export: {
-    	                     enabled: true,
-    	                     position: "bottom-right"
-    	                 }
-    	             });
-
-    	             console.log("Stages Bar Chart Data:", chartData);
-    	         },
-    	         error: function (xhr, status, error) {
-    	             console.error("AJAX Request Failed:", status, error);
-    	         }
-    	     });
-    	 }
-
-    	// Initial data load
-    	loadDashboardData();
-    	 document.querySelector("input[type='reset']").addEventListener('click', function () {
-             window.location.href = "/gcc/department/dashboard";
-         });
-
-    })
-    
-    
-     
-        $('#startDate').on('change', function () {
-	        const fromDate = $(this).val();
-	        $('#endDate').attr('min', fromDate); // Update min attribute for To Date
-
-	        // If To Date is earlier than the new From Date, adjust it
-	        const toDate = $('#endDate').val();
-	        if (new Date(toDate) < new Date(fromDate)) {
-	            $('#endDate').val(fromDate);
-	        }
-	    });
-
-	    // Update From Date's max attribute when To Date changes
-	    $('#endDate').on('change', function () {
-	        const toDate = $(this).val();
-	        $('#startDate').attr('max', toDate); // Update max attribute for From Date
-
-	        // If From Date is later than the new To Date, adjust it
-	        const fromDate = $('#startDate').val();
-	        if (new Date(fromDate) > new Date(toDate)) {
-	            $('#startDate').val(toDate);
-	        }
-	    });
-        
-        
-         	//disable future dates
-	document.addEventListener("DOMContentLoaded", function () {
-        let today = new Date().toISOString().split("T")[0]; // Get today's date in YYYY-MM-DD format
-        let startdateInput = document.getElementById("startDate");
-        let enddateInput = document.getElementById("endDate");
-
-        // Set max attribute to disable future dates
-        startdateInput.setAttribute("max", today);
-        enddateInput.setAttribute("max", today);
-        
-
-        // Prevent manual future date entry
-        startdateInput.addEventListener("change", function () {
-            if (this.value > today) {
-                Swal.fire({
-                    icon: 'warning',
-                    title: 'Invalid Date',
-                    text: 'Future dates are not allowed.',
-                    confirmButtonText: 'OK'
-                });
-                this.value = ""; // Clear the invalid input
-            }
-        });
-    });
-    
-
-
-    </script>
-</body>
-
-</html>
+<!DOCTYPE html>
+<html lang="en" dir="">
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head th:replace="~{fragments/modules/base/head :: head}"></head>
+<style>
+    /* Base Layout and Styling */
+
+/* Base Layout and Styling */
+body {
+    font-family: 'Arial', sans-serif;
+    background-color: #f8f9fa;
+}
+
+/* Card Styling */
+.card-box {
+    border-radius: 12px;
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+    background-color: #ffffff;
+    padding: 20px;
+    transition: transform 0.3s ease-in-out;
+}
+
+.card-box:hover {
+    transform: translateY(-5px);
+}
+
+/* Title Styling */
+h3 {
+    font-size: 1.2rem;
+    color: #444;
+}
+
+/* Styling for Overall Pendency and Stage Wise Sections */
+.charts {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 30px; /* Increased gap between charts */
+    margin-top: 30px; /* Increased margin-top */
+}
+
+.chart {
+    flex: 1;
+    background: #ffffff; /* White background */
+    padding: 20px;
+    border-radius: 8px;
+    border: 2px solid #1e90ff; /* Add a colored border */
+    width: 100%;
+    box-sizing: border-box;
+    text-align: center;
+    transition: all 0.3s ease-in-out;
+}
+
+.chart:hover {
+    box-shadow: 0 6px 12px rgba(0, 0, 0, 0.2);
+}
+
+.chart h3 {
+    font-size: 1.2rem;
+    color: #333;
+    margin-bottom: 15px;
+}
+
+.chart canvas {
+    display: block;
+    max-width: 100%;
+    height: auto;
+}
+
+/* Stats Cards */
+.stats {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+    gap: 30px; /* Increased gap between stats cards */
+    margin-top: 30px; /* Increased margin-top */
+}
+
+.stat-card {
+    background: #ffffff;
+    border: 2px solid #1e90ff;
+    padding: 20px;
+    border-radius: 8px;
+    text-align: center;
+    flex: 1;
+    margin: 10px; /* Reduced margin for cleaner look */
+}
+
+.stat-card:hover {
+    transform: scale(1.05);
+    box-shadow: 0 6px 12px rgba(0, 0, 0, 0.2);
+}
+
+.stat-card h2 {
+    margin: 0;
+    font-size: 36px;
+    color: #007bff; 
+}
+
+.stat-card p {
+    margin: 5px 0 0;
+    font-size: 13px;
+    color: #555;
+    font-weight:bold;
+}
+
+/* Buttons */
+.btn-primary:hover {
+    background-color: #0056b3;
+}
+
+.btn-warning:hover {
+    background-color: #e0a800;
+}
+
+/* Container Styling */
+.container {
+    max-width: 1200px;
+    margin: 20px auto;
+    padding: 20px;
+    background: #fff;
+    border-radius: 8px;
+    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+}
+
+/* Date Input Row */
+.row.mt-3.ml-2 {
+    margin-top: 20px; /* Increased margin-top */
+}
+
+/* Responsive Design */
+@media (min-width: 768px) {
+    .charts {
+        flex-direction: row;
+    }
+
+    .charts .chart {
+        width: calc(50% - 15px); /* Increased gap between charts */
+    }
+
+    .stats {
+        flex-direction: row;
+    }
+}
+
+@media (max-width: 576px) {
+    .charts,
+    .stats {
+        flex-direction: column;
+    }
+
+    .stat-card {
+        margin: 15px 0; /* Increased margin for better spacing */
+    }
+}
+.file-history-list {
+    margin-top: 10px;
+    padding-left: 0;
+}
+
+
+.file-history-item {
+    display: flex;
+    padding: 5px 10px;
+    font-family: Arial, sans-serif;
+    align-items: flex-start;
+    position: relative; /* For vertical line positioning */
+    margin-bottom: 1px; /* Add space between items */
+}
+
+.file-history-item::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 120px; /* Position of the vertical line */
+    width: 1px;
+    background-color: #ddd;
+}
+
+.file-history-date {
+margin-top: 10px;
+    flex: 0 0 100px;
+    font-weight: bold;
+    font-size: 0.8rem;
+    color: #333;
+    text-align: center;
+    white-space: nowrap; /* Prevent wrapping */
+}
+
+.file-history-content {
+    flex: 5;
+    padding-left: 20px; /* Adds space after the vertical line */
+    display: flex;
+    flex-direction: column;
+    gap: 5px; /* Adds spacing between status and remarks */
+    white-space: pre-wrap; /* Prevents wrapping */
+    overflow: visible; /* Prevents content overflow */
+    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
+}
+
+.file-history-status {
+    font-size: 0.8rem;
+    font-weight: bold;
+    color: #555;
+    white-space:pre-wrap; /* Prevent wrapping */
+    overflow: visible;
+    text-overflow: ellipsis;
+}
+
+.file-history-remarks {
+    font-size: 0.8rem;
+    color: #777;
+    white-space: pre-wrap; /* Prevent wrapping */
+    overflow: visible;
+    text-overflow: ellipsis;
+}   
+
+#EmpcodeDetailsModal .modal-body{
+	max-height:80vh;
+	overflow-y:auto; 
+}
+
+
+</style>
+
+<body>
+    <div class="wrapper">
+        <header th:replace="~{fragments/modules/base/header :: header}"></header>
+        <div class="page-wrap">
+            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
+            <div class="main-content">
+                <div class="container-fluid">
+                    <div class="page-header 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>Dashboard</h5>
+                                        <span>Department Entries</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">Department Entries</li>
+                                        <li class="breadcrumb-item active" aria-current="page">Dashboard</li>
+                                    </ol>
+                                </nav>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row mt-4">
+                        <div class="col-md-12">
+                           
+                            <div class="card">
+					        <div class="card-block">
+                                        
+                                <h5 style="font-weight:bold;"><span th:text="${deptId}" id="deptId" style="display:none"></span></h5>
+                                  <h5 style="font-weight:bold;"><span th:text="${deptname}" id="deptname"></span> Department</h5>
+	                                      <div class="d-flex justify-content-end align-items-center">
+											    <label for="EmpCode" style="font-weight: bold; margin-right: 10px;" class="mb-0">EmpCode:</label>
+											    <input type="text" id="EmpCode" name="EmpCode" class="form-control" style="width: auto; min-width: 150px; margin-right: 10px;">
+											    <button id="searchEmpButton" class="btn btn-primary">Search</button>
+											</div>
+
+												<div class="row mt-3 ml-2 ">
+												    <div class="col-md-3">
+												        <label for="startDate" class="form-label">From Date:</label>
+												        <input type="date" id="startDate" class="form-control" onclick="this.showPicker()">
+												    </div>
+												    <div class="col-md-3">
+												        <label for="endDate" class="form-label">To Date:</label>
+												        <input type="date" id="endDate" class="form-control" onclick="this.showPicker()">
+												    </div>
+												   <div class="col-12 d-flex justify-content-center mt-3">
+												        <button id="searchButton" class="btn btn-primary mx-2">Search</button>
+												        <input type="reset" class="btn btn-warning mx-2" value="Reset">
+												    </div>
+												</div>
+												
+												
+												<div id="stats" class="stats"></div>
+
+                                            <div class="charts">
+                                                <div class="chart">
+                                                    <h3>File Category - Overall</h3>
+                                                    <div id="overallPieChart" style="width: 100%; height: 400px;"></div>
+                                                    
+                                                </div>
+                                                <div class="chart">
+                                                    <h3>File Category  Stages Wise</h3>
+                                                    <div id="stagesBarChart" style="width: 100%; height: 400px;"></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="zoneDetailsModal" tabindex="-1"
+		role="dialog" aria-labelledby="zoneDetailsModalLabel"
+		aria-hidden="true" data-backdrop="static" data-keyboard="false">
+		<div class="modal-dialog modal-lg" role="document">
+			<div class="modal-content">
+				<div id="zone-details-content"></div>
+			</div>
+		</div>
+	</div>
+	
+	
+	<div class="modal fade" id="EmpcodeDetailsModal" tabindex="-1"
+		role="dialog" aria-labelledby="zoneDetailsModalLabel"
+		aria-hidden="true" data-backdrop="static" data-keyboard="false">
+		<div class="modal-dialog modal-xl" role="document">
+			<div class="modal-content">
+				<div id="emp-details-content">
+				<div class="col-md-12 mt-4">
+					<h5>File History</h5>
+							<div id="fileHistoryContainer" class="file-history-list">
+								File History will be dynamically loaded here
+						</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>
+    <!-- Bootstrap 5 JS -->
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
+    
+    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+      <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
+
+    <script src="node_modules/amcharts3/amcharts/amcharts.js"></script>
+	<script src="node_modules/amcharts3/amcharts/serial.js"></script>
+	
+	<script src="node_modules/amcharts3/amcharts/pie.js"></script>
+	<script src="node_modules/amcharts3/amcharts/themes/light.js"></script>
+	
+    <script>
+    document.addEventListener('DOMContentLoaded', function () {
+        // Function to fetch data from /dashboard endpoint
+        
+    	   $('#searchEmpButton').on('click', function () {
+               const Empcode = document.getElementById('EmpCode').value.trim();
+               if (!Empcode) {
+                   Swal.fire({
+                       icon: "warning",
+                       title: "Enter Employee Code",
+                       text: "Please enter an Employee Code before searching.",
+                       confirmButtonText: "OK",
+                   });
+                   return;
+               }
+
+               // First API call to fetch employee details
+               $.ajax({
+                   url: `/gcc/api/pensionerdashboard/fetchEmpDetails?Empcode=${Empcode}`,
+                   type: 'GET',
+                   success: function (response) {
+                       if (!response || response.length === 0) {
+                           Swal.fire({
+                               icon: "warning",
+                               title: "No Data Found",
+                               text: "No records found for the entered Employee Code.",
+                               confirmButtonText: "OK",
+                           });
+                           return;
+                       }
+
+                       const isGISEmployee = response.some(emp => emp.file_name === "GIS");
+
+                       // Second API call to check department validity (only if not GIS)
+                       $.ajax({
+                           url: '/gcc/api/department/newentry/employeedetails',
+                           type: 'GET',
+                           data: { empCode: Empcode },
+                           success: function (deptResponse) {
+                               if (deptResponse.list && deptResponse.list.length > 0) {
+                                   let employeeDetails = deptResponse.list[0];
+                                   const loggedInDeptId = $('#deptId').text().trim();
+
+                                   if (employeeDetails.ID_DEPT !== loggedInDeptId) {
+                                       Swal.fire({
+                                           icon: "error",
+                                           title: "Access Denied",
+                                           text: "This employee does not belong to your department.",
+                                           confirmButtonText: "OK",
+                                       });
+                                   } else {
+                                       renderEmpDetailsModal(response);
+                                   }
+                               } else {
+                                   if (isGISEmployee) {
+                                       renderEmpDetailsModal(response);
+                                   } else {
+                                       Swal.fire({
+                                           icon: "warning",
+                                           title: "No Data Found",
+                                           text: "No details found for this employee number.",
+                                           confirmButtonText: "OK",
+                                       });
+                                   }
+                               }
+                           },
+                           error: function () {
+                               Swal.fire({
+                                   icon: "error",
+                                   title: "Error",
+                                   text: "An error occurred while fetching department details.",
+                                   confirmButtonText: "OK",
+                               });
+                           }
+                       });
+                   },
+                   error: function (xhr) {
+                       console.error("Error fetching employee details:", xhr.status, xhr.responseText);
+                   }
+               });
+           });
+    	   function renderEmpDetailsModal(data) {
+   		    const Empcode = document.getElementById('EmpCode').value.trim();
+
+   		 
+   		    let modalContent = `
+   		        <div class="modal-header">
+   		            <h5 class="modal-title">Employee Details for ${Empcode}</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="table-responsive">
+   		                <table id="DashboardDatatable" class="table table-striped table-bordered table-hover dataTable">
+   		                    <thead class="thead-dark">
+   		                        <tr>
+   		                            <th class="text-center">S.NO</th>
+   		                            <th class="text-center">Department Name</th>
+   		                            <th class="text-center">File Name</th>
+   		                            <th class="text-center">File Status</th>
+   		                            <th class="text-center">History</th>
+   		                        </tr>
+   		                    </thead>
+   		                    <tbody>
+   		                        ${data.map((item, index) => `
+   		                            <tr data-temp-id="${item.temp_id}">
+   		                                <td>${index + 1}</td>
+   		                                <td>${item.dept_name}</td>
+   		                                <td>${item.file_name}</td>
+   		                                <td>${item.file_status}</td>
+   		                                <td class="file-history-column" id="history-${item.temp_id}">Loading...</td>
+   		                            </tr>
+   		                        `).join('')}
+   		                    </tbody>
+   		                </table>
+   		            </div>
+   		        </div>
+   		    `;
+
+   		    document.getElementById('emp-details-content').innerHTML = modalContent;
+
+   		   
+   		    let fetchPromises = data.map(item => fetchDetailsByTempId(item.temp_id));
+
+   		    Promise.all(fetchPromises).then(() => {
+   		        $('#EmpcodeDetailsModal').modal({
+   		            backdrop: 'static',
+   		            keyboard: false
+   		        });
+
+   		        // **Initialize DataTable AFTER Data is Loaded**
+   		        setTimeout(() => {
+   		            let table = $('#DashboardDatatable').DataTable({
+   		                dom: 'Bftip',
+   		                columnDefs: [{ targets: 'no-sort', orderable: false }],
+   		                lengthMenu: [
+   		                    [50, 100, 200, 500, -1],
+   		                    ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
+   		                ],
+   		                scrollY: '50vh',
+   		                
+   		             buttons: [
+   		              { extend: 'pageLength', className: 'btn btn-warning' },
+   		              { 
+   		                  extend: 'copyHtml5', 
+   		                  text: 'Copy', 
+   		                  className: 'btn btn-secondary',
+   		                  exportOptions: { columns: ':visible', modifier: { page: 'all' } }
+   		              },
+   		              { 
+   		                  extend: 'excelHtml5', 
+   		                  text: 'Excel', 
+   		                  className: 'btn btn-secondary',
+   		                  customize: function (xlsx) {
+   		                      let sheet = xlsx.xl.worksheets['sheet1.xml'];
+   		                      $('row c[r]', sheet).attr('s', '55'); // Apply word-wrap formatting
+   		                  }
+   		              },
+   		              { 
+   		                  extend: 'csvHtml5', 
+   		                  text: 'CSV', 
+   		                  className: 'btn btn-secondary',
+   		                  exportOptions: { columns: ':visible' }
+   		              },
+   		              { 
+   		                  extend: 'pdfHtml5', 
+   		                  text: 'PDF', 
+   		                  className: 'btn btn-secondary',
+   		                  orientation: 'landscape',
+   		                  pageSize: 'A4',
+   		                  customize: function (doc) {
+   		                      doc.styles.tableBodyEven.alignment = 'left';
+   		                      doc.styles.tableBodyOdd.alignment = 'left';
+   		                      doc.styles.tableHeader.alignment = 'center';
+   		                      doc.defaultStyle.fontSize = 9;
+   		                      doc.styles.tableHeader.fontSize = 10;
+   		                      doc.content[1].table.widths = Array(doc.content[1].table.body[0].length + 1).join('*').split('');
+   		                  }
+   		              }
+   		          ],
+   		                responsive: false,
+   		                processing: false
+   		            });
+
+   		            // ✅ Adjust column width after table is fully initialized
+   		           
+   		        }, 200);
+   		    });
+   		}
+
+   		// **Ensure Header Aligns Properly When Modal is Opened**
+   	
+
+   		// **Fetch History & Update Table**
+   		function fetchDetailsByTempId(tempId) {
+   		    return new Promise((resolve, reject) => {
+   		        $.ajax({
+   		            url: `/gcc/api/pensionerdashboard/fetchTempDetails?tempId=${tempId}`,
+   		            type: 'GET',
+   		            success: function (response) {
+   		                let historyContainer = $(`#history-${tempId}`);
+   		                if (response.length > 0) {
+   		                    let historyHtml = response.map(item => `
+   		                        <div class="file-history-item">
+   		                            <div class="file-history-date">${formatDateTime(item.file_moved_date)}</div>
+   		                            <div class="file-history-content">
+   		                                <div class="file-history-status">${item.file_status}</div>
+   		                                <div class="file-history-remarks">Comments/Remarks: ${item.remarks || 'N/A'}</div>
+   		                            </div>
+   		                        </div>
+   		                    `).join('');
+   		                    historyContainer.html(historyHtml);
+   		                    $('#EmpcodeDetailsModal').modal({
+   		                        backdrop: 'static',
+   		                        keyboard: false
+   		                    });
+   		                    $('#EmpcodeDetailsModal').modal('show');
+   		                    $('.close').click(function () {
+   		                        $('#EmpcodeDetailsModal').modal('hide');
+   		                    });
+   		                } else {
+   		                    historyContainer.html('<p>No file history available.</p>');
+   		                    $('#EmpcodeDetailsModal').modal({
+   		                        backdrop: 'static',
+   		                        keyboard: false
+   		                    });
+   		                    $('#EmpcodeDetailsModal').modal('show');
+   		                    $('.close').click(function () {
+   		                        $('#EmpcodeDetailsModal').modal('hide');
+   		                    });
+   		                }
+   		                resolve();
+   		            },
+   		            error: function () {
+   		                $(`#history-${tempId}`).html('<p>Failed to load file history.</p>');
+   		                $('#EmpcodeDetailsModal').modal({
+		                        backdrop: 'static',
+		                        keyboard: false
+		                    });
+		                    $('#EmpcodeDetailsModal').modal('show');
+		                    $('.close').click(function () {
+		                        $('#EmpcodeDetailsModal').modal('hide');
+		                    });
+   		                resolve();
+   		            }
+   		        });
+   		    });
+   		}
+
+   		// **Helper Function to Format Date**
+   		function formatDateTime(dateString) {
+   		    const options = { day: '2-digit', month: '2-digit', year: 'numeric' };
+   		    return new Date(dateString).toLocaleDateString('en-GB', options);
+   		}
+
+
+
+        
+    	function loadDashboardData() {
+    	    const deptId = $('#deptId').text().trim();
+    	    console.log(deptId);
+
+    	    $.ajax({
+    	        url: `/gcc/api/pensionerdashboard/departmentdashboard?deptId=${encodeURIComponent(deptId)}`,
+    	        type: 'GET',
+    	        contentType: 'application/json',
+    	        success: function (data) {
+    	            const statsDiv = document.getElementById('stats');
+    	            statsDiv.innerHTML = ''; // Clear previous stats
+
+    	            data.forEach(item => {
+    	                const statCard = document.createElement('div');
+    	                statCard.className = 'stat-card';
+    	                statCard.innerHTML = `
+    	                    <h2>${item.category_count}</h2>
+    	                    <p>${item.file_name}</p>
+    	                `;
+    	                statsDiv.appendChild(statCard);
+    	            });
+
+    	            // Call renderCharts after data is loaded
+    	            renderCharts();
+    	        },
+    	        error: function (xhr) {
+    	            console.error('Error fetching dashboard data:', xhr.status, xhr.responseText);
+    	        }
+    	    });
+    	}
+
+    	// Function to handle search button click
+    	document.getElementById('searchButton').addEventListener('click', function () {
+    	    const startDate = document.getElementById('startDate').value;
+    	    const endDate = document.getElementById('endDate').value;
+    	    const deptId = $('#deptId').text().trim();
+
+    	    if (!startDate || !endDate) {
+    	        Swal.fire({
+    	            icon: "warning",
+    	            title: "Incomplete Search",
+    	            text: "Please select the Date Before searching",
+    	            confirmButtonText: "OK",
+    	        });
+    	    } else {
+    	        $.ajax({
+    	            url: `/gcc/api/pensionerdashboard/dashboardsearch?startdate=${startDate}&enddate=${endDate}&deptId=${encodeURIComponent(deptId)}`,
+    	            type: 'GET',
+    	            success: function (data) {
+    	                const statsDiv = document.getElementById('stats');
+    	                statsDiv.innerHTML = data.map(item => `
+    	                    <div class='stat-card'>
+    	                        <h2>${item.category_count}</h2>
+    	                        <p>${item.file_name}</p>
+    	                    </div>
+    	                `).join('');
+
+    	                // Re-render charts after search results load
+    	                renderCharts(startDate, endDate);
+    	            },
+    	            error: function (xhr) {
+    	                console.error('Error fetching search data:', xhr.status, xhr.responseText);
+    	            }
+    	        });
+    	    }
+    	});
+
+    	
+    	function renderCharts(startDate = null, endDate = null) {
+    	    const deptId = $('#deptId').text().trim();
+
+    	    // Dispose existing amCharts instances
+    	    disposeExistingCharts();
+
+    	    function disposeExistingCharts() {
+    	        if (window.chart1) {
+    	            window.chart1.clear();
+    	            window.chart1 = null;
+    	        }
+    	        if (window.chart2) {
+    	            window.chart2.clear();
+    	            window.chart2 = null;
+    	        }
+    	    }
+
+    	    // Render pie chart
+    	  const fixedColors = {
+    "Retirement": "#6A0572", // Deep Purple
+    "Family Pension": "#2C3E50", // Dark Blue-Gray
+    "Pendency": "#A569BD", // Soft Lavender
+    "GIS": "#17A589", // Teal Green
+    "Provisional Retirement": "#D35400", // Warm Orange
+    "Contributory Pension Scheme": "#5D6D7E"  // Muted Gray-Blue
+};
+
+$.ajax({
+    url: `/gcc/api/pensionerdashboard/categoryCounts`,
+    type: 'GET',
+    data: { deptId, startDate, endDate },
+    dataType: 'json',
+    success: function (data) {
+        const chartData = data.map((item, index) => ({
+            category: item.file_name,
+            value: item.category_count,
+            color: fixedColors[item.file_name], // Assign colors cyclically
+            id: item.id
+        }));
+
+        window.chart1 = AmCharts.makeChart("overallPieChart", {
+            type: "pie",
+            theme: "dark",
+            dataProvider: chartData,
+            valueField: "value",
+            titleField: "category",
+            colorField: "color",
+            radius: "40%", 
+            innerRadius: "50%", 
+            labelText: "[[[[title]]]] - [[[[value]]]]",
+            fontSize: 14,
+            
+            labelsEnabled: true,
+            pullOutRadius: 0,
+           
+            gradientRatio: [-0.4, -0.4, -0.4, -0.4, -0.4, -0.4, 0, 0.1, 0.2, 0.1, 0, -0.2, -0.5], 
+            export: {
+                enabled: true,
+            },
+            responsive: {
+                enabled: true,
+            },
+            
+            legend: {
+                position: "bottom",
+                markerType: "circle",
+                valueText: "[[[[value]]]]",
+                switchable: false,
+                markerSize: 12,
+                fontSize: 12
+                
+                
+            },
+            balloon: {
+                fixedPosition: true
+            },
+            listeners: [
+                {
+                    event: "clickSlice",
+                    method: function (event) {
+                        const FileId = event.dataItem.dataContext.id;
+                        const FileNumber = event.dataItem.dataContext.category;
+                        fetchempno(FileId, FileNumber);
+                    }
+                }
+            ]
+        });
+    },
+    error: function (xhr, status, error) {
+        console.error("AJAX Request Failed:", status, error);
+        console.error("Response Text:", xhr.responseText); 
+    }
+});
+
+    	    function fetchempno(FileId, FileNumber) {
+    	        $.ajax({
+    	            url: `/gcc/api/pensionerdashboard/getEmpNoByFileName?file_id=${FileId}`,
+    	            type: 'GET',
+    	            success: function (response) {
+    	                renderEmpNoModal(FileNumber, response);
+    	            },
+    	            error: function (xhr) {
+    	                console.error("Error fetching region details:", xhr.status, xhr.responseText);
+    	            }
+    	        });
+    	    }
+
+    	    function renderEmpNoModal(FileNumber, empNos) {
+    	        console.log(empNos);
+    	        const modalContent = `
+    	            <div class="modal-header">
+    	                <h5 class="modal-title">Employee Numbers for ${FileNumber}</h5>
+    	                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+    	                    <span aria-hidden="true">&times;</span>
+    	                </button>
+    	            </div>
+    	            <div class="modal-body">
+    	                <table class="table table-bordered">
+    	                    <thead>
+    	                        <tr><th>Employee Number</th></tr>
+    	                    </thead>
+    	                    <tbody>
+    	                        ${empNos.map(empNo => `<tr><td>${empNo.emp_no}</td></tr>`).join('')}
+    	                    </tbody>
+    	                </table>
+    	            </div>
+    	        `;
+
+    	        document.getElementById('zone-details-content').innerHTML = modalContent;
+    	       // $('#zoneDetailsModal').modal('show');
+    	        $('.close').click(function () {
+    	            $('#zoneDetailsModal').modal('hide');
+    	        });
+    	    }
+    	    
+    	   
+
+    	    function getRandomColor() {
+    	        const letters = '0123456789ABCDEF';
+    	        let color = '#';
+    	        for (let i = 0; i < 6; i++) {
+    	            color += letters[Math.floor(Math.random() * 16)];
+    	        }
+    	        return color;
+    	    }
+
+    	    // Render bar chart
+    	    $.ajax({
+    	        url: `/gcc/api/pensionerdashboard/stageWiseCounts`,
+    	        type: 'GET',
+    	        data: { deptId, startDate, endDate },
+    	        dataType: 'json',
+    	        success: function (data) {
+    	            const colorMapping = {
+	    	                "Audit Pending": "#FF5733",
+	    	                "Department Pending": "#FFC300",
+	    	                "Pension Pending": "#28B463",
+	    	                "Completed": "#3498DB"
+    	            };
+
+    	            const chartData = data.map(item => ({
+    	                category: item.category,
+    	                value: item.category_count,
+    	                color: colorMapping[item.category] || '#D3D3D3'
+    	            }));
+
+    	            window.chart2 = AmCharts.makeChart("stagesBarChart", {
+    	                 type: "serial",
+    	                 theme: "light",
+    	                 dataProvider: chartData,
+    	                 depth3D: 2,
+    	                 angle: 10,
+    	                 valueAxes: [{
+    	                     axisAlpha: 0,
+    	                     gridAlpha: 0,
+    	                     labelsEnabled: false,
+    	                     dashLength: 0
+    	                 }],
+    	                 startDuration: 1,
+    	                 startEffect: "easeInSine",
+    	                 graphs: [{
+    	                     balloonText: "[[[[category]]]]: [[[[value]]]]",
+    	                     fillAlphas: 0.8,
+    	                     lineAlpha: 0.3,
+    	                     topRadius: 1,
+    	                     type: "column",
+    	                     valueField: "value",
+    	                     fillColorsField: "color",
+    	                     columnWidth: 0.5,
+    	                     labelText: "[[[[value]]]]",
+    	                     labelPosition: "right",
+    	                     fontSize: 14,
+    	                     color: "#000000"
+    	                     
+    	                 }],
+    	                 categoryField: "category",
+    	                 categoryAxis: {
+    	                     gridPosition: "start",
+    	                     gridAlpha: 0,
+    	                     autoWrap: false,
+    	                     axisAlpha: 0,
+    	                     fontSize: 14,  // Increases the category label size
+    	                       // Makes category labels bold
+    	                     labelRotation: 0 
+    	                
+    	                 },
+    	                 rotate: true,
+    	                 export: {
+    	                     enabled: true,
+    	                     position: "bottom-right"
+    	                 }
+    	             });
+
+    	             console.log("Stages Bar Chart Data:", chartData);
+    	         },
+    	         error: function (xhr, status, error) {
+    	             console.error("AJAX Request Failed:", status, error);
+    	         }
+    	     });
+    	 }
+
+    	// Initial data load
+    	loadDashboardData();
+    	 document.querySelector("input[type='reset']").addEventListener('click', function () {
+             window.location.href = "/gcc/department/dashboard";
+         });
+
+    })
+    
+    
+     
+        $('#startDate').on('change', function () {
+	        const fromDate = $(this).val();
+	        $('#endDate').attr('min', fromDate); // Update min attribute for To Date
+
+	        // If To Date is earlier than the new From Date, adjust it
+	        const toDate = $('#endDate').val();
+	        if (new Date(toDate) < new Date(fromDate)) {
+	            $('#endDate').val(fromDate);
+	        }
+	    });
+
+	    // Update From Date's max attribute when To Date changes
+	    $('#endDate').on('change', function () {
+	        const toDate = $(this).val();
+	        $('#startDate').attr('max', toDate); // Update max attribute for From Date
+
+	        // If From Date is later than the new To Date, adjust it
+	        const fromDate = $('#startDate').val();
+	        if (new Date(fromDate) > new Date(toDate)) {
+	            $('#startDate').val(toDate);
+	        }
+	    });
+        
+        
+         	//disable future dates
+	document.addEventListener("DOMContentLoaded", function () {
+        let today = new Date().toISOString().split("T")[0]; // Get today's date in YYYY-MM-DD format
+        let startdateInput = document.getElementById("startDate");
+        let enddateInput = document.getElementById("endDate");
+
+        // Set max attribute to disable future dates
+        startdateInput.setAttribute("max", today);
+        enddateInput.setAttribute("max", today);
+        
+
+        // Prevent manual future date entry
+        startdateInput.addEventListener("change", function () {
+            if (this.value > today) {
+                Swal.fire({
+                    icon: 'warning',
+                    title: 'Invalid Date',
+                    text: 'Future dates are not allowed.',
+                    confirmButtonText: 'OK'
+                });
+                this.value = ""; // Clear the invalid input
+            }
+        });
+    });
+    
+
+
+    </script>
+</body>
+
+</html>
diff --git a/src/main/resources/templates/modules/pensioner/department/newentry/.DS_Store b/src/main/resources/templates/modules/pensioner/department/newentry/.DS_Store
new file mode 100644
index 0000000..098520a
Binary files /dev/null and b/src/main/resources/templates/modules/pensioner/department/newentry/.DS_Store differ
diff --git a/src/main/resources/templates/modules/pensioner/department/newentry/gis.html b/src/main/resources/templates/modules/pensioner/department/newentry/gis.html
index 9617aba..255148d 100644
--- a/src/main/resources/templates/modules/pensioner/department/newentry/gis.html
+++ b/src/main/resources/templates/modules/pensioner/department/newentry/gis.html
@@ -439,6 +439,7 @@ document.addEventListener("DOMContentLoaded", function () {
     	        // Add change event listener to the radio buttons
     	        $('input[name="staffType"]').off('change').on('change', function () {
     	            const selectedType = $('input[name="staffType"]:checked').val();
+    	            console.log(selectedType);
     	            
     	            $('#staffTypeContainer').hide();
 
@@ -493,10 +494,12 @@ document.addEventListener("DOMContentLoaded", function () {
     	            }
     	        });
     	    });
-    	    $('#submitButton').off('click').on('click', function () {
+    	    /* $('#submitButton').off('click').on('click', function () {
+    	    	   	    	    	
     	        const gisPattern = /^GIS\d+$/;
     	        const employeeNo = $('#employeeno').val().trim();
-
+				
+    	        console.log("=====");
     	        // Validate Employee No
     	        if (!gisPattern.test(employeeNo)) {
     	            Swal.fire({
@@ -513,7 +516,7 @@ document.addEventListener("DOMContentLoaded", function () {
     	        // Log and call save function
     	        console.log("Save button clicked. Triggering saveEntryDetails function.");
     	        saveEntryDetailsnew();
-    	    });
+    	    }); */
 
     	});
 
@@ -522,7 +525,7 @@ document.addEventListener("DOMContentLoaded", function () {
         // Handle Search button click
         $('#searchButton').on('click', function () {
             const empCode = $('#empCode').val().trim(); // Trim input to avoid accidental spaces
-
+            $('input[name="staffType"]').prop('checked', false);
             console.log("empCode...",empCode);
 
             if (!empCode) {
@@ -638,15 +641,19 @@ document.addEventListener("DOMContentLoaded", function () {
                         $('#designation').val(employeeDetails.DESIGNATION).prop('readonly', true);
                         $('#classes').val(employeeDetails.GROUP_TYPE);
                         $('#retrirementdate').val(employeeDetails.RETIREMENT_DATE);
+                        
+                        
+                        $('#servicedeath').val('');
+                        $('#deceased').val('');
+                        $('#remarks').val(''); 
+                        $('#gisentry').val('');
+                                                 
 
                         $('#EmployeeCode').text(empCode);
                         $('#employeeCard').show();
 
-                        // Attach event handler for saving details
-                        $('#submitButton').off('click').on('click', function () {
-                            console.log("Save button clicked. Triggering saveEntryDetails function.");
-                            saveEntryDetailsnew();
-                        });
+                        // Attach event handler for saving details 
+                       
                     } else {
                         console.warn("No employee data found in the external API response.");
                         Swal.fire({
@@ -718,11 +725,34 @@ document.addEventListener("DOMContentLoaded", function () {
             loadEntryTypes();
         });
 
-
+	    $('#submitButton').off('click').on('click', function () {
+            console.log("Save button clicked. Triggering saveEntryDetails function.");
+            saveEntryDetailsnew();
+        });
+	    
         function saveEntryDetailsnew() {
         	
-        	const selectedstaffType = $('input[name="staffType"]:checked').val();
-        	console.log("selectedstaffType====="+selectedstaffType);
+        	const selectedstaffType1 = $('input[name="staffType"]:checked').val();
+        	console.log("selectedstaffType====="+selectedstaffType1);
+        	
+        	if(selectedstaffType1 ==='temporary'){
+        		const gisPattern1 = /^GIS\d+$/;
+    	        const employeeNo1 = $('#employeeno').val().trim();
+				
+    	        console.log("==New===");
+    	        // Validate Employee No
+    	        if (!gisPattern1.test(employeeNo1)) {
+    	            Swal.fire({
+    	                icon: 'warning',
+    	                title: 'Validation Error',
+    	                text: 'Employee No must start with "GIS" and be followed by one or more numbers.',
+    	                confirmButtonText: 'OK'
+    	            });
+    	            console.log('New Validation failed: Employee No is invalid.');
+    	            $('#submitButton').prop('disabled', false).text('Mark as Forwarded to Pension'); // Re-enable button
+    	            return; // Stop execution if validation fails
+    	        }
+        	}
         	
         	   let selgisamount = $('input[name="gisamount"]:checked').val();
                let selgismamountval = null;
@@ -739,11 +769,25 @@ document.addEventListener("DOMContentLoaded", function () {
                        return ; // Stop further execution
                    }
                }
+               
+               
+               
+               let employeeName = $('#employeename').val().trim();
+		        if (!/^[A-Za-z.\s]+$/.test(employeeName)) {
+		            Swal.fire({
+		                icon: 'warning',
+		                title: 'Validation Error',
+		                text: 'Employee Name must contain only alphabets.',
+		                confirmButtonText: 'OK'
+		            });
+		            return;
+		        }
+               
         	
         	
             let entryDetails = {
                 empNo: $('#employeeno').val(),
-                empName: $('#employeename').val(),
+                empName: employeeName,
                 deptName: $('#department').val(),
                 designation: $('#designation').val(),
                 serviceDeath: $('#servicedeath').val(),
@@ -812,7 +856,7 @@ document.addEventListener("DOMContentLoaded", function () {
                 return;
             }
 
-            if (selectedstaffType !== 'temporary'){
+            if (selectedstaffType1 !== 'temporary'){
             
             if (!entryDetails.gisentry || entryDetails.gisentry.trim() === '') {
                 Swal.fire({
@@ -866,7 +910,7 @@ document.addEventListener("DOMContentLoaded", function () {
 
             // Step 1: Check if the employee exists in the database
             $('#submitButton').prop('disabled', true).text('Checking...');
-            $.ajax({
+             $.ajax({
                 url: '/gcc/api/department/newentry/exists',
                 type: 'GET',
                 data: { empCode: employeeNo },
@@ -937,7 +981,7 @@ document.addEventListener("DOMContentLoaded", function () {
                     });
                     $('#submitButton').prop('disabled', false).text('Mark as Forwarded to pension'); // Re-enable button
                 }
-            });
+            }); 
         }
 
     });
@@ -1003,7 +1047,7 @@ document.addEventListener("DOMContentLoaded", function () {
 		        $(this).val(value.replace(/[^A-Za-z\s]/g, '')); // Allow only letters and spaces
 		    });
 
-		    $('#submitButton').on('click', function () {
+		   /*  $('#submitButton').on('click', function () {
 		        const employeeName = $('#employeename').val().trim();
 
 
@@ -1016,7 +1060,7 @@ document.addEventListener("DOMContentLoaded", function () {
 		            });
 		            return;
 		        }
-		    });
+		    }); */
 		});
 
            
diff --git a/src/main/resources/templates/modules/pensioner/department/received/provisionalretirement.html b/src/main/resources/templates/modules/pensioner/department/received/provisionalretirement.html
index 9835daa..a77c07c 100644
--- a/src/main/resources/templates/modules/pensioner/department/received/provisionalretirement.html
+++ b/src/main/resources/templates/modules/pensioner/department/received/provisionalretirement.html
@@ -617,7 +617,7 @@ margin-top: 10px;
 
 	 	                
 	 	               $(document).ready(function () {
-	 	            	    $(document).on('click', '#submitbutton', function () {
+	 	            	  $(document).off('click', '#submitbutton').on('click', '#submitbutton', function () {
 	 	            	    	
 	 	            	    	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value
 	 	            	    // Trigger the save function and pass the value
diff --git a/src/main/resources/templates/modules/pensioner/pensioner/.DS_Store b/src/main/resources/templates/modules/pensioner/pensioner/.DS_Store
new file mode 100644
index 0000000..58fc95d
Binary files /dev/null and b/src/main/resources/templates/modules/pensioner/pensioner/.DS_Store differ
diff --git a/src/main/resources/templates/modules/pensioner/pensioner/dashboard.html b/src/main/resources/templates/modules/pensioner/pensioner/dashboard.html
index a28dc65..be7ef80 100644
--- a/src/main/resources/templates/modules/pensioner/pensioner/dashboard.html
+++ b/src/main/resources/templates/modules/pensioner/pensioner/dashboard.html
@@ -1,966 +1,966 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-<style>
-    /* Base Layout and Styling */
-
-body {
-    font-family: 'Arial', sans-serif;
-    background-color: #f8f9fa;
-}
-
-/* Card Styling */
-.card-box {
-    border-radius: 12px;
-    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
-    background-color: #ffffff;
-    padding: 20px;
-    transition: transform 0.3s ease-in-out;
-}
-
-.card-box:hover {
-    transform: translateY(-5px);
-}
-
-/* Title Styling */
-h3 {
-    font-size: 1.2rem;
-    color: #444;
-}
-
-/* Styling for Overall Pendency and Stage Wise Sections */
-.charts {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 30px; /* Increased gap between charts */
-    margin-top: 30px; /* Increased margin-top */
-}
-
-.chart {
-    flex: 1;
-    background: #ffffff; /* White background */
-    padding: 20px;
-    border-radius: 8px;
-    border: 2px solid #1e90ff; /* Add a colored border */
-    width: 100%;
-    box-sizing: border-box;
-    text-align: center;
-    transition: all 0.3s ease-in-out;
-}
-
-.chart:hover {
-    box-shadow: 0 6px 12px rgba(0, 0, 0, 0.2);
-}
-
-.chart h3 {
-    font-size: 1.2rem;
-    color: #333;
-    margin-bottom: 15px;
-}
-
-.chart canvas {
-    display: block;
-    max-width: 100%;
-    height: auto;
-}
-
-/* Stats Cards */
-.stats {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: center;
-    gap: 30px; /* Increased gap between stats cards */
-    margin-top: 30px; /* Increased margin-top */
-}
-
-.stat-card {
-    background: #ffffff;
-    border: 2px solid #1e90ff;
-    padding: 20px;
-    border-radius: 8px;
-    text-align: center;
-    flex: 1;
-    margin: 10px; /* Reduced margin for cleaner look */
-}
-
-.stat-card:hover {
-    transform: scale(1.05);
-    box-shadow: 0 6px 12px rgba(0, 0, 0, 0.2);
-}
-
-.stat-card h2 {
-    margin: 0;
-    font-size: 36px;
-    color: #007bff; 
-}
-
-.stat-card p {
-    margin: 5px 0 0;
-    font-size: 13px;
-    color: #555;
-    font-weight:bold;
-}
-
-/* Buttons */
-.btn-primary:hover {
-    background-color: #0056b3;
-}
-
-.btn-warning:hover {
-    background-color: #e0a800;
-}
-
-/* Container Styling */
-.container {
-    max-width: 1200px;
-    margin: 20px auto;
-    padding: 20px;
-    background: #fff;
-    border-radius: 8px;
-    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
-}
-
-/* Date Input Row */
-.row.mt-3.ml-2 {
-    margin-top: 20px; /* Increased margin-top */
-}
-
-/* Responsive Design */
-@media (min-width: 768px) {
-    .charts {
-        flex-direction: row;
-    }
-
-    .charts .chart {
-        width: calc(50% - 15px); /* Increased gap between charts */
-    }
-
-    .stats {
-        flex-direction: row;
-    }
-}
-
-@media (max-width: 576px) {
-    .charts,
-    .stats {
-        flex-direction: column;
-    }
-
-    .stat-card {
-        margin: 15px 0; /* Increased margin for better spacing */
-    }
-}
-.file-history-list {
-    margin-top: 10px;
-    padding-left: 0;
-}
-
-
-.file-history-item {
-    display: flex;
-    padding: 5px 10px;
-    font-family: Arial, sans-serif;
-    align-items: flex-start;
-    position: relative; /* For vertical line positioning */
-    margin-bottom: 1px; /* Add space between items */
-}
-
-.file-history-item::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 120px; /* Position of the vertical line */
-    width: 1px;
-    background-color: #ddd;
-}
-
-.file-history-date {
-margin-top: 10px;
-    flex: 0 0 100px;
-    font-weight: bold;
-    font-size: 0.8rem;
-    color: #333;
-    text-align: center;
-    white-space: nowrap; /* Prevent wrapping */
-}
-
-.file-history-content {
-    flex: 5;
-    padding-left: 20px; /* Adds space after the vertical line */
-    display: flex;
-    flex-direction: column;
-    gap: 5px; /* Adds spacing between status and remarks */
-    white-space: pre-wrap; /* Prevents wrapping */
-    overflow: visible; /* Prevents content overflow */
-    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
-}
-
-.file-history-status {
-    font-size: 0.8rem;
-    font-weight: bold;
-    color: #555;
-    white-space:pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}
-
-.file-history-remarks {
-    font-size: 0.8rem;
-    color: #777;
-    white-space: pre-wrap; /* Prevent wrapping */
-    overflow: visible;
-    text-overflow: ellipsis;
-}   
-
-#returnretrieddetailsModal .modal-body{
-	max-height:80vh;
-	overflow-y:auto; 
-}
-table.dataTable td {
-    white-space: normal !important;
-    word-wrap: break-word !important;
-}
-
-
-</style>
-
-<body>
-    <div class="wrapper">
-        <header th:replace="~{fragments/modules/base/header :: header}"></header>
-        <div class="page-wrap">
-            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-            <div class="main-content">
-                <div class="container-fluid">
-                    <div class="page-header 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>Dashboard</h5>
-                                        <span>Pension Entries</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">Pension Entries</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Dashboard</li>
-                                    </ol>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row mt-4">
-                        <div class="col-md-12">
-                           
-                              <div class="card">
-					        <div class="card-block">
-                                 <h5 style="font-weight: bold;">Pension Department</h5>
-                                         
-                                          <div class="d-flex justify-content-end align-items-center">
-											    <label for="EmpCode" style="font-weight: bold; margin-right: 10px;" class="mb-0">EmpCode:</label>
-											    <input type="text" id="EmpCode" name="EmpCode" class="form-control" style="width: auto; min-width: 150px; margin-right: 10px;">
-											    <button id="searchEmpButton" class="btn btn-primary">Search</button>
-											</div>
-											                                         
-										<div class="row mt-3 ml-2 ">
-											    <div class="col-md-3">
-											        <label for="startDate" class="form-label">From Date:</label>
-											        <input type="date" id="startDate" class="form-control" onclick="this.showPicker()">
-											    </div>
-											    <div class="col-md-3">
-											        <label for="endDate" class="form-label">To Date:</label>
-											        <input type="date" id="endDate" class="form-control" onclick="this.showPicker()">
-											    </div>
-											    <div class="col-md-3">
-											        <label for="deptId" class="form-label fw-bold">Department Name:</label>
-											        <div class="dropdown">
-											            <select id="deptId" class="form-control" style="width: 100%;" required>
-											                <option value="" selected>-- Select Option --</option>
-											            </select>
-											        </div>
-											    </div>
-											    
-											    <!-- Centering the Buttons -->
-											    <div class="col-12 d-flex justify-content-center mt-3">
-											        <button id="searchButton" class="btn btn-primary mx-2">Search</button>
-											        <input type="reset" class="btn btn-warning mx-2" value="Reset">
-											    </div>
-											</div>
-
-
-                                            <div id="stats" class="stats"></div>
-                                            <div class="charts">
-                                                <div class="chart">
-                                                    <h3>File Category  - Overall</h3>
-                                                    <div id="overallPieChart" style="width: 100%; height: 400px;"></div>
-                                                    
-                                                </div>
-                                                <div class="chart">
-                                                    <h3>File Category Stages Wise</h3>
-                                                    <div id="stagesBarChart" style="width: 100%; height: 400px;"></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="zoneDetailsModal" tabindex="-1"
-		role="dialog" aria-labelledby="zoneDetailsModalLabel"
-		aria-hidden="true" data-backdrop="static" data-keyboard="false">
-		<div class="modal-dialog modal-lg" role="document">
-			<div class="modal-content">
-				<div id="zone-details-content"></div>
-			</div>
-		</div>
-	</div>
-	<div class="modal fade" id="EmpcodeDetailsModal" tabindex="-1"
-		role="dialog" aria-labelledby="zoneDetailsModalLabel"
-		aria-hidden="true" data-backdrop="static" data-keyboard="false">
-		<div class="modal-dialog modal-xl" role="document">
-			<div class="modal-content">
-				<div id="emp-details-content"></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>
-    <!-- Bootstrap 5 JS -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
-    
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-    <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-
-    <script src="/assets/node_modules/amcharts3/amcharts/amcharts.js"></script>
-	<script src="/assets/node_modules/amcharts3/amcharts/serial.js"></script>
-	
-	<script src="/assets/node_modules/amcharts3/amcharts/pie.js"></script>
-	<script src="/assets/node_modules/amcharts3/amcharts/themes/light.js"></script>
-	
-    <script>
-    document.addEventListener('DOMContentLoaded', function () {
-    	 $('#searchEmpButton').on('click', function () { // Ensure there's a button with id "searchButton"
-    	        const Empcode = document.getElementById('EmpCode').value.trim(); // Get input value
-    	        console.log("empcode",Empcode);
-    	
-    	   //fetch details
-    	if (Empcode) {
-            $.ajax({
-                url: `/fetchPensionEmpDetails?Empcode=${Empcode}`, // Backend API route
-                type: 'GET',
-                success: function (response) {
-                    console.log(response);
-
-                    if (!response || response.length === 0) {  // Check if response is empty
-                        Swal.fire({
-                            icon: "warning",
-                            title: "No Data Found",
-                            text: "No records found for the entered Employee Code.",
-                            confirmButtonText: "OK",
-                        });
-                    } else {
-                        renderEmpDetailsModal(response);
-                    }
-                },
-                error: function (xhr) {
-                    console.error("Error fetching employee details:", xhr.status, xhr.responseText);
-                }
-            });
-        } else {
-		            Swal.fire({
-		                icon: "warning",
-		                title: "Enter Employee Code",
-		                text: "Please enter an Employee Code before searching.",
-		                confirmButtonText: "OK",
-		            });
-		        }
-    	   })
- 
-
-    	 
-    			function renderEmpDetailsModal(data) {
-        		    const Empcode = document.getElementById('EmpCode').value.trim();
-
-        		    let modalContent = `
-        		        <div class="modal-header">
-        		            <h5 class="modal-title">Employee Details for ${Empcode}</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="table-responsive">
-        		                <table id="DashboardDatatable" class="table table-striped table-bordered table-hover dataTable">
-        		                    <thead class="thead-dark">
-        		                        <tr>
-        		                            <th class="text-center">S.NO</th>
-        		                            <th class="text-center">Department Name</th>
-        		                            <th class="text-center">File Name</th>
-        		                            <th class="text-center">File Status</th>
-        		                            <th class="text-center">History</th>
-        		                        </tr>
-        		                    </thead>
-        		                    <tbody>
-        		                        ${data.map((item, index) => `
-        		                            <tr data-temp-id="${item.temp_id}">
-        		                                <td>${index + 1}</td>
-        		                                <td>${item.dept_name}</td>
-        		                                <td>${item.file_name}</td>
-        		                                <td>${item.file_status}</td>
-        		                                <td class="file-history-column" id="history-${item.temp_id}">Loading...</td>
-        		                            </tr>
-        		                        `).join('')}
-        		                    </tbody>
-        		                </table>
-        		            </div>
-        		        </div>
-        		    `;
-
-        		    document.getElementById('emp-details-content').innerHTML = modalContent;
-
-        		    // **Fetch History Before Initializing DataTable**
-        		    let fetchPromises = data.map(item => fetchDetailsByTempId(item.temp_id));
-
-        		    Promise.all(fetchPromises).then(() => {
-        		        $('#EmpcodeDetailsModal').modal({
-        		            backdrop: 'static',
-        		            keyboard: false
-        		        });
-
-        		        // **Initialize DataTable AFTER Data is Loaded and reason for intialize**
-        		        setTimeout(() => {
-        		            let table = $('#DashboardDatatable').DataTable({
-        		                dom: 'Bftip',
-        		                columnDefs: [{ targets: 'no-sort', orderable: false }],
-        		                lengthMenu: [
-        		                    [50, 100, 200, 500, -1],
-        		                    ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
-        		                ],
-        		                scrollY: '50vh',
-        		             // ✅ Prevents automatic column width issues
-								        		               buttons: [
-								    { extend: 'pageLength', className: 'btn btn-warning' },
-								    { 
-								        extend: 'copyHtml5', 
-								        text: 'Copy', 
-								        className: 'btn btn-secondary',
-								        exportOptions: { columns: ':visible', modifier: { page: 'all' } }
-								    },
-								    { 
-								        extend: 'excelHtml5', 
-								        text: 'Excel', 
-								        className: 'btn btn-secondary',
-								        customize: function (xlsx) {
-								            let sheet = xlsx.xl.worksheets['sheet1.xml'];
-								            $('row c[r]', sheet).attr('s', '55'); // Apply word-wrap formatting
-								        }
-								    },
-								    { 
-								        extend: 'csvHtml5', 
-								        text: 'CSV', 
-								        className: 'btn btn-secondary',
-								        exportOptions: { columns: ':visible' }
-								    },
-								    { 
-								        extend: 'pdfHtml5', 
-								        text: 'PDF', 
-								        className: 'btn btn-secondary',
-								        orientation: 'landscape',
-								        pageSize: 'A4',
-								        customize: function (doc) {
-								            doc.styles.tableBodyEven.alignment = 'left';
-								            doc.styles.tableBodyOdd.alignment = 'left';
-								            doc.styles.tableHeader.alignment = 'center';
-								            doc.defaultStyle.fontSize = 9;
-								            doc.styles.tableHeader.fontSize = 10;
-								            doc.content[1].table.widths = Array(doc.content[1].table.body[0].length + 1).join('*').split('');
-								        }
-								    }
-								],
-
-        		                responsive: false,
-        		                processing: false
-        		            });
-
-        		            // ✅ Adjust column width after table is fully initialized
-        		            
-        		        }, 200);
-        		    });
-        		}
-
-        		
-        		
-
-        		// **Fetch History & Update Table**
-        		function fetchDetailsByTempId(tempId) {
-        		    return new Promise((resolve, reject) => {
-        		        $.ajax({
-        		            url: `/fetchTempDetails?tempId=${tempId}`,
-        		            type: 'GET',
-        		            success: function (response) {
-        		                let historyContainer = $(`#history-${tempId}`);
-        		                if (response.length > 0) {
-        		                    let historyHtml = response.map(item => `
-        		                        <div class="file-history-item">
-        		                            <div class="file-history-date">${formatDateTime(item.file_moved_date)}</div>
-        		                            <div class="file-history-content">
-        		                                <div class="file-history-status">${item.file_status}</div>
-        		                                <div class="file-history-remarks">Comments/Remarks: ${item.remarks || 'N/A'}</div>
-        		                            </div>
-        		                        </div>
-        		                    `).join('');
-        		                    historyContainer.html(historyHtml);
-        		                    $('#EmpcodeDetailsModal').modal({
-        		                        backdrop: 'static',
-        		                        keyboard: false
-        		                    });
-        		                    $('#EmpcodeDetailsModal').modal('show');
-        		                    $('.close').click(function () {
-        		                        $('#EmpcodeDetailsModal').modal('hide');
-        		                    });
-        		                } else {
-        		                    historyContainer.html('<p>No file history available.</p>');
-        		                    $('#EmpcodeDetailsModal').modal({
-        		                        backdrop: 'static',
-        		                        keyboard: false
-        		                    });
-        		                    $('#EmpcodeDetailsModal').modal('show');
-        		                    $('.close').click(function () {
-        		                        $('#EmpcodeDetailsModal').modal('hide');
-        		                    });
-        		                }
-        		                resolve();
-        		            },
-        		            error: function () {
-        		                $(`#history-${tempId}`).html('<p>Failed to load file history.</p>');
-        		                $('#EmpcodeDetailsModal').modal({
-    		                        backdrop: 'static',
-    		                        keyboard: false
-    		                    });
-    		                    $('#EmpcodeDetailsModal').modal('show');
-    		                    $('.close').click(function () {
-    		                        $('#EmpcodeDetailsModal').modal('hide');
-    		                    });
-        		                resolve();
-        		            }
-        		        });
-        		    });
-        		}
-
-        		// **Helper Function to Format Date**
-        		function formatDateTime(dateString) {
-        		    const options = { day: '2-digit', month: '2-digit', year: 'numeric' };
-        		    return new Date(dateString).toLocaleDateString('en-GB', options);
-        		}
-    				
-                
-    	
-    	 $.ajax({
- 	        url: "/getDepartments",
- 	        type: "GET",
- 	        
- 	        success: function (data) {
- 	            var dropdown = $("#deptId");
- 	            dropdown.empty();
- 	            dropdown.append('<option value="" selected>-- Select Option --</option>');
- 	            $.each(data, function (key, entry) {
- 	            	//console.log(entry);
- 	                dropdown.append($('<option></option>').attr('value', entry.dept_id).text(entry.dept_name));
- 	            });
- 	        },
- 	        error: function () {
- 	            console.log("Error loading dropdown data.");
- 	        }
- 	    });
-        // Function to fetch data from /dashboard endpoint
-        function loadDashboardData() {
-        	
-            $.ajax({
-                url: `/dashboard`,
-                type: 'GET',
-                contentType: 'application/json',
-                success: function (data) {
-                    const statsDiv = document.getElementById('stats');
-                    statsDiv.innerHTML = ''; // Clear previous stats
-
-                    data.forEach(item => {
-                        const statCard = document.createElement('div');
-                        statCard.className = 'stat-card';
-                        statCard.innerHTML = `
-                            <h2>${item.category_count}</h2>
-                            <p>${item.file_name}</p>
-                        `;
-                        statsDiv.appendChild(statCard);
-                    });
-
-                    // Call renderCharts after data is loaded
-                    console.log("Dashboard data loaded, rendering charts...");
-                    renderCharts();
-                },
-                error: function (xhr, status, error) {
-                    console.error('Error fetching dashboard data:', status, error);
-                }
-            });
-        }
-
-        // Function to handle search button click
-        document.getElementById('searchButton').addEventListener('click', function () {
-            const startDate = document.getElementById('startDate').value;
-            const endDate = document.getElementById('endDate').value;
-            const deptId= document.getElementById('deptId').value;
-            
-            console.log(deptId);
-            if (!startDate || !endDate ) {
-	 	        Swal.fire({
-	 	            icon: "warning",
-	 	            title: "Incomplete Search",
-	 	            text: "Please select the Date Before searching",
-	 	            confirmButtonText: "OK",
-	 	        });
-	 	    } else {
-
-            $.ajax({
-                url: `/dashboardsearch?startdate=${startDate}&enddate=${endDate}&deptId=${encodeURIComponent(deptId)}`,
-                type: 'GET',
-                
-                dataType: 'json',
-                success: function (data) {
-                    const statsDiv = document.getElementById('stats');
-                    statsDiv.innerHTML = data.map(item => `
-                        <div class='stat-card'>
-                            <h2>${item.category_count}</h2>
-                            <p>${item.file_name}</p>
-                        </div>
-                    `).join('');
-
-                    // Re-render charts after search results load
-                    renderCharts(startDate, endDate);
-                },
-                error: function () {
-                    console.error('Error fetching search data.');
-                }
-            });
-	 	    }
-        });
-
-        // Function to validate and set min-date for endDate
-       /*  function validateEndDate() {
-            const startDate = document.getElementById('startDate').value;
-            const endDateInput = document.getElementById('endDate');
-
-            if (startDate) {
-                const startDateObj = new Date(startDate);
-                const minEndDateISO = startDateObj.toISOString().split('T')[0];
-
-                endDateInput.setAttribute('min', minEndDateISO);
-
-                // Clear endDate if it's less than startDate
-                if (endDateInput.value && new Date(endDateInput.value) < startDateObj) {
-                    endDateInput.value = '';
-                }
-            }
-        }
-
-        document.getElementById('startDate').addEventListener('change', validateEndDate); */
-    	
-        
-      function renderCharts(startDate = null, endDate = null) {
-        	 const deptId= document.getElementById('deptId').value;
-        	 const dataParams = deptId ? { deptId, startDate, endDate } : { startDate, endDate };
-        	 console.log("deptId",deptId);
-        	  disposeExistingCharts();
-
-        // Dispose existing amCharts instances (amCharts v3 doesn't have a built-in registry)
-        function disposeExistingCharts() {
-            if (window.chart1) {
-                window.chart1.clear();
-                window.chart1 = null;
-            }
-            if (window.chart2) {
-                window.chart2.clear();
-                window.chart2 = null;
-            }
-        }
-
-        // Function to render charts using amCharts v3
-        	  const fixedColors = {
-		    "Retirement": "#6A0572", // Deep Purple
-		    "Family Pension": "#2C3E50", // Dark Blue-Gray
-		    "Pendency": "#A569BD", // Soft Lavender
-		    "GIS": "#17A589", // Teal Green
-		    "Provisional Retirement": "#D35400", // Warm Orange
-		    "Contributory Pension Scheme": "#5D6D7E"  // Muted Gray-Blue
-		};
-      $.ajax({
-                url: `/categoryCounts`,
-                type: 'GET',
-                data: dataParams,
-                dataType: 'json',
-                success: function (data,index) {
-                    const chartData = data.map(item => ({
-                        category: item.file_name,
-                        value: item.category_count,
-                        color: fixedColors[item.file_name] ,
-                        id:item.id
-                    }));
-
-                    window.chart1 = AmCharts.makeChart("overallPieChart", {
-                        type: "pie",
-                        theme: "dark",
-                        dataProvider: chartData,
-                        valueField: "value",
-                        titleField: "category",
-                        colorField: "color",
-                        radius: "40%", // Outer radius
-                        innerRadius: "50%", // Inner radius to create the donut shape
-                        labelText: "[[[[title]]]] - [[[[value]]]]",// this is to show the values on the  piechart
-                        fontSize: 14,
-                        labelsEnabled: true,
-                        pullOutRadius:0,
-                        gradientRatio: [-0.4, -0.4, -0.4, -0.4, -0.4, -0.4, 0, 0.1, 0.2, 0.1, 0, -0.2, -0.5],//this is to show the piechart in better look
-                        export: {
-                            enabled: true,
-                        },
-                        responsive: {
-                            enabled: true,
-                        },
-                        legend: {
-                            position: "bottom",
-                            markerType: "circle",
-                            valueText: "[[[[value]]]]",
-                            switchable: false,
-                            markerSize: 12,
-                            fontSize: 12
-                        },
-                        balloon: {
-                            fixedPosition: true
-                        },
-                        listeners: [
-                            {
-                                event: "clickSlice",
-                                method: function (event) {
-                                    const FileId = event.dataItem.dataContext.id;
-                                    const FileNumber = event.dataItem.dataContext.category;
-                                    // Fetch emp_no from the server based on file_name
-                                    fetchempno(FileId,FileNumber);
-                                }
-                            }
-                        ]
-                    });
-                },
-                error: function (xhr, status, error) {
-                	console.error("AJAX Request Failed:", status, error);
-                    console.error("Response Text:", xhr.responseText); 
-                }
-            });
-        function fetchempno(FileId,FileNumber){
-        	 $.ajax({
-        		 url: `/getEmpNoByFileName?file_id=${FileId}`,
-                 type: 'GET',
-                 success: function (response) {
-                     // Render the modal with emp_no data
-                     renderEmpNoModal(FileNumber, response);
-                 },
-                 error: function(error) {
-                     console.error("Error fetching region details:", error);
-                 }
-             });
-        }
-
-        function renderEmpNoModal(FileNumber, empNos) {
-        	console.log(empNos);
-            const modalContent = `
-                <div class="modal-header">
-                    <h5 class="modal-title">Employee Numbers for ${FileNumber}</h5>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">&times;</span>
-                    </button>
-                </div>
-                <div class="modal-body">
-                    <table class="table table-bordered">
-                        <thead>
-                            <tr>
-                                <th>Employee Number</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                        ${empNos.map(empNo => `<tr><td>${empNo.emp_no}</td></tr>`).join('')}
-                        </tbody>
-                    </table>
-                </div>
-            `;
-            
-            document.getElementById('zone-details-content').innerHTML = modalContent;
-            //$('#zoneDetailsModal').modal('show');
-            $('.close').click(function () {
-		        $('#zoneDetailsModal').modal('hide');
-		        
-		    });
-        }
-
-     function getRandomColor() {
-    	    const letters = '0123456789ABCDEF';
-    	    let color = '#';
-    	    for (let i = 0; i < 6; i++) {
-    	        color += letters[Math.floor(Math.random() * 16)];
-    	    }
-    	    return color;
-    	}
-    
-            // Bar Chart - Pendency Stages Wise
-     $.ajax({
-         url: `/stageWiseCounts`,
-         type: 'GET',
-         data: dataParams,
-         
-         success: function (data) {
-             const colorMapping = {
-                 "Audit Pending": "#FF5733",
-                 "Department Pending": "#FFC300",
-                 "Pension Pending": "#28B463",
-                 "Completed": "#3498DB"
-             };
-
-             const chartData = data.map(item => ({
-                 category: item.category,
-                 value: item.category_count,
-                 color: colorMapping[item.category]  // Default gray color if no match
-             }));
-
-             window.chart2 = AmCharts.makeChart("stagesBarChart", {
-                 type: "serial",
-                 theme: "light",
-                 dataProvider: chartData,
-                 depth3D: 2,
-                 angle: 10,
-                 valueAxes: [{
-                     axisAlpha: 0,
-                     gridAlpha: 0,
-                     labelsEnabled: false,
-                     dashLength: 0
-                 }],
-                 startDuration: 1,
-                 startEffect: "easeInSine",
-                 graphs: [{
-                     balloonText: "[[[[category]]]]: [[[[value]]]]",
-                     fillAlphas: 0.8,
-                     lineAlpha: 0.2,
-                     topRadius: 1,
-                     type: "column",
-                     valueField: "value",
-                     fillColorsField: "color",
-                     columnWidth: 0.5,
-                     labelText: "[[[[value]]]]",
-                     labelPosition: "right",
-                     fontSize: 14,
-                     color: "#000000"
-                 }],
-                 categoryField: "category",
-                 categoryAxis: {
-                     gridPosition: "start",
-                     gridAlpha: 0,
-                     autoWrap: false,
-                     axisAlpha: 0,
-                     fontSize: 14
-                 },
-                 rotate: true,
-                 export: {
-                     enabled: true,
-                     position: "bottom-right"
-                 }
-             });
-
-             console.log("Stages Bar Chart Data:", chartData);
-         },
-         error: function (xhr, status, error) {
-             console.error("AJAX Request Failed:", status, error);
-         }
-     });
- }
-    
-  
-        
-        // Initial data load
-        loadDashboardData();
-        document.querySelector("input[type='reset']").addEventListener('click', function () {
-            window.location.href = "/gcc/pensioner/dashboard";
-        });
-        
-
-        // Initial chart rendering
-        }) 
-
-        
-        $('#startDate').on('change', function () {
-	        const fromDate = $(this).val();
-	        $('#endDate').attr('min', fromDate); // Update min attribute for To Date
-
-	        // If To Date is earlier than the new From Date, adjust it
-	        const toDate = $('#endDate').val();
-	        if (new Date(toDate) < new Date(fromDate)) {
-	            $('#endDate').val(fromDate);
-	        }
-	    });
-
-	    // Update From Date's max attribute when To Date changes
-	    $('#endDate').on('change', function () {
-	        const toDate = $(this).val();
-	        $('#startDate').attr('max', toDate); // Update max attribute for From Date
-
-	        // If From Date is later than the new To Date, adjust it
-	        const fromDate = $('#startDate').val();
-	        if (new Date(fromDate) > new Date(toDate)) {
-	            $('#startDate').val(toDate);
-	        }
-	    });
-        
-        
-         	//disable future dates
-	document.addEventListener("DOMContentLoaded", function () {
-        let today = new Date().toISOString().split("T")[0]; // Get today's date in YYYY-MM-DD format
-        let startdateInput = document.getElementById("startDate");
-        let enddateInput = document.getElementById("endDate");
-
-        // Set max attribute to disable future dates
-        startdateInput.setAttribute("max", today);
-        enddateInput.setAttribute("max", today);
-        
-
-        // Prevent manual future date entry
-        startdateInput.addEventListener("change", function () {
-            if (this.value > today) {
-                Swal.fire({
-                    icon: 'warning',
-                    title: 'Invalid Date',
-                    text: 'Future dates are not allowed.',
-                    confirmButtonText: 'OK'
-                });
-                this.value = ""; // Clear the invalid input
-            }
-        });
-    });
-  
-    </script>
-</body>
-
-</html>
+<!DOCTYPE html>
+<html lang="en" dir="">
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head th:replace="~{fragments/modules/base/head :: head}"></head>
+<style>
+    /* Base Layout and Styling */
+
+body {
+    font-family: 'Arial', sans-serif;
+    background-color: #f8f9fa;
+}
+
+/* Card Styling */
+.card-box {
+    border-radius: 12px;
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+    background-color: #ffffff;
+    padding: 20px;
+    transition: transform 0.3s ease-in-out;
+}
+
+.card-box:hover {
+    transform: translateY(-5px);
+}
+
+/* Title Styling */
+h3 {
+    font-size: 1.2rem;
+    color: #444;
+}
+
+/* Styling for Overall Pendency and Stage Wise Sections */
+.charts {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 30px; /* Increased gap between charts */
+    margin-top: 30px; /* Increased margin-top */
+}
+
+.chart {
+    flex: 1;
+    background: #ffffff; /* White background */
+    padding: 20px;
+    border-radius: 8px;
+    border: 2px solid #1e90ff; /* Add a colored border */
+    width: 100%;
+    box-sizing: border-box;
+    text-align: center;
+    transition: all 0.3s ease-in-out;
+}
+
+.chart:hover {
+    box-shadow: 0 6px 12px rgba(0, 0, 0, 0.2);
+}
+
+.chart h3 {
+    font-size: 1.2rem;
+    color: #333;
+    margin-bottom: 15px;
+}
+
+.chart canvas {
+    display: block;
+    max-width: 100%;
+    height: auto;
+}
+
+/* Stats Cards */
+.stats {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+    gap: 30px; /* Increased gap between stats cards */
+    margin-top: 30px; /* Increased margin-top */
+}
+
+.stat-card {
+    background: #ffffff;
+    border: 2px solid #1e90ff;
+    padding: 20px;
+    border-radius: 8px;
+    text-align: center;
+    flex: 1;
+    margin: 10px; /* Reduced margin for cleaner look */
+}
+
+.stat-card:hover {
+    transform: scale(1.05);
+    box-shadow: 0 6px 12px rgba(0, 0, 0, 0.2);
+}
+
+.stat-card h2 {
+    margin: 0;
+    font-size: 36px;
+    color: #007bff; 
+}
+
+.stat-card p {
+    margin: 5px 0 0;
+    font-size: 13px;
+    color: #555;
+    font-weight:bold;
+}
+
+/* Buttons */
+.btn-primary:hover {
+    background-color: #0056b3;
+}
+
+.btn-warning:hover {
+    background-color: #e0a800;
+}
+
+/* Container Styling */
+.container {
+    max-width: 1200px;
+    margin: 20px auto;
+    padding: 20px;
+    background: #fff;
+    border-radius: 8px;
+    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+}
+
+/* Date Input Row */
+.row.mt-3.ml-2 {
+    margin-top: 20px; /* Increased margin-top */
+}
+
+/* Responsive Design */
+@media (min-width: 768px) {
+    .charts {
+        flex-direction: row;
+    }
+
+    .charts .chart {
+        width: calc(50% - 15px); /* Increased gap between charts */
+    }
+
+    .stats {
+        flex-direction: row;
+    }
+}
+
+@media (max-width: 576px) {
+    .charts,
+    .stats {
+        flex-direction: column;
+    }
+
+    .stat-card {
+        margin: 15px 0; /* Increased margin for better spacing */
+    }
+}
+.file-history-list {
+    margin-top: 10px;
+    padding-left: 0;
+}
+
+
+.file-history-item {
+    display: flex;
+    padding: 5px 10px;
+    font-family: Arial, sans-serif;
+    align-items: flex-start;
+    position: relative; /* For vertical line positioning */
+    margin-bottom: 1px; /* Add space between items */
+}
+
+.file-history-item::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 120px; /* Position of the vertical line */
+    width: 1px;
+    background-color: #ddd;
+}
+
+.file-history-date {
+margin-top: 10px;
+    flex: 0 0 100px;
+    font-weight: bold;
+    font-size: 0.8rem;
+    color: #333;
+    text-align: center;
+    white-space: nowrap; /* Prevent wrapping */
+}
+
+.file-history-content {
+    flex: 5;
+    padding-left: 20px; /* Adds space after the vertical line */
+    display: flex;
+    flex-direction: column;
+    gap: 5px; /* Adds spacing between status and remarks */
+    white-space: pre-wrap; /* Prevents wrapping */
+    overflow: visible; /* Prevents content overflow */
+    text-overflow: ellipsis; /* Adds ellipsis if content exceeds container width */
+}
+
+.file-history-status {
+    font-size: 0.8rem;
+    font-weight: bold;
+    color: #555;
+    white-space:pre-wrap; /* Prevent wrapping */
+    overflow: visible;
+    text-overflow: ellipsis;
+}
+
+.file-history-remarks {
+    font-size: 0.8rem;
+    color: #777;
+    white-space: pre-wrap; /* Prevent wrapping */
+    overflow: visible;
+    text-overflow: ellipsis;
+}   
+
+#returnretrieddetailsModal .modal-body{
+	max-height:80vh;
+	overflow-y:auto; 
+}
+table.dataTable td {
+    white-space: normal !important;
+    word-wrap: break-word !important;
+}
+
+
+</style>
+
+<body>
+    <div class="wrapper">
+        <header th:replace="~{fragments/modules/base/header :: header}"></header>
+        <div class="page-wrap">
+            <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
+            <div class="main-content">
+                <div class="container-fluid">
+                    <div class="page-header 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>Dashboard</h5>
+                                        <span>Pension Entries</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">Pension Entries</li>
+                                        <li class="breadcrumb-item active" aria-current="page">Dashboard</li>
+                                    </ol>
+                                </nav>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row mt-4">
+                        <div class="col-md-12">
+                           
+                              <div class="card">
+					        <div class="card-block">
+                                 <h5 style="font-weight: bold;">Pension Department</h5>
+                                         
+                                          <div class="d-flex justify-content-end align-items-center">
+											    <label for="EmpCode" style="font-weight: bold; margin-right: 10px;" class="mb-0">EmpCode:</label>
+											    <input type="text" id="EmpCode" name="EmpCode" class="form-control" style="width: auto; min-width: 150px; margin-right: 10px;">
+											    <button id="searchEmpButton" class="btn btn-primary">Search</button>
+											</div>
+											                                         
+										<div class="row mt-3 ml-2 ">
+											    <div class="col-md-3">
+											        <label for="startDate" class="form-label">From Date:</label>
+											        <input type="date" id="startDate" class="form-control" onclick="this.showPicker()">
+											    </div>
+											    <div class="col-md-3">
+											        <label for="endDate" class="form-label">To Date:</label>
+											        <input type="date" id="endDate" class="form-control" onclick="this.showPicker()">
+											    </div>
+											    <div class="col-md-3">
+											        <label for="deptId" class="form-label fw-bold">Department Name:</label>
+											        <div class="dropdown">
+											            <select id="deptId" class="form-control" style="width: 100%;" required>
+											                <option value="" selected>-- Select Option --</option>
+											            </select>
+											        </div>
+											    </div>
+											    
+											    <!-- Centering the Buttons -->
+											    <div class="col-12 d-flex justify-content-center mt-3">
+											        <button id="searchButton" class="btn btn-primary mx-2">Search</button>
+											        <input type="reset" class="btn btn-warning mx-2" value="Reset">
+											    </div>
+											</div>
+
+
+                                            <div id="stats" class="stats"></div>
+                                            <div class="charts">
+                                                <div class="chart">
+                                                    <h3>File Category  - Overall</h3>
+                                                    <div id="overallPieChart" style="width: 100%; height: 400px;"></div>
+                                                    
+                                                </div>
+                                                <div class="chart">
+                                                    <h3>File Category Stages Wise</h3>
+                                                    <div id="stagesBarChart" style="width: 100%; height: 400px;"></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="zoneDetailsModal" tabindex="-1"
+		role="dialog" aria-labelledby="zoneDetailsModalLabel"
+		aria-hidden="true" data-backdrop="static" data-keyboard="false">
+		<div class="modal-dialog modal-lg" role="document">
+			<div class="modal-content">
+				<div id="zone-details-content"></div>
+			</div>
+		</div>
+	</div>
+	<div class="modal fade" id="EmpcodeDetailsModal" tabindex="-1"
+		role="dialog" aria-labelledby="zoneDetailsModalLabel"
+		aria-hidden="true" data-backdrop="static" data-keyboard="false">
+		<div class="modal-dialog modal-xl" role="document">
+			<div class="modal-content">
+				<div id="emp-details-content"></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>
+    <!-- Bootstrap 5 JS -->
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
+    
+    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+    <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
+
+    <script src="node_modules/amcharts3/amcharts/amcharts.js"></script>
+	<script src="node_modules/amcharts3/amcharts/serial.js"></script>
+	
+	<script src="node_modules/amcharts3/amcharts/pie.js"></script>
+	<script src="node_modules/amcharts3/amcharts/themes/light.js"></script>
+	
+    <script>
+    document.addEventListener('DOMContentLoaded', function () {
+    	 $('#searchEmpButton').on('click', function () { // Ensure there's a button with id "searchButton"
+    	        const Empcode = document.getElementById('EmpCode').value.trim(); // Get input value
+    	        console.log("empcode",Empcode);
+    	
+    	   //fetch details
+    	if (Empcode) {
+            $.ajax({
+                url: `/gcc/api/pensionerdashboard/fetchPensionEmpDetails?Empcode=${Empcode}`, // Backend API route
+                type: 'GET',
+                success: function (response) {
+                    console.log(response);
+
+                    if (!response || response.length === 0) {  // Check if response is empty
+                        Swal.fire({
+                            icon: "warning",
+                            title: "No Data Found",
+                            text: "No records found for the entered Employee Code.",
+                            confirmButtonText: "OK",
+                        });
+                    } else {
+                        renderEmpDetailsModal(response);
+                    }
+                },
+                error: function (xhr) {
+                    console.error("Error fetching employee details:", xhr.status, xhr.responseText);
+                }
+            });
+        } else {
+		            Swal.fire({
+		                icon: "warning",
+		                title: "Enter Employee Code",
+		                text: "Please enter an Employee Code before searching.",
+		                confirmButtonText: "OK",
+		            });
+		        }
+    	   })
+ 
+
+    	 
+    			function renderEmpDetailsModal(data) {
+        		    const Empcode = document.getElementById('EmpCode').value.trim();
+
+        		    let modalContent = `
+        		        <div class="modal-header">
+        		            <h5 class="modal-title">Employee Details for ${Empcode}</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="table-responsive">
+        		                <table id="DashboardDatatable" class="table table-striped table-bordered table-hover dataTable">
+        		                    <thead class="thead-dark">
+        		                        <tr>
+        		                            <th class="text-center">S.NO</th>
+        		                            <th class="text-center">Department Name</th>
+        		                            <th class="text-center">File Name</th>
+        		                            <th class="text-center">File Status</th>
+        		                            <th class="text-center">History</th>
+        		                        </tr>
+        		                    </thead>
+        		                    <tbody>
+        		                        ${data.map((item, index) => `
+        		                            <tr data-temp-id="${item.temp_id}">
+        		                                <td>${index + 1}</td>
+        		                                <td>${item.dept_name}</td>
+        		                                <td>${item.file_name}</td>
+        		                                <td>${item.file_status}</td>
+        		                                <td class="file-history-column" id="history-${item.temp_id}">Loading...</td>
+        		                            </tr>
+        		                        `).join('')}
+        		                    </tbody>
+        		                </table>
+        		            </div>
+        		        </div>
+        		    `;
+
+        		    document.getElementById('emp-details-content').innerHTML = modalContent;
+
+        		    // **Fetch History Before Initializing DataTable**
+        		    let fetchPromises = data.map(item => fetchDetailsByTempId(item.temp_id));
+
+        		    Promise.all(fetchPromises).then(() => {
+        		        $('#EmpcodeDetailsModal').modal({
+        		            backdrop: 'static',
+        		            keyboard: false
+        		        });
+
+        		        // **Initialize DataTable AFTER Data is Loaded and reason for intialize**
+        		        setTimeout(() => {
+        		            let table = $('#DashboardDatatable').DataTable({
+        		                dom: 'Bftip',
+        		                columnDefs: [{ targets: 'no-sort', orderable: false }],
+        		                lengthMenu: [
+        		                    [50, 100, 200, 500, -1],
+        		                    ['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
+        		                ],
+        		                scrollY: '50vh',
+        		             // ✅ Prevents automatic column width issues
+								        		               buttons: [
+								    { extend: 'pageLength', className: 'btn btn-warning' },
+								    { 
+								        extend: 'copyHtml5', 
+								        text: 'Copy', 
+								        className: 'btn btn-secondary',
+								        exportOptions: { columns: ':visible', modifier: { page: 'all' } }
+								    },
+								    { 
+								        extend: 'excelHtml5', 
+								        text: 'Excel', 
+								        className: 'btn btn-secondary',
+								        customize: function (xlsx) {
+								            let sheet = xlsx.xl.worksheets['sheet1.xml'];
+								            $('row c[r]', sheet).attr('s', '55'); // Apply word-wrap formatting
+								        }
+								    },
+								    { 
+								        extend: 'csvHtml5', 
+								        text: 'CSV', 
+								        className: 'btn btn-secondary',
+								        exportOptions: { columns: ':visible' }
+								    },
+								    { 
+								        extend: 'pdfHtml5', 
+								        text: 'PDF', 
+								        className: 'btn btn-secondary',
+								        orientation: 'landscape',
+								        pageSize: 'A4',
+								        customize: function (doc) {
+								            doc.styles.tableBodyEven.alignment = 'left';
+								            doc.styles.tableBodyOdd.alignment = 'left';
+								            doc.styles.tableHeader.alignment = 'center';
+								            doc.defaultStyle.fontSize = 9;
+								            doc.styles.tableHeader.fontSize = 10;
+								            doc.content[1].table.widths = Array(doc.content[1].table.body[0].length + 1).join('*').split('');
+								        }
+								    }
+								],
+
+        		                responsive: false,
+        		                processing: false
+        		            });
+
+        		            // ✅ Adjust column width after table is fully initialized
+        		            
+        		        }, 200);
+        		    });
+        		}
+
+        		
+        		
+
+        		// **Fetch History & Update Table**
+        		function fetchDetailsByTempId(tempId) {
+        		    return new Promise((resolve, reject) => {
+        		        $.ajax({
+        		            url: `/gcc/api/pensionerdashboard/fetchTempDetails?tempId=${tempId}`,
+        		            type: 'GET',
+        		            success: function (response) {
+        		                let historyContainer = $(`#history-${tempId}`);
+        		                if (response.length > 0) {
+        		                    let historyHtml = response.map(item => `
+        		                        <div class="file-history-item">
+        		                            <div class="file-history-date">${formatDateTime(item.file_moved_date)}</div>
+        		                            <div class="file-history-content">
+        		                                <div class="file-history-status">${item.file_status}</div>
+        		                                <div class="file-history-remarks">Comments/Remarks: ${item.remarks || 'N/A'}</div>
+        		                            </div>
+        		                        </div>
+        		                    `).join('');
+        		                    historyContainer.html(historyHtml);
+        		                    $('#EmpcodeDetailsModal').modal({
+        		                        backdrop: 'static',
+        		                        keyboard: false
+        		                    });
+        		                    $('#EmpcodeDetailsModal').modal('show');
+        		                    $('.close').click(function () {
+        		                        $('#EmpcodeDetailsModal').modal('hide');
+        		                    });
+        		                } else {
+        		                    historyContainer.html('<p>No file history available.</p>');
+        		                    $('#EmpcodeDetailsModal').modal({
+        		                        backdrop: 'static',
+        		                        keyboard: false
+        		                    });
+        		                    $('#EmpcodeDetailsModal').modal('show');
+        		                    $('.close').click(function () {
+        		                        $('#EmpcodeDetailsModal').modal('hide');
+        		                    });
+        		                }
+        		                resolve();
+        		            },
+        		            error: function () {
+        		                $(`#history-${tempId}`).html('<p>Failed to load file history.</p>');
+        		                $('#EmpcodeDetailsModal').modal({
+    		                        backdrop: 'static',
+    		                        keyboard: false
+    		                    });
+    		                    $('#EmpcodeDetailsModal').modal('show');
+    		                    $('.close').click(function () {
+    		                        $('#EmpcodeDetailsModal').modal('hide');
+    		                    });
+        		                resolve();
+        		            }
+        		        });
+        		    });
+        		}
+
+        		// **Helper Function to Format Date**
+        		function formatDateTime(dateString) {
+        		    const options = { day: '2-digit', month: '2-digit', year: 'numeric' };
+        		    return new Date(dateString).toLocaleDateString('en-GB', options);
+        		}
+    				
+                
+    	
+    	 $.ajax({
+ 	        url: "/gcc/api/pensionerdashboard/getDepartments",
+ 	        type: "GET",
+ 	       dataType: "json",
+ 	        success: function (data) {
+ 	            var dropdown = $("#deptId");
+ 	            dropdown.empty();
+ 	            dropdown.append('<option value="" selected>-- Select Option --</option>');
+ 	            $.each(data, function (key, entry) {
+ 	            	//console.log(entry);
+ 	                dropdown.append($('<option></option>').attr('value', entry.dept_id).text(entry.dept_name));
+ 	            });
+ 	        },
+ 	        error: function () {
+ 	            console.log("Error loading dropdown data.");
+ 	        }
+ 	    });
+        // Function to fetch data from /dashboard endpoint
+        function loadDashboardData() {
+        	
+            $.ajax({
+                url: `/gcc/api/pensionerdashboard/dashboard`,
+                type: 'GET',
+                contentType: 'application/json',
+                success: function (data) {
+                    const statsDiv = document.getElementById('stats');
+                    statsDiv.innerHTML = ''; // Clear previous stats
+
+                    data.forEach(item => {
+                        const statCard = document.createElement('div');
+                        statCard.className = 'stat-card';
+                        statCard.innerHTML = `
+                            <h2>${item.category_count}</h2>
+                            <p>${item.file_name}</p>
+                        `;
+                        statsDiv.appendChild(statCard);
+                    });
+
+                    // Call renderCharts after data is loaded
+                    console.log("Dashboard data loaded, rendering charts...");
+                    renderCharts();
+                },
+                error: function (xhr, status, error) {
+                    console.error('Error fetching dashboard data:', status, error);
+                }
+            });
+        }
+
+        // Function to handle search button click
+        document.getElementById('searchButton').addEventListener('click', function () {
+            const startDate = document.getElementById('startDate').value;
+            const endDate = document.getElementById('endDate').value;
+            const deptId= document.getElementById('deptId').value;
+            
+            console.log(deptId);
+            if (!startDate || !endDate ) {
+	 	        Swal.fire({
+	 	            icon: "warning",
+	 	            title: "Incomplete Search",
+	 	            text: "Please select the Date Before searching",
+	 	            confirmButtonText: "OK",
+	 	        });
+	 	    } else {
+
+            $.ajax({
+                url: `/gcc/api/pensionerdashboard/dashboardsearch?startdate=${startDate}&enddate=${endDate}&deptId=${encodeURIComponent(deptId)}`,
+                type: 'GET',
+                
+                dataType: 'json',
+                success: function (data) {
+                    const statsDiv = document.getElementById('stats');
+                    statsDiv.innerHTML = data.map(item => `
+                        <div class='stat-card'>
+                            <h2>${item.category_count}</h2>
+                            <p>${item.file_name}</p>
+                        </div>
+                    `).join('');
+
+                    // Re-render charts after search results load
+                    renderCharts(startDate, endDate);
+                },
+                error: function () {
+                    console.error('Error fetching search data.');
+                }
+            });
+	 	    }
+        });
+
+        // Function to validate and set min-date for endDate
+       /*  function validateEndDate() {
+            const startDate = document.getElementById('startDate').value;
+            const endDateInput = document.getElementById('endDate');
+
+            if (startDate) {
+                const startDateObj = new Date(startDate);
+                const minEndDateISO = startDateObj.toISOString().split('T')[0];
+
+                endDateInput.setAttribute('min', minEndDateISO);
+
+                // Clear endDate if it's less than startDate
+                if (endDateInput.value && new Date(endDateInput.value) < startDateObj) {
+                    endDateInput.value = '';
+                }
+            }
+        }
+
+        document.getElementById('startDate').addEventListener('change', validateEndDate); */
+    	
+        
+      function renderCharts(startDate = null, endDate = null) {
+        	 const deptId= document.getElementById('deptId').value;
+        	 const dataParams = deptId ? { deptId, startDate, endDate } : { startDate, endDate };
+        	 console.log("deptId",deptId);
+        	  disposeExistingCharts();
+
+        // Dispose existing amCharts instances (amCharts v3 doesn't have a built-in registry)
+        function disposeExistingCharts() {
+            if (window.chart1) {
+                window.chart1.clear();
+                window.chart1 = null;
+            }
+            if (window.chart2) {
+                window.chart2.clear();
+                window.chart2 = null;
+            }
+        }
+
+        // Function to render charts using amCharts v3
+        	  const fixedColors = {
+		    "Retirement": "#6A0572", // Deep Purple
+		    "Family Pension": "#2C3E50", // Dark Blue-Gray
+		    "Pendency": "#A569BD", // Soft Lavender
+		    "GIS": "#17A589", // Teal Green
+		    "Provisional Retirement": "#D35400", // Warm Orange
+		    "Contributory Pension Scheme": "#5D6D7E"  // Muted Gray-Blue
+		};
+      $.ajax({
+                url: `/gcc/api/pensionerdashboard/categoryCounts`,
+                type: 'GET',
+                data: dataParams,
+                dataType: 'json',
+                success: function (data,index) {
+                    const chartData = data.map(item => ({
+                        category: item.file_name,
+                        value: item.category_count,
+                        color: fixedColors[item.file_name] ,
+                        id:item.id
+                    }));
+
+                    window.chart1 = AmCharts.makeChart("overallPieChart", {
+                        type: "pie",
+                        theme: "dark",
+                        dataProvider: chartData,
+                        valueField: "value",
+                        titleField: "category",
+                        colorField: "color",
+                        radius: "40%", // Outer radius
+                        innerRadius: "50%", // Inner radius to create the donut shape
+                        labelText: "[[[[title]]]] - [[[[value]]]]",// this is to show the values on the  piechart
+                        fontSize: 14,
+                        labelsEnabled: true,
+                        pullOutRadius:0,
+                        gradientRatio: [-0.4, -0.4, -0.4, -0.4, -0.4, -0.4, 0, 0.1, 0.2, 0.1, 0, -0.2, -0.5],//this is to show the piechart in better look
+                        export: {
+                            enabled: true,
+                        },
+                        responsive: {
+                            enabled: true,
+                        },
+                        legend: {
+                            position: "bottom",
+                            markerType: "circle",
+                            valueText: "[[[[value]]]]",
+                            switchable: false,
+                            markerSize: 12,
+                            fontSize: 12
+                        },
+                        balloon: {
+                            fixedPosition: true
+                        },
+                        listeners: [
+                            {
+                                event: "clickSlice",
+                                method: function (event) {
+                                    const FileId = event.dataItem.dataContext.id;
+                                    const FileNumber = event.dataItem.dataContext.category;
+                                    // Fetch emp_no from the server based on file_name
+                                    fetchempno(FileId,FileNumber);
+                                }
+                            }
+                        ]
+                    });
+                },
+                error: function (xhr, status, error) {
+                	console.error("AJAX Request Failed:", status, error);
+                    console.error("Response Text:", xhr.responseText); 
+                }
+            });
+        function fetchempno(FileId,FileNumber){
+        	 $.ajax({
+        		 url: `/gcc/api/pensionerdashboard/getEmpNoByFileName?file_id=${FileId}`,
+                 type: 'GET',
+                 success: function (response) {
+                     // Render the modal with emp_no data
+                     renderEmpNoModal(FileNumber, response);
+                 },
+                 error: function(error) {
+                     console.error("Error fetching region details:", error);
+                 }
+             });
+        }
+
+        function renderEmpNoModal(FileNumber, empNos) {
+        	console.log(empNos);
+            const modalContent = `
+                <div class="modal-header">
+                    <h5 class="modal-title">Employee Numbers for ${FileNumber}</h5>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body">
+                    <table class="table table-bordered">
+                        <thead>
+                            <tr>
+                                <th>Employee Number</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                        ${empNos.map(empNo => `<tr><td>${empNo.emp_no}</td></tr>`).join('')}
+                        </tbody>
+                    </table>
+                </div>
+            `;
+            
+            document.getElementById('zone-details-content').innerHTML = modalContent;
+            //$('#zoneDetailsModal').modal('show');
+            $('.close').click(function () {
+		        $('#zoneDetailsModal').modal('hide');
+		        
+		    });
+        }
+
+     function getRandomColor() {
+    	    const letters = '0123456789ABCDEF';
+    	    let color = '#';
+    	    for (let i = 0; i < 6; i++) {
+    	        color += letters[Math.floor(Math.random() * 16)];
+    	    }
+    	    return color;
+    	}
+    
+            // Bar Chart - Pendency Stages Wise
+     $.ajax({
+         url: `/gcc/api/pensionerdashboard/stageWiseCounts`,
+         type: 'GET',
+         data: dataParams,
+         
+         success: function (data) {
+             const colorMapping = {
+                 "Audit Pending": "#FF5733",
+                 "Department Pending": "#FFC300",
+                 "Pension Pending": "#28B463",
+                 "Completed": "#3498DB"
+             };
+
+             const chartData = data.map(item => ({
+                 category: item.category,
+                 value: item.category_count,
+                 color: colorMapping[item.category]  // Default gray color if no match
+             }));
+
+             window.chart2 = AmCharts.makeChart("stagesBarChart", {
+                 type: "serial",
+                 theme: "light",
+                 dataProvider: chartData,
+                 depth3D: 2,
+                 angle: 10,
+                 valueAxes: [{
+                     axisAlpha: 0,
+                     gridAlpha: 0,
+                     labelsEnabled: false,
+                     dashLength: 0
+                 }],
+                 startDuration: 1,
+                 startEffect: "easeInSine",
+                 graphs: [{
+                     balloonText: "[[[[category]]]]: [[[[value]]]]",
+                     fillAlphas: 0.8,
+                     lineAlpha: 0.2,
+                     topRadius: 1,
+                     type: "column",
+                     valueField: "value",
+                     fillColorsField: "color",
+                     columnWidth: 0.5,
+                     labelText: "[[[[value]]]]",
+                     labelPosition: "right",
+                     fontSize: 14,
+                     color: "#000000"
+                 }],
+                 categoryField: "category",
+                 categoryAxis: {
+                     gridPosition: "start",
+                     gridAlpha: 0,
+                     autoWrap: false,
+                     axisAlpha: 0,
+                     fontSize: 14
+                 },
+                 rotate: true,
+                 export: {
+                     enabled: true,
+                     position: "bottom-right"
+                 }
+             });
+
+             console.log("Stages Bar Chart Data:", chartData);
+         },
+         error: function (xhr, status, error) {
+             console.error("AJAX Request Failed:", status, error);
+         }
+     });
+ }
+    
+  
+        
+        // Initial data load
+        loadDashboardData();
+        document.querySelector("input[type='reset']").addEventListener('click', function () {
+            window.location.href = "/gcc/pensioner/dashboard";
+        });
+        
+
+        // Initial chart rendering
+        }) 
+
+        
+        $('#startDate').on('change', function () {
+	        const fromDate = $(this).val();
+	        $('#endDate').attr('min', fromDate); // Update min attribute for To Date
+
+	        // If To Date is earlier than the new From Date, adjust it
+	        const toDate = $('#endDate').val();
+	        if (new Date(toDate) < new Date(fromDate)) {
+	            $('#endDate').val(fromDate);
+	        }
+	    });
+
+	    // Update From Date's max attribute when To Date changes
+	    $('#endDate').on('change', function () {
+	        const toDate = $(this).val();
+	        $('#startDate').attr('max', toDate); // Update max attribute for From Date
+
+	        // If From Date is later than the new To Date, adjust it
+	        const fromDate = $('#startDate').val();
+	        if (new Date(fromDate) > new Date(toDate)) {
+	            $('#startDate').val(toDate);
+	        }
+	    });
+        
+        
+         	//disable future dates
+	document.addEventListener("DOMContentLoaded", function () {
+        let today = new Date().toISOString().split("T")[0]; // Get today's date in YYYY-MM-DD format
+        let startdateInput = document.getElementById("startDate");
+        let enddateInput = document.getElementById("endDate");
+
+        // Set max attribute to disable future dates
+        startdateInput.setAttribute("max", today);
+        enddateInput.setAttribute("max", today);
+        
+
+        // Prevent manual future date entry
+        startdateInput.addEventListener("change", function () {
+            if (this.value > today) {
+                Swal.fire({
+                    icon: 'warning',
+                    title: 'Invalid Date',
+                    text: 'Future dates are not allowed.',
+                    confirmButtonText: 'OK'
+                });
+                this.value = ""; // Clear the invalid input
+            }
+        });
+    });
+  
+    </script>
+</body>
+
+</html>
diff --git a/src/main/resources/templates/modules/school/.DS_Store b/src/main/resources/templates/modules/school/.DS_Store
new file mode 100644
index 0000000..de5dcf8
Binary files /dev/null and b/src/main/resources/templates/modules/school/.DS_Store differ
diff --git a/src/main/resources/templates/modules/school/addelectricalasset.html b/src/main/resources/templates/modules/school/addelectricalasset.html
index 707bb6d..4a4571c 100644
--- a/src/main/resources/templates/modules/school/addelectricalasset.html
+++ b/src/main/resources/templates/modules/school/addelectricalasset.html
@@ -79,6 +79,20 @@
     border: none;
     line-height: 1;
 }
+.custom-card-wrapper {
+  padding: 0;
+  margin-top: -58px;
+  margin-left: -233px;
+}
+
+@media (max-width: 768px) {
+  .custom-card-wrapper {
+    margin-left: 0;
+    margin-top: 0;
+    padding: 10px;
+  }
+}
+
 
 		
 	
@@ -96,7 +110,8 @@
 					<div class="container">
 						<!-- Card 2: Other Details -->
 						<div class="col-md-12">
-							<div style="padding: 0px;margin-top:-58px;margin-left: -233px;">
+						<div class="custom-card-wrapper">
+							<!--  <div style="padding: 0px;margin-top:-58px;margin-left: -233px;">-->
 								<div class="card-header d-flex justify-content-between align-items-center">
 								    <b>List of Electrical Assets</b>
 								    <button type="button" class="btn btn-primary add-ebtn"> <i class="ik ik-plus"></i>Add Assets</button>
@@ -194,7 +209,7 @@
 						<span id="Eeditid" style="display: none;"></span>
 					<div class="row">
 						<div class="form-group col-6">
-						    <label for="Emaster_qty">Master Quantity &nbsp;(&nbsp;Already in master&nbsp;<span id="AEmaster_qty" style="font-style: italic;font-weight: bold;"></span>&nbsp;)<span class="text-danger">*</span></label>
+						    <label for="Emaster_qty">Master Quantity &nbsp;<!-- (&nbsp;Already in master&nbsp;<span id="AEmaster_qty" style="font-style: italic;font-weight: bold;"></span>&nbsp;) --><span class="text-danger">*</span></label>
         					<input type="text" class="form-control" id="Emaster_qty" name="Emaster_qty">						    
 						</div>											
 						
@@ -231,6 +246,9 @@
 
 		console.log("hi electrical assets...");
 		  $(document).ready(function () {
+			  $('#Emaster_qty').on('input', function() {
+			        this.value = this.value.replace(/[^0-9]/g, '');
+			    });
 			  
 			  let ElectricalAsseturlParams = new URLSearchParams(window.location.search);
 				let EAssetschoolId = ElectricalAsseturlParams.get("schoolId");
@@ -303,7 +321,7 @@
 
         	        inputRow += `
         	            <div class="col-md-4">
-        	                <input type="number" class="form-control" name="assetQuantity_${assetId}" placeholder="Enter Quantity" min="0">
+        	        	<input type="number" class="form-control asset-quantity-input" name="assetQuantity_${assetId}" placeholder="Enter Quantity" min="0">
         	            </div>
         	        `;
 
@@ -318,8 +336,14 @@
         	        $container.append(inputRow);
         	    }
         	});
+        // Add an event listener to all input fields with the class 'asset-quantity-input'
+           $(document).on('input', '.asset-quantity-input', function() {
+               // Replace any character that is NOT a digit with an empty string
+               this.value = this.value.replace(/[^0-9]/g, '');
+           });
           
         });
+		
 		  
 		  
 		  function handleEAssetEdit(){
@@ -621,7 +645,7 @@
 		                });
                         
                     } else {
-                        Swal.fire('Error', response.message, 'error');
+                        Swal.fire('Error ', response.message, 'error');
                     }
                 },
                 error: function() {
@@ -682,7 +706,15 @@
 	                        
 		                    	location.reload();
 		                   });
-		            } else {
+		            }
+		            else if (response === "lesser than") {
+		                Swal.fire({
+		                    icon: 'error',
+		                    title: 'Error',
+		                    text: 'Entered Quantity is lesser than Mapped Quantity!'		                
+		                });
+		            }
+		            else {
 		                Swal.fire({
 		                    icon: 'error',
 		                    title: 'Error',
diff --git a/src/main/resources/templates/modules/school/addfurnitureasset.html b/src/main/resources/templates/modules/school/addfurnitureasset.html
index 810e223..bff9faf 100644
--- a/src/main/resources/templates/modules/school/addfurnitureasset.html
+++ b/src/main/resources/templates/modules/school/addfurnitureasset.html
@@ -77,6 +77,20 @@
     border: none;
     line-height: 1;
 }
+.custom-card-wrapper {
+  padding: 0;
+  margin-top: -58px;
+  margin-left: -233px;
+}
+
+@media (max-width: 768px) {
+  .custom-card-wrapper {
+    margin-left: 0;
+    margin-top: 0;
+    padding: 10px;
+  }
+}
+
 
 		
 	
@@ -92,7 +106,8 @@
 					<div class="container">
 						<!-- Card 2: Other Details -->
 						<div class="col-md-12">
-							<div style="padding: 0px;margin-top:-58px;margin-left: -233px;">
+						<div class="custom-card-wrapper">
+							<!--  <div style="padding: 0px;margin-top:-58px;margin-left: -233px;">-->
 								<div class="card-header d-flex justify-content-between align-items-center">
 								    <b>List of Furniture Assets</b>
 								    <button type="button" class="btn btn-primary add-fbtn"> <i class="ik ik-plus"></i>Add Assets</button>
@@ -190,7 +205,7 @@
 						<span id="Feditid" style="display: none;"></span>
 					<div class="row">
 						<div class="form-group col-6">
-						    <label for="Fmaster_qty">Master Quantity&nbsp;(&nbsp;Already in master&nbsp;<span id="AFmaster_qty" style="font-style: italic;font-weight: bold;"></span>&nbsp;)<span class="text-danger">*</span></label>
+						    <label for="Fmaster_qty">Master Quantity&nbsp;<!-- (&nbsp;Already in master&nbsp;<span id="AFmaster_qty" style="font-style: italic;font-weight: bold;"></span>&nbsp;) --><span class="text-danger">*</span></label>
         					<input type="text" class="form-control" id="Fmaster_qty" name="Fmaster_qty">						    
 						</div>
 											
@@ -230,6 +245,9 @@
 		console.log("hi..furniture asset");
 		
 		$(document).ready(function () {
+			 $('#Fmaster_qty').on('input', function() {
+			        this.value = this.value.replace(/[^0-9]/g, '');
+			    });
 			  
 			  let FurnitureAsseturlParams = new URLSearchParams(window.location.search);
 				let FAssetschoolId = FurnitureAsseturlParams.get("schoolId");
@@ -302,7 +320,8 @@
 
       	        inputRow += `
       	            <div class="col-md-4">
-      	                <input type="number" class="form-control" name="assetQuantity_${assetId}" placeholder="Enter Quantity" min="0">
+      	        	<input type="number" class="form-control asset-quantity-input" name="assetQuantity_${assetId}" placeholder="Enter Quantity" min="0">
+      	              
       	            </div>
       	        `;
 
@@ -317,6 +336,11 @@
       	        $container.append(inputRow);
       	    }
       	});
+      // Add an event listener to all input fields with the class 'asset-quantity-input'
+         $(document).on('input', '.asset-quantity-input', function() {
+             // Replace any character that is NOT a digit with an empty string
+             this.value = this.value.replace(/[^0-9]/g, '');
+         });
         
       });
 		
diff --git a/src/main/resources/templates/modules/school/assetmanagement.html b/src/main/resources/templates/modules/school/assetmanagement.html
index fb977d6..daa7d3a 100644
--- a/src/main/resources/templates/modules/school/assetmanagement.html
+++ b/src/main/resources/templates/modules/school/assetmanagement.html
@@ -5,6 +5,22 @@
 <head th:replace="~{fragments/modules/base/head :: head}"></head>
 <style>
 
+.custom-card-wrapper {
+  padding: 0;
+  margin-top: -58px;
+  margin-left: -233px;
+}
+
+@media (max-width: 768px) {
+  .custom-card-wrapper {
+    margin-left: 0;
+    margin-top: 0;
+    padding: 10px;
+  }
+}
+
+
+
 </style>
 
 <body>
@@ -17,7 +33,8 @@
 					<div class="container">
 						<!-- Card 2: Other Details -->
 						<div class="col-md-12">
-							<div style="padding: 0px;margin-top:-58px;margin-left: -233px;">
+						<div class="custom-card-wrapper">
+						<!-- 	<div style="padding: 0px;margin-top:-58px;margin-left: -233px;"> -->
 								<div class="card-header d-flex justify-content-between align-items-center">
 								    <b>List of IT Assets</b>
 								    <button type="button" class="btn btn-primary add-btn"> <i class="ik ik-plus"></i>Add Assets</button>
@@ -219,10 +236,10 @@
 				if (!window.assetManagementEventsBound) {
 				    
 				    $(document).on('click', '.edit-btn1', handleManageEdit);
-				    //$(document).on('click', '.add-btn', handleAddAsset);
-				    $(document).on('click', '.add-btn', function () {
-						handleAddAsset(AssetManageschoolId);
-					 });
+				   // $(document).on('click', '.add-btn', handleAddAsset);
+				   $(document).on('click', '.add-btn', function () {
+				    	handleAddAsset(AssetManageschoolId);
+			        });
 				    
 				    //$(document).on('click', '#savingAsset', handleSavingAsset);
 				    
@@ -351,91 +368,62 @@
 			
 			// Load sub asset types on modal open or page load
 			// Load sub asset types on modal open or page load
-			$.ajax({
-			  url: '/gcc/api/gccschool/dropdown/getSubAssetType',
-			  type: 'GET',
-			  data: { assetid: 1 }, // or dynamic ID later
-			  success: function (res) {
-			    console.log("Sub Asset API Response:", res);
-			
-			    if (res.status === "OK" && Array.isArray(res.data)) {
-			      $('#assetName').empty().append('<option value="">-- Select Sub Asset Type --</option>');
-			
-			      res.data.forEach(function (item) {
-			        $('#assetName').append(
-			          $('<option>', {
-			            value: item.code,
-			            text: item.asset_name
-			          })
-			        );
-			      });
-			    } else {
-			      $('#assetName').empty().append('<option value="">No Sub Asset Types Found</option>');
-			    }
-			  },
-			  error: function (xhr, status, error) {
-			    console.error("Failed to load sub asset types:", error);
-			    $('#assetName').empty().append('<option value="">Error Loading</option>');
-			  }
-			});
-
-			/*
-			function handleAddAsset() {
-			    // Get DataTable instance
-			    let Atable = $('#AssetManageDatatable').DataTable();
-
-			    // Get data from the first row
-			    let firstRowData = Atable.row(0).data();
-
-			    if (firstRowData && firstRowData.udise) {
-			        let udise = firstRowData.udise;
-			        console.log("UDISE from first row:", udise);
-			        
-			        $('#school_udise').text(udise);
-			        $('#assetCode').val('');
-			        $('#assetName').val('');
-				    $('#assetSource').val('');
-				    $('#serialNumber').val('');
-				    $('#vendorDetail').val('');
-				    $('#invoiceNumber').val('');
-				    
-			        $('#AddAssetModal2').modal('show');
-
-			        // You can now use `udise` however you want here
-			    } else {
-			        console.log("No data or UDISE not found in the first row.");
-			    }
-			}
-			*/
-			
-			function handleAddAsset(schid) {
-				
-				 $('#AddAssetModal2').modal('show');
-				 
-				$.ajax({
-					type: 'GET',
-					url: '/gcc/api/gccschool/schoolproperty/getSchoolDetails',
-					data: {schoolId: schid},
-					success: function (data) {
-						console.log(data);
-						 $('#school_udise').text(data.udise);
-					},
-					 error: function (xhr) {
-					        console.log("Failed to get udise for school: " + xhr.responseJSON?.message);
-					    }
-					});
-			  			 
-			        			       
-			        $('#assetCode').val('');
-			        $('#assetName').val('');
-				    $('#assetSource').val('');
-				    $('#serialNumber').val('');
-				    $('#vendorDetail').val('');
-				    $('#invoiceNumber').val('');
-				    			       
-			        
-			}
-			
+$.ajax({
+  url: '/gcc/api/gccschool/dropdown/getSubAssetType',
+  type: 'GET',
+  data: { assetid: 1 }, // or dynamic ID later
+  success: function (res) {
+    console.log("Sub Asset API Response:", res);
+
+    if (res.status === "OK" && Array.isArray(res.data)) {
+      $('#assetName').empty().append('<option value="">-- Select Sub Asset Type --</option>');
+
+      res.data.forEach(function (item) {
+        $('#assetName').append(
+          $('<option>', {
+            value: item.code,
+            text: item.asset_name
+          })
+        );
+      });
+    } else {
+      $('#assetName').empty().append('<option value="">No Sub Asset Types Found</option>');
+    }
+  },
+  error: function (xhr, status, error) {
+    console.error("Failed to load sub asset types:", error);
+    $('#assetName').empty().append('<option value="">Error Loading</option>');
+  }
+});
+
+
+function handleAddAsset(schid) {
+	
+	 $('#AddAssetModal2').modal('show');
+	 
+	$.ajax({
+		type: 'GET',
+		url: '/gcc/api/gccschool/schoolproperty/getSchoolDetails',
+		data: {schoolId: schid},
+		success: function (data) {
+			console.log(data);
+			 $('#school_udise').text(data.udise);
+		},
+		 error: function (xhr) {
+		        console.log("Failed to get udise for school: " + xhr.responseJSON?.message);
+		    }
+		});
+ 			 
+       			       
+       $('#assetCode').val('');
+       $('#assetName').val('');
+	    $('#assetSource').val('');
+	    $('#serialNumber').val('');
+	    $('#vendorDetail').val('');
+	    $('#invoiceNumber').val('');
+	    			       
+       
+   }
 			function handleSavingAsset(assetManageschoolId){
 				
 				 let school_udise = $('#school_udise').text().trim();
diff --git a/src/main/resources/templates/modules/school/building.html b/src/main/resources/templates/modules/school/building.html
index 11d885b..ff697c8 100644
--- a/src/main/resources/templates/modules/school/building.html
+++ b/src/main/resources/templates/modules/school/building.html
@@ -64,6 +64,40 @@
 		overflow-y: auto;
 		min-height: 40vh;
 	}
+/* 	.responsive-section {
+  margin-left: -256px;
+} */
+
+/* Wider negative margin if needed */
+/* .responsive-section-wide {
+  margin-left: -281px;
+} */
+
+/* Mobile responsiveness */
+@media (max-width: 768px) {
+  .responsive-section,
+  .responsive-section-wide {
+    margin-left: 0 !important;
+    padding: 0 10px;
+  }
+
+  .btn.mb-2 {
+    width: 100%;
+    margin-top: 10px;
+  }
+
+  .d-flex.justify-content-between {
+    flex-direction: column;
+    align-items: flex-start;
+  }
+
+  .table {
+    display: block;
+    width: 100%;
+    overflow-x: auto;
+    white-space: nowrap;
+  }
+}
 </style>
 
 <body>
@@ -71,13 +105,13 @@
 		<header th:replace="~{fragments/modules/base/header :: header}"></header>
 		<div class="page-wrap">
 			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content" style="			margin-top: 6px;
-">
+			<div class="main-content" style="margin-top: 6px;padding-left: 0px;">
 				<div class="container">
 
 					<div class="col-md-12">
-						<div class="d-flex justify-content-between align-items-center">
-							<h4 style="margin-left: -256px;">Buildings</h4>
+						<div class="d-flex justify-content-between align-items-center responsive-section">
+							<!-- <h4 style="margin-left: -256px;">Buildings</h4> -->
+							<h4 >Buildings</h4> 
 							<button type="button" class="btn btn-primary"
 								style="background-color: #0D587B; border: none; border-radius: 6px; padding: 6px 16px;"
 								data-bs-toggle="modal" data-bs-target="#assetModal">
@@ -85,13 +119,12 @@
 							</button>
 						</div>
 
-						<hr
-							style="border: 1px solid #ccc; margin-top: 10px; margin-bottom: 20px;      margin-left: -256px;">
+						<hr class="responsive-section"
+							style="border: 1px solid #ccc; margin-top: 10px;">
 					</div>
 
 
-					<div class="row mt-4" style="					margin-left: -281px;
-">
+					<div class="row mt-4 responsive-section-wide">
 						<div class="col-md-12">
 							<div class="card">
 								<div class="card-block">
@@ -671,9 +704,11 @@
 
 					dom: 'Bftip',
 					autoWidth: false,
-					fixedColumns: {left: 0, right: 0},
+					//fixedColumns: {left: 0, right: 0},
 					scrollY: '60vh',
-					scrollCollapse: true,
+					scrollX:true,
+					fixedHeader:false,
+					//scrollCollapse: true,
 					buttons: [buttons],
 					responsive: false,
 					searching: true,
@@ -1075,7 +1110,7 @@ $(document).on('click', '#flooredit', function () {
                 exe_order: totalFloors
             }, function (res) {
                 if (res === 'Sucess') {
-                	Swal.fire({
+                /*	Swal.fire({
                         title: 'Success!',
                         text: 'Floor added successfully.',
                         icon: 'success',
@@ -1083,9 +1118,9 @@ $(document).on('click', '#flooredit', function () {
 	                    allowEscapeKey: false, // Disable escape key to close the modal
 	                    allowEnterKey: false, // Disable enter key to close the modal	                   
                         showConfirmButton: true
-                    });
+                    });*/
                     populatefloorDropdowns(buildingId); // reload dropdown
-                } else {
+                } /*else {
                 	  Swal.fire({
                           title: 'Error!',
                           text: 'Failed to add floor.',
@@ -1095,7 +1130,7 @@ $(document).on('click', '#flooredit', function () {
 		                    allowEnterKey: false, // Disable enter key to close the modal	                   
 	                        showConfirmButton: true
                       });
-                }
+                }*/
             });
         } else {
         	Swal.fire({
@@ -1323,7 +1358,8 @@ $(document).on('click', '#flooredit', function () {
 	                    floor_id: floorId
 	                },
 	                success: function (response) {
-	                    Swal.fire({
+	                	populatefloorDropdowns(buildingId);
+	                 /*   Swal.fire({
 	                        icon: 'success',
 	                        title: 'Success',
 	                        text: response.message || "Floor updated successfully"
@@ -1332,7 +1368,7 @@ $(document).on('click', '#flooredit', function () {
 	                       //reloadbuildingSection();  // OR refreshDataTable();
 	                    	//location.reload();
 	                    	handleEdit(buildingId);
-	                   });
+	                   });*/
 	                    // Optionally refresh dropdown or UI
 	                },
 	                error: function () {
diff --git a/src/main/resources/templates/modules/school/dashboard.html b/src/main/resources/templates/modules/school/dashboard.html
index cb68c13..0f14e2c 100644
--- a/src/main/resources/templates/modules/school/dashboard.html
+++ b/src/main/resources/templates/modules/school/dashboard.html
@@ -268,6 +268,7 @@
 							const table = $('#schoolTable').DataTable({
 								createdRow: function (row, data, dataIndex) {
 									$(row).attr("onclick", `redirectToDetails(${schoolList[dataIndex].id})`);
+									$(row).css("cursor", "pointer");
 								}
 							});
 
diff --git a/src/main/resources/templates/modules/school/drinkingwater.html b/src/main/resources/templates/modules/school/drinkingwater.html
index cf409e8..5269844 100644
--- a/src/main/resources/templates/modules/school/drinkingwater.html
+++ b/src/main/resources/templates/modules/school/drinkingwater.html
@@ -30,22 +30,33 @@
     pointer-events: none;
 }
 
+#drinkingWaterModal .modal-body {
+        max-height: 80vh;  
+        overflow-y: auto;  
+    }
+  
+
+  /* Override for larger screens (desktops) */
+ /* @media (min-width: 992px) {
+    #drinkingWaterTableContainer {
+      padding: 236px;
+      margin-top: -233px;
+    }
+  }*/
+
 </style>
 
 <body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="card">
-				<div class="main-content" style="background-color: white;">
-					<div class="container">
-						<!-- Card 2: Other Details -->
-						<div class="col-md-12">
-							<div style="padding: 0px;margin-top:-58px;margin-left: -233px;">
-								<div class="card-header"><b>
-										Drinking Water</b>
-								</div>
+	<div class="container mt-4">
+				<header th:replace="~{fragments/modules/base/header :: header}"></header>
+				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
+	
+		
+			<div class="card p-3">
+				<div class="card-header">
+					<b>Drinking Water</b>
+				</div>
+								
 
 								<!-- Table Container for Displaying Saved Data -->
 								<div id="drinkingWaterTableContainer" style="display: none; padding: 15px;">
@@ -79,15 +90,23 @@
 												<th>Storage Types & Capacities</th>
 												<td id="view_storage_details"></td>
 											</tr>
+											<tr>
+												<th>No of Drinking Water Tap</th>
+												<td id="view_drinkingwater_tap"></td>
+
+												<th>No of Handwash Tap</th>
+												<td id="view_handwash_tap"></td>
+											</tr>
 										</tbody>
 									</table>
 									<div class="text-center">
 										<button class="btn btn-primary" id="editDrinkingBtn">Update</button>
 									</div>
 								</div>
+	
 
-								<!-- Wrap starts here -->
-								<div class="form-section">
+									<!-- your existing form rows -->
+									<div class="form-section">
 
 									<!-- your existing form rows -->
 									<div class="row" style="padding: 5px;">
@@ -160,6 +179,22 @@
 									</div>
 
 									<div class="row" id="storage_capacity_container" style="padding: 5px;"></div>
+									
+									<div class="row" style="padding: 5px;">										
+										<div class="col-md-4 form-group">
+											<label for="drinkingwater_tap">No of Drinking Water Tap<span
+													class="text-danger">*</span></label>
+											<input type="number" id="drinkingwater_tap" name="drinkingwater_tap"
+												class="form-control" placeholder="Enter Capacity Of Drinking Water Tap" />
+										</div>
+										
+										<div class="col-md-4 form-group">
+											<label for="handwash_tap">No of Handwash Tap<span
+													class="text-danger">*</span></label>
+											<input type="number" id="handwash_tap" name="handwash_tap"
+												class="form-control" placeholder="Enter Capacity Of Handwash Tap" />
+										</div>
+									</div>
 
 									<div class="row" style="padding: 5px;">
 										<div class="col-md-12 form-group">
@@ -174,15 +209,12 @@
 									</div>
 
 									<!-- Wrap ends here -->
-								</div>
-
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
+						
+	
+	</div>
 		</div>
 		<!-- Modal (Editable Form) -->
+				
 		<div class="modal fade" id="drinkingWaterModal" tabindex="-1" aria-labelledby="drinkingWaterModalLabel"
 			aria-hidden="true">
 			<div class="modal-dialog modal-lg">
@@ -203,7 +235,7 @@
 				</div>
 			</div>
 		</div>
-
+<script th:replace="~{fragments/modules/base/script :: script}"></script>
 		<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
 		<script src="https://cdn.jsdelivr.net/npm/select2@4.1.0/dist/js/select2.min.js"></script>
 
@@ -295,6 +327,8 @@
 								    borewell: d.is_borewell == 1 ? 'Yes' : 'No',
 								    borewell_count: d.borewell_count || '',
 								    storage: d.is_storage == 1 ? 'Yes' : 'No',
+								    drinkingwater_tap:d.drinkingwater_tap,
+								    handwash_tap: d.handwash_tap,
 								    storageDetails: storage.map(s => `${s.storage_type}: ${s.capacity} L`).join('<br>')
 								};
 
@@ -320,6 +354,10 @@
 									} else {
 									  $('#view_storage_details').text('-');
 									}
+									
+									//view_drinkingwater_tap view_handwash_tap
+									 $('#view_drinkingwater_tap').text(d.drinkingwater_tap);
+									 $('#view_handwash_tap').text(d.handwash_tap);
 								$('#drinkingWaterTableContainer').show();
 								$('.form-section').hide(); // ✅ Hides the entire form
 							} else {
@@ -417,8 +455,8 @@
 									<label class="fw-bold d-block mb-2">${water_type} Type Of Water Supply <span class="text-danger">*</span></label>
 									<div class="d-flex gap-4">
 										<div class="form-check form-check-inline">
-											<input class="form-check-input" type="radio" name="water_supply_${source_water_id}" value="Continious" ${supply_type === 'Continious' ? 'checked' : ''}>
-											<label class="form-check-label">Continious</label>
+											<input class="form-check-input" type="radio" name="water_supply_${source_water_id}" value="Continuous" ${supply_type === 'Continuous' ? 'checked' : ''}>
+											<label class="form-check-label">Continuous</label>
 										</div>
 										<div class="form-check form-check-inline">
 											<input class="form-check-input" type="radio" name="water_supply_${source_water_id}" value="Intermittent" ${supply_type === 'Intermittent' ? 'checked' : ''}>
@@ -429,6 +467,8 @@
 							`);
 						}
 					});
+					
+					
 
 					// Prefill purifier
 					if (d.purifier === 'Yes') {
@@ -449,7 +489,12 @@
 						$('#editDrinkingWaterForm #borwell_status_no').prop('checked', true);
 						$('#editDrinkingWaterForm #borwell_status_container').hide();
 					}
-
+					
+					$('#editDrinkingWaterForm #drinkingwater_tap').val(d.drinkingwater_tap);
+					$('#editDrinkingWaterForm #handwash_tap').val(d.handwash_tap);
+					
+					//console.log("d.drinkingwater_tap=",d.drinkingwater_tap);
+					
 					// Storage
 					if (d.storage === 'Yes') {
 						$('#editDrinkingWaterForm #storage_yes').prop('checked', true);
@@ -484,6 +529,8 @@
 								});
 							}, 500);
 						}, '#editDrinkingWaterForm #storage_types');
+						
+						
 					} else {
 						$('#editDrinkingWaterForm #storage_no').prop('checked', true);
 						$('#editDrinkingWaterForm #storage_type_container').hide();
@@ -544,7 +591,33 @@
 					    }
 					}
 
+					const up_drinkingwater_tap = form.find('#drinkingwater_tap').val();
+					if(!up_drinkingwater_tap){
+						Swal.fire({
+							icon: 'info',
+							title: 'Info',
+							text: 'Please enter No of Drinking Water Tap.If No means enter Zero(0)',
+							allowOutsideClick: false,
+							allowEscapeKey: false,
+							allowEnterKey: false,
+							showConfirmButton: true
+						});
+						return;
+					}
 					
+					const up_handwash_tap = form.find('#handwash_tap').val();
+					if(!up_handwash_tap){
+						Swal.fire({
+							icon: 'info',
+							title: 'Info',
+							text: 'Please enter No of Handwash Tap.If No means enter Zero(0)',
+							allowOutsideClick: false,
+							allowEscapeKey: false,
+							allowEnterKey: false,
+							showConfirmButton: true
+						});
+						return;
+					}
 					
 
 					const storageValue = form.find('input[name="storage_status"]:checked').val();
@@ -586,7 +659,9 @@
 						    drinking_water_id: parseInt(drinkingWaterId), // ✅ will no longer be NaN or undefined
 						    school_id: parseInt(schoolId),
 						    supply: water,
-						    storage: storage
+						    storage: storage,
+						    drinkingwater_tap:up_drinkingwater_tap,
+						    handwash_tap:up_handwash_tap
 						};
 
 					console.log("Update payload:", updatePayload);
@@ -660,6 +735,7 @@
 						}
 
 					});
+					
 				});
 
 
@@ -678,8 +754,8 @@
 				                    <label class="fw-bold d-block mb-2">${label} Type Of Water Supply <span class="text-danger">*</span></label>
 				                    <div class="d-flex gap-4">
 				                        <div class="form-check form-check-inline">
-				                            <input class="form-check-input" type="radio" name="water_supply_${id}" value="Continious" id="supply_${id}_1">
-				                            <label class="form-check-label" for="supply_${id}_1">Continious</label>
+				                            <input class="form-check-input" type="radio" name="water_supply_${id}" value="Continuous" id="supply_${id}_1">
+				                            <label class="form-check-label" for="supply_${id}_1">Continuous</label>
 				                        </div>
 				                        <div class="form-check form-check-inline">
 				                            <input class="form-check-input" type="radio" name="water_supply_${id}" value="Intermittent" id="supply_${id}_2">
@@ -723,8 +799,8 @@
 									<label class="fw-bold d-block mb-2">${label} Type Of Water Supply <span class="text-danger">*</span></label>
 									<div class="d-flex gap-4">
 										<div class="form-check form-check-inline">
-											<input class="form-check-input" type="radio" name="water_supply_${id}" value="Continious" id="edit_supply_${id}_1">
-											<label class="form-check-label" for="edit_supply_${id}_1">Continious</label>
+											<input class="form-check-input" type="radio" name="water_supply_${id}" value="Continuous" id="edit_supply_${id}_1">
+											<label class="form-check-label" for="edit_supply_${id}_1">Continuous</label>
 										</div>
 										<div class="form-check form-check-inline">
 											<input class="form-check-input" type="radio" name="water_supply_${id}" value="Intermittent" id="edit_supply_${id}_2">
@@ -1316,6 +1392,8 @@
 					        });
 					    }
 					}
+					
+					
 
 					
 
@@ -1414,6 +1492,36 @@
 						}
 						
 					}
+					
+					const drinkingwater_tap=$('#drinkingwater_tap').val().trim();
+					if(!drinkingwater_tap)
+					{
+						Swal.fire({
+							icon: 'info',
+							title: 'Info',
+							text: 'Please enter No of Drinking Water Tap.If No means enter Zero(0)',
+							allowOutsideClick: false,
+							allowEscapeKey: false,
+							allowEnterKey: false,
+							showConfirmButton: true
+						});
+						return;
+					}
+					
+					const handwash_tap=$('#handwash_tap').val().trim();
+					if(!handwash_tap)
+					{
+						Swal.fire({
+							icon: 'info',
+							title: 'Info',
+							text: 'Please enter No of Handwash Tap.If No means enter Zero(0)',
+							allowOutsideClick: false,
+							allowEscapeKey: false,
+							allowEnterKey: false,
+							showConfirmButton: true
+						});
+						return;
+					}
 
 
 
@@ -1425,21 +1533,52 @@
 						is_borewell: isBorewell,
 						borewell_count: borewellCount,
 						is_storage: isStorage,
-						storage
+						storage,
+						drinkingwater_tap:drinkingwater_tap,
+						handwash_tap:handwash_tap
 					};
+					
+					console.log("requestData===" + JSON.stringify(requestData));
 
-					$.ajax({
+					 $.ajax({
 						url: '/gcc/api/gccschool/schoolproperty/saveDrinkingWater',
 						method: 'POST',
 						contentType: 'application/json',
-						data: JSON.stringify(requestData),
-						success: function (response) {
-							if (response.status === "OK") {
-								Swal.fire({icon: "success", title: "Success", text: "Drinking water details submitted successfully!"}).then(() => location.reload());
-							} else {
-								Swal.fire({icon: "error", title: "Submission Failed", text: response.message || "Please try again."});
-							}
-						},
+						data: JSON.stringify(requestData),						
+						success: function(response) {
+						    let title, icon;
+
+						    switch (response.status) {
+						      case "OK":
+						        title = "Success";
+						        icon = "success";
+						        break;
+						      case "SKIPPED":
+						        title = "Notice";
+						        icon = "info";
+						        break;
+						      default:
+						        title = "Error";
+						        icon = "error";
+						        break;
+						    }
+
+						    Swal.fire({
+						      title: title,
+						      text: response.message || 'No message from server',
+						      icon: icon,
+						      allowOutsideClick: false,
+						      allowEscapeKey: false,
+						      allowEnterKey: false,
+						      showConfirmButton: true
+						    }).then(() => {
+						     
+						        // Reload or redirect only after successful insert
+						        location.reload();
+						      
+						      // For SKIPPED or ERROR, you may just close the alert without reload
+						    });
+						  },
 						error: function (xhr) {
 						  let errorMessage = "An error occurred while submitting the form.";
 
@@ -1463,7 +1602,8 @@
 						  });
 						}
 
-					});
+					}); 
+					
 				});
 			});
 
diff --git a/src/main/resources/templates/modules/school/kitchen.html b/src/main/resources/templates/modules/school/kitchen.html
index e5b112f..039f503 100644
--- a/src/main/resources/templates/modules/school/kitchen.html
+++ b/src/main/resources/templates/modules/school/kitchen.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en" dir="ltr">
 <html xmlns:th="http://www.thymeleaf.org">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons/font/bootstrap-icons.css">
 
 <head th:replace="~{fragments/modules/base/head :: head}"></head>
 <style>
@@ -9,8 +10,6 @@
 		/*  font-family: Arial, sans-serif;*/
 	}
 
-
-
 	.header {
 		font-size: 22px;
 		font-weight: bold;
@@ -44,6 +43,36 @@
 		gap: 20px;
 		margin-top: 10px;
 	}
+	.custom-card-wrapper {
+  padding: 0;
+  margin-left: -233px;
+}
+
+#editKitchenModal .modal-body{
+					max-height:70vh;
+					overflow-y:auto; 
+				}
+
+@media (max-width: 768px) {
+  .custom-card-wrapper {
+    margin-left: 0;
+    padding: 0 15px; /* Optional: adds spacing on small screens */
+  }
+}
+.kitchen-data-wrapper {
+  padding: 18px;
+  margin-top: -58px;
+  margin-left: -256px;
+}
+
+@media (max-width: 768px) {
+  .kitchen-data-wrapper {
+    margin-left: 0;
+    padding: 15px;
+  }
+}
+
+	
 </style>
 
 <body>
@@ -56,11 +85,12 @@
 					<div class="container">
 						<!-- Card 2: Other Details -->
 						<div class="col-md-12">
-							<div style="padding: 18px;margin-top:-58px;margin-left: -233px;">
+							<div class="kitchen-data-wrapper">
+
 								<div class="card-header"><b>CMBFS-Kitchen</b></div>
 
 								<div id="kitchenDataContainer" style="display: none; padding: 15px;">
-									<table class="table table-bordered">
+									<table class="table table-bordered" id="kitchenTable">
 										<tr>
 											<th>CMBFS Present</th>
 											<td id="td_k_cmbfs"></td>
@@ -82,13 +112,7 @@
 											<th>Anganwadi Present</th>
 											<td id="td_k_ang"></td>
 										</tr>
-										<tr>
-											<th>Anganwadi Unique No</th>
-											<td id="td_k_ang_unique"></td>
 										
-											<th>Anganwadi Building</th>
-											<td id="td_k_ang_building"></td>
-										</tr>
 									</table>
 									<div class="text-center">
 									<button type="button" class="btn btn-primary" id="editKitchenBtn">Update</button>
@@ -101,7 +125,7 @@
 							<div id="kitchenFormContainer" style="display: none;">
 								<!-- Card 2: Other Details -->
 								<div class="col-md-12">
-									<div style="padding: 0px;    margin-left: -215px;">
+									<div class="custom-card-wrapper">
 										<div class="card-header"><b>CMBFS-Kitchens</b></div>
 										<div class="row" style="    padding: 15px;">
 											<div class="col-md-4 form-group">
@@ -135,7 +159,7 @@
 
 								<!-- card 2 -->
 								<div class="col-md-12">
-									<div style="padding: 0px;    margin-left: -215px;">
+									<div class="custom-card-wrapper">
 										<div class="card-header"><b>Noon Meal Center</b></div>
 										<div class="row" style="    padding: 15px;">
 											<div class="col-md-4 form-group">
@@ -173,19 +197,17 @@
 												</div>
 											</div>
 										</div>
-
-
-
 									</div>
 								</div>
 
 								<!-- card -3 -->
 
 								<div class="col-md-12">
-									<div style="padding: 0px;    margin-left: -215px;">
-										<div class="card-header"><b>Anganwadi</b></div>
-										<div class="row" style="    padding: 15px;">
-											<div class="col-md-4 form-group">
+									<div class="custom-card-wrapper">
+										<div class="card-header mb-3">
+											<b>Anganwadi</b>
+										</div>										
+											<!-- <div class="col-md-4 form-group">
 												<label>Is Anganwadi Present <span class="text-danger">*</span></label>
 												<div class="radio-group">
 													<input type="radio" id="anganwadiPresentYes" name="anganwadiPresent"
@@ -193,8 +215,8 @@
 													<input type="radio" id="anganwadiPresentNo" name="anganwadiPresent"
 														value="0"> No
 												</div>
-											</div>
-											<div id="anganwadifield" style="display: none" class="col-12">
+											</div> -->
+											<!-- <div id="anganwadifield" style="display: none" class="col-12">
 												<div class="row">
 													<div class="col-md-6 form-group">
 														<label>Anganwadi unique Number<span
@@ -214,12 +236,37 @@
 														</div>
 													</div>
 												</div>
+											</div> -->
+
+												<table id="CompletedCPSDatatable"
+													class="table table-striped table-bordered table-hover dataTable"
+													role="grid" style="width: 100%">
+													<thead class="thead-dark">
+														<tr>
+															<th style="width: 5%;">S.NO</th>
+															<th style="width: 10%;">Room Name</th>
+															<th style="width: 15%;">Building Name</th>
+															<th style="width: 10%;">Floor</th>
+															<th style="width: 15%;">Room Type</th>
+															<th style="width: 10%;">Action</th>
+														</tr>
+													</thead>
+													<tbody>
+
+
+													</tbody>
+												</table>
+
+
 											</div>
 										</div>
 
 
 
-										<div class="card-footer text-center">
+
+									<div class="col-md-12">
+									<div class="custom-card-wrapper">
+									<div class="card-footer text-center">
 											<button type="submit" class="btn btn-primary" id="requestSubmitBtn"><i
 													class="ik ik-save"></i>Submit
 											</button>
@@ -228,6 +275,9 @@
 											</button>
 
 										</div>
+										</div>
+									</div>
+									
 									</div>
 								</div>
 
@@ -304,31 +354,13 @@
 												<input type="radio" name="modalvegetableGarden" value="0"> No
 											</div>
 										</div>
-									</div>
-
-									<div class="row mb-3">
-										<div class="col-md-6">
-											<label>Is Anganwadi Present? *</label>
-											<div class="radio-group">
-												<input type="radio" name="modalanganwadiPresent" value="1"> Yes
-												<input type="radio" name="modalanganwadiPresent" value="0"> No
-											</div>
-										</div>
-									</div>
-
-									<div class="row mb-3" id="modalanganwadifield" style="display: none;">
-										<div class="col-md-6">
-											<label>Anganwadi Unique Number *</label>
-											<input type="text" id="modalanganwadiNumber" class="form-control" />
-										</div>
-										<div class="col-md-6">
-											<label>Individual Building Present *</label>
-											<div class="radio-group">
-												<input type="radio" name="modalanganwadiBuilding" value="1"> Yes
-												<input type="radio" name="modalanganwadiBuilding" value="0"> No
-											</div>
-										</div>
-									</div>
+									</div>									
+									
+									<!-- NEW: Placeholder for old Anganwadis -->
+							        <div id="oldAnganwadiSection" class="old-anganwadis-container"></div>
+							
+							        <!-- NEW: Placeholder for new Anganwadis -->
+							        <div id="newAnganwadiSection" class="new-anganwadis-container"></div>
 
 								</div>
 								<div class="modal-footer">
@@ -340,6 +372,9 @@
 						</div>
 					</div>
 				</div>
+				</div>
+				
+
 
 		<script th:replace="~{fragments/modules/base/script :: script}"></script>
 		<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
@@ -419,11 +454,83 @@
 				});
 
 			});
+			
+			
+
+			
+			
+			 function loadSavedAnganwadiDetails(school_id) {
+				$.ajax({
+					url: '/gcc/api/gccschool/schoolproperty/getAnganwadiDetails',
+					type: 'GET',
+					contentType: 'application/json',
+					data: { school_id },
+					success: function (response) {
+						if (response.status === "OK") {
+							
+							
+							$('#CompletedCPSDatatable').DataTable({
+								destroy: true,
+								searching: true,
+								select: false,
+								autoWidth: false,
+								scrollY: '60vh',
+								scrollCollapse: true,
+								processsing: false,
+								responsive: true,
+								paging: true,
+								info: true,
+								data: response.data,
+								columns: [
+									{ data: null, render: (data, type, row, meta) => meta.row + 1, className: 'text-center' },
+									{ data: 'room_name', defaultContent: '-', className: 'text-center' },
+									{ data: 'building_name', defaultContent: '-', className: 'text-center' },
+									{ data: 'floor', defaultContent: '-', className: 'text-center' },
+									{ data: 'room_type', defaultContent: '-', className: 'text-center' },
+									{
+										data: 'anganwadi_unique_number',
+										render: function (data, type, row, meta) {
+											let uniqueId = `anganwadiRadio_${meta.row}`; // Unique ID for each row
+											return `
+												<div class="text-center">
+													<label>
+														<input type="radio" name="${uniqueId}" class="anganwadi-radio" data-unique-number="${data}" value="1"> Yes
+													</label>
+													<label style="margin-left:10px;">
+														<input type="radio" name="${uniqueId}" class="anganwadi-radio" data-unique-number="${data}" value="0"> No
+													</label>
+												</div>`;
+										},
+										className: 'text-center'
+									}
+								],
+							    initComplete: function () {
+							        this.api().columns.adjust().draw();
+							    }
+							});
+							
+							
+						} else {
+							$('#CompletedCPSDatatable tbody').html(`<tr><td colspan="6" class="text-center text-danger">${response.data}</td></tr>`);
+						}
+						
+					},
+					error: function () {
+						Swal.fire("Error", "Something went wrong while fetching Anganwadi details.", "error");
+					}
+				});
+			} 
+			
+			
 
 			$(document).ready(function () {
 				const urlParams = new URLSearchParams(window.location.search);
 				const schoolId = urlParams.get("schoolId");
-				$('input[name="school_id"]').val(schoolId);
+				$('input[name="school_id"]').val(schoolId);				
+				
+				loadSavedAnganwadiDetails(schoolId);
+				
+				
 				function toggleField(radioGroup, targetDiv, resetSelectors = []) {
 					document.querySelectorAll(`input[name="${radioGroup}"]`).forEach(radio => {
 						radio.addEventListener('change', function () {
@@ -442,7 +549,7 @@
 
 				toggleField('cmbfskitchenPresent', 'CMBFSfield', ['input[name="cmbfskitchenBuilding"]']);
 				toggleField('noonMealpresent', 'noonMealfield', ['input[name="noonMealBuilding"]', 'input[name="vegetableGarden"]']);
-				toggleField('anganwadiPresent', 'anganwadifield', ['input[name="anganwadiBuilding"]', '#anganwadiNumber']);
+				//toggleField('anganwadiPresent', 'anganwadifield', ['input[name="anganwadiBuilding"]', '#anganwadiNumber']);
 
 				// ---------------- Data Fetch -------------------
 				$.ajax({
@@ -450,10 +557,11 @@
 					type: 'GET',
 					data: {school_id: schoolId},
 					success: function (response) {
-						const hasValidData = response && response[0] && response[0].Data && Object.values(response[0].Data).some(val => val !== null && val !== false && val !== "");
-
-						if (hasValidData) {
-							const data = response[0].Data;
+						if (response && response[0] && response[0].kitchenDetails &&
+							 Object.values(response[0].kitchenDetails).some(value => value !== null && value !== "" && value !== false)
+						) {
+							console.log("hi");
+				            const data = response[0].kitchenDetails;
 
 							//const yesNo = val => val === true ? 'Yes' : 'No';
 							const yesNo = val => val === true ? 'Yes' : val === false ? 'No' : '-';
@@ -462,17 +570,54 @@
 							$('#td_k_cmbfs_building').text(yesNo(data.is_cmbfsIndividual));
 							$('#td_k_noon').text(yesNo(data.is_noonmeal));
 							$('#td_k_noon_building').text(yesNo(data.is_noonIndividual));
-							$('#td_k_veg').text(yesNo(data.is_vegGarden));
+							$('#td_k_veg').text(yesNo(data.is_vegGarden));							
 							$('#td_k_ang').text(yesNo(data.is_anganwadi));
-							$('#td_k_ang_unique').text(data.anganwadi_unique || '-');
-							$('#td_k_ang_building').text(yesNo(data.is_anganwadiIndividual));
+							
+							
+							const anganwadiDetails = response[0].anganwadiDetails;
+							const newAnganwadiDetails = response[0].newAnganwadiDetails;
+							const kitchenTable = $('#kitchenTable');
+
+							// Remove old anganwadi rows if any
+							kitchenTable.find('.anganwadi-row').remove();
+
+							if (Array.isArray(anganwadiDetails) && anganwadiDetails.length > 0) {
+							    anganwadiDetails.forEach((item, index) => {
+							        const unique = item.anganwadi_unique || '';
+							        const individual = item.is_anganwadiIndividual === 1 ? 'Yes' : item.is_anganwadiIndividual === 0 ? 'No' : '-';
+
+							        const newRow = `
+							            <tr class="anganwadi-row">
+							                <th>Anganwadi Unique Number</th>
+							                <td>${unique}</td>
+							                <th>Individual Building</th>
+							                <td>${individual}</td>
+							            </tr>
+							        `;
+							        kitchenTable.append(newRow);
+							    });
+							} else {
+							    // Add one empty row
+							    kitchenTable.append(`
+							        <tr class="anganwadi-row">
+							            <th>Anganwadi Unique</th>
+							            <td></td>
+							            <th>Individual Building</th>
+							            <td></td>
+							        </tr>
+							    `);
+							}
 
-							$('#kitchenDataContainer').show();     // ✅ Show table
-							$('#kitchenFormContainer').hide();     // ❌ Hide form
-							$('#editKitchenBtn').data('kitchenData', data);
+							$('#kitchenDataContainer').show();     
+							$('#kitchenFormContainer').hide();     
+							$('#editKitchenBtn').data('kitchenData', {
+							    kitchen: data,
+							    oldanganwadis: response[0].anganwadiDetails,
+							    newanganwadis:response[0].newAnganwadiDetails
+							});
 						} else {
-							$('#kitchenDataContainer').hide();     // ❌ Hide table
-							$('#kitchenFormContainer').show();     // ✅ Show form
+							$('#kitchenDataContainer').hide();    
+							$('#kitchenFormContainer').show();     
 						}
 					},
 					error: function () {
@@ -480,7 +625,7 @@
 						$('#kitchenFormContainer').show();     // ✅ show form
 					}
 				});
-				$('input[name="modalanganwadiPresent"]').on('change', function () {
+				/* $('input[name="modalanganwadiPresent"]').on('change', function () {
 				    if (this.value === '1') {
 				        $('#editKitchenModalAnganwadiField').show();
 				    } else {
@@ -492,7 +637,7 @@
 				        // Clear the Anganwadi Number field
 				      $('#modalanganwadiNumber').val('');
 				    }
-				});
+				}); */
 				$('input[name="modalnoonMealpresent"]').on('change', function () {
 					if (this.value === '1') {
 						$('#editKitchenModalNoonField').show();
@@ -515,28 +660,75 @@
 
 				// ---------------- On Update Button -------------------
 				$('#editKitchenBtn').click(function () {
-					const data = $(this).data('kitchenData');
-
-					$(`input[name="modalcmbfskitchenPresent"][value="${data.is_cmbfs ? 1 : 0}"]`).prop('checked', true);
-					$(`input[name="modalcmbfskitchenBuilding"][value="${data.is_cmbfsIndividual ? 1 : 0}"]`).prop('checked', true);
-
-					$(`input[name="modalnoonMealpresent"][value="${data.is_noonmeal ? 1 : 0}"]`).prop('checked', true);
-					$(`input[name="modalnoonMealBuilding"][value="${data.is_noonIndividual ? 1 : 0}"]`).prop('checked', true);
-					$(`input[name="modalvegetableGarden"][value="${data.is_vegGarden ? 1 : 0}"]`).prop('checked', true);
+					//const data = $(this).data('kitchenData');
+					
+					const allData = $(this).data('kitchenData');
+				    const data = allData.kitchen;
+				    const anganwadis = allData.oldanganwadis;
+				    const newanganwadis =allData.newanganwadis;
+
+
+				    $(`input[name="modalcmbfskitchenPresent"][value="${data.is_cmbfs ? 1 : 0}"]`).prop('checked', true);
+				    $(`input[name="modalcmbfskitchenBuilding"][value="${data.is_cmbfsIndividual ? 1 : 0}"]`).prop('checked', true);
+				    $(`input[name="modalnoonMealpresent"][value="${data.is_noonmeal ? 1 : 0}"]`).prop('checked', true);
+				    $(`input[name="modalnoonMealBuilding"][value="${data.is_noonIndividual ? 1 : 0}"]`).prop('checked', true);
+				    $(`input[name="modalvegetableGarden"][value="${data.is_vegGarden ? 1 : 0}"]`).prop('checked', true);
+				    
+				 // === OLD ANGANWADIS (populate with values) ===
+				    if (Array.isArray(anganwadis) && anganwadis.length > 0) {
+				    	const oldHtml = anganwadis.map((item, index) => {
+				    		const label = `Anganwadi "${item.anganwadi_unique}" has Individual Building *`;
+				    		const groupName = `oldAnganwadi_${index}`;
+				    		const yesChecked = item.is_anganwadiIndividual === 1 ? 'checked' : '';
+				    		const noChecked = item.is_anganwadiIndividual === 0 ? 'checked' : '';
+
+				    		return `
+				    		<div class="row mb-3 old-anganwadis-container">
+				    			<div class="col-md-6">
+				    				<label>${label}</label>
+				    				<div class="radio-group">
+				    					<input type="radio" name="${groupName}" value="1" ${yesChecked}> Yes
+				    					<input type="radio" name="${groupName}" value="0" ${noChecked} style="margin-left: 15px;"> No
+				    				</div>
+				    			</div>
+				    		</div>`;
+				    	}).join('');
+
+				    	$('#oldAnganwadiSection').html(oldHtml);
+				    }
 
-					$(`input[name="modalanganwadiPresent"][value="${data.is_anganwadi ? 1 : 0}"]`).prop('checked', true);
-					$(`input[name="modalanganwadiBuilding"][value="${data.is_anganwadiIndividual ? 1 : 0}"]`).prop('checked', true);
-					$('#modalanganwadiNumber').val(data.anganwadi_unique || '');
+				 // === NEW ANGANWADIS (empty radio buttons) ===
+				    if (Array.isArray(newanganwadis) && newanganwadis.length > 0) {
+				    	const newHtml = newanganwadis.map((item, index) => {
+				    		const label = `Anganwadi "${item.anganwadi_unique_number}" has Individual Building *`;
+				    		const groupName = `newAnganwadi_${index}`;
+
+				    		return `
+				    		<div class="row mb-3 new-anganwadis-container">
+				    			<div class="col-md-6">
+				    				<label>${label}</label>
+				    				<div class="radio-group">
+				    					<input type="radio" name="${groupName}" value="1"> Yes
+				    					<input type="radio" name="${groupName}" value="0" style="margin-left: 15px;"> No
+				    				</div>
+				    			</div>
+				    		</div>`;
+				    	}).join('');
+
+				    	$('#newAnganwadiSection').html(newHtml);
+				    }
 
 					// 👇 Force the toggle to display the dependent fields
 					$(`#editKitchenModal input[name="modalcmbfskitchenPresent"]:checked`).trigger('change');
 					$(`#editKitchenModal input[name="modalnoonMealpresent"]:checked`).trigger('change');
-					$(`#editKitchenModal input[name="modalanganwadiPresent"]:checked`).trigger('change');
+					
 
 					// Show modal
 					const kitchenModal = new bootstrap.Modal(document.getElementById('editKitchenModal'));
 					kitchenModal.show();
 				});
+				
+				
 
 
 				// --- Toggle logic for modal form fields inside editKitchenModal ---
@@ -561,10 +753,14 @@
 
 
 
-				document.getElementById('anganwadiNumber').addEventListener('input', function () {
+				/* document.getElementById('anganwadiNumber').addEventListener('input', function () {
 								    // Keep only alphanumeric characters
 								    this.value = this.value.replace(/[^a-zA-Z0-9]/g, '');
-								});
+								}); */
+				/* document.getElementById('modalanganwadiNumber').addEventListener('input', function () {
+				    // Keep only alphanumeric characters
+				    this.value = this.value.replace(/[^a-zA-Z0-9]/g, '');
+				}); */
 
 				$(document).on('click', '#requestSubmitBtn', function () {	
 
@@ -618,8 +814,8 @@
 							return;
 						}
 					}
-
-					let anganwadiPresent = $('input[name="anganwadiPresent"]:checked').val();
+										
+					/* let anganwadiPresent = $('input[name="anganwadiPresent"]:checked').val();
 					let anganwadiBuilding = null;
 					let anganwadiNumber = null;
 					if (anganwadiPresent === '1') {
@@ -653,13 +849,13 @@
 							return;
 						}
 
-					}
+					} */
 
 
 				//	let school_id = 1;
 
 
-					console.log("cmbfskitchenPresent=", cmbfskitchenPresent);
+					/* console.log("cmbfskitchenPresent=", cmbfskitchenPresent);
 					console.log("anganwadiBuilding=", anganwadiBuilding);
 					console.log("noonMealpresent=", noonMealpresent);
 					console.log("noonMealBuilding=", noonMealBuilding);
@@ -667,13 +863,12 @@
 					console.log("anganwadiPresent=", anganwadiPresent);
 					console.log("anganwadiNumber=", anganwadiNumber);
 					console.log("anganwadiBuilding=", anganwadiBuilding);
-					console.log("school_id=", schoolId);
+					console.log("school_id=", schoolId); */
 
 					// Validate inputs
 					let fields = {
 						"Is CMBFS-Kitchen Present": cmbfskitchenPresent,
-						"Is noonMealpresent Present": noonMealpresent,
-						"Is Anganwadi Present": anganwadiPresent,
+						"Is noonMeal-Kitchen Present": noonMealpresent						
 					};
 
 
@@ -691,64 +886,116 @@
 							return; // Stop execution if validation fails
 						}
 					}
-
-
+					
+					 let selectedAnganwadiData = [];
+
+					    // Get all radio groups by unique name (one group per row)
+					    const totalGroups = new Set();
+					    $('.anganwadi-radio').each(function () {
+					        totalGroups.add($(this).attr('name'));
+					    });
+
+
+					    $('.anganwadi-radio:checked').each(function () {
+					        let uniqueNumber = $(this).data('unique-number');
+					        let selectedValue = $(this).val(); // '1' or '0'
+
+					        selectedAnganwadiData.push({
+					        	anganwadi_unique: uniqueNumber,
+					        	is_anganwadiIndividual: selectedValue === '1'
+					        });
+					    });
+					    
+					    if (selectedAnganwadiData.length !== totalGroups.size) {
+					        Swal.fire({
+					            icon: 'warning',
+					            title: 'Incomplete Selection',
+					            text: 'Please select Yes or No for all rows before submitting.'
+					        });
+					        return;
+					    }
+
+					console.log(selectedAnganwadiData);
+										
+					let requestData ="";
+					
 					// Prepare Data for AJAX
-					let requestData = {
-						is_cmbfs: cmbfskitchenPresent,
-						is_cmbfsIndividual: cmbfskitchenBuilding,
-						is_noonmeal: noonMealpresent,
-						is_noonIndividual: noonMealBuilding,
-						is_vegGarden: vegetableGarden,
-						is_anganwadi: anganwadiPresent,
-						anganwadi_unique: anganwadiNumber || null,
-						is_anganwadiIndividual: anganwadiBuilding,
+					requestData = {
+						is_cmbfs: cmbfskitchenPresent === '1',
+						is_cmbfsIndividual: cmbfskitchenPresent === '1' ? (cmbfskitchenBuilding === '1') : null,
+						is_noonmeal: noonMealpresent === '1',
+						is_noonIndividual: noonMealpresent === '1' ? (noonMealBuilding === '1') : null,
+					    is_vegGarden: noonMealpresent === '1' ? (vegetableGarden === '1') : null,
 						school_id: schoolId
 					};
+					
+					let anganwadiPresent="";
+					
+					if(selectedAnganwadiData.length > 0){
+						anganwadiPresent=true;
+						requestData['anganwadi'] = selectedAnganwadiData;
+					}
+					else{
+						anganwadiPresent=false;
+					}
+					
+					requestData['is_anganwadi'] = anganwadiPresent;
+					
+					console.log("requestData to send:", requestData);
 
 					$('#requestSubmitBtn').prop('disabled', true).text('Processing...');
 					$('#pageLoader').show();
-					$.ajax({
+					 $.ajax({
 						url: '/gcc/api/gccschool/schoolproperty/saveKitchen',
 						type: 'POST',
-						contentType: 'application/x-www-form-urlencoded',
-						data: $.param(requestData),
+						contentType: 'application/json',
+						data: JSON.stringify(requestData),						
 						success: function (response) {
-							$('#pageLoader').hide();
-							$('#requestSubmitBtn').prop('disabled', false).text('Submit');
-							Swal.fire({
-								icon: 'success',
-								title: 'Success',
-								text: response,
-								allowOutsideClick: false,
-								allowEscapeKey: false,
-								allowEnterKey: false,
-								confirmButtonText: 'OK'
-							}).then((result) => {
-								if (result.isConfirmed) {
-									$('#requestSubmitBtn').prop('disabled', false).text('Submit');
-									location.reload();
-								}
-							});
+						    $('#pageLoader').hide();
+						    $('#requestSubmitBtn').prop('disabled', false).text('Submit');
+
+						    // response is a JSON object with "status" and "message"
+						    Swal.fire({
+						        icon: response.status === "OK" ? "success" : "error",
+						        title: response.status === "OK" ? "Success" : "Error",
+						        text: response.message,
+						        allowOutsideClick: false,
+						        allowEscapeKey: false,
+						        allowEnterKey: false,
+						        confirmButtonText: 'OK'
+						    }).then(() => {
+						        if (response.status === "OK") {
+						            $("#kitchenForm")[0].reset(); // Reset only if successfully inserted
+						            location.reload(); // Refresh page on success
+						        }
+						    });
 						},
-						error: function (xhr, status, error) {
-							$('#pageLoader').hide();
-							$('#requestSubmitBtn').prop('disabled', false).text('Submit');
-							let errorMessage = xhr.responseText;
 
-							Swal.fire({
-								icon: 'error',
-								title: 'Error',
-								text: errorMessage,
-								 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	                   
-			                        showConfirmButton: true
-								
-							});
-							console.error('Error:', xhr.responseText);
+						error: function (xhr, status, error) {
+						    $('#pageLoader').hide();
+						    $('#requestSubmitBtn').prop('disabled', false).text('Submit');
+
+						    let errorResponse;
+						    try {
+						        // Try parsing JSON error response
+						        errorResponse = JSON.parse(xhr.responseText);
+						    } catch (e) {
+						        errorResponse = { message: "An unexpected error occurred." };
+						    }
+
+						    Swal.fire({
+						        icon: 'error',
+						        title: 'Error',
+						        text: errorResponse.message || "Something went wrong.",
+						        allowOutsideClick: false,
+						        allowEscapeKey: false,
+						        allowEnterKey: false,
+						        showConfirmButton: true
+						    });
+
+						    console.error('Error:', xhr.responseText);
 						}
-					});
+					}); 
 
 
 
@@ -761,7 +1008,7 @@
 					$('input[type="radio"]').prop('checked', false);
 
 					// Clear input fields
-					$('#anganwadiNumber').val('');
+					//$('#anganwadiNumber').val('');
 
 					// Hide dependent sections
 					$('#CMBFSfield, #noonMealfield, #anganwadifield').hide();
@@ -782,9 +1029,7 @@
 
 					let cmbfskitchenPresent = $('#editKitchenModal input[name="modalcmbfskitchenPresent"]:checked').val();
 					let cmbfskitchenBuilding = cmbfskitchenPresent === '1' ? $('#editKitchenModal input[name="modalcmbfskitchenBuilding"]:checked').val() : null;
-					/*if (cmbfskitchenPresent === '1' && !cmbfskitchenBuilding) {
-						return Swal.fire('Validation Error!', 'Individual Building Present is required for CMBFS kitchen.', 'warning');
-					}*/
+					
 					if (cmbfskitchenPresent === '1' && !cmbfskitchenBuilding) {
 						return Swal.fire({
 							title: 'Validation Error!',
@@ -800,9 +1045,7 @@
 					let noonMealpresent = $('#editKitchenModal input[name="modalnoonMealpresent"]:checked').val();
 					let noonMealBuilding = noonMealpresent === '1' ? $('#editKitchenModal input[name="modalnoonMealBuilding"]:checked').val() : null;
 					let vegetableGarden = noonMealpresent === '1' ? $('#editKitchenModal input[name="modalvegetableGarden"]:checked').val() : null;
-					/*if (noonMealpresent === '1' && (!noonMealBuilding || !vegetableGarden)) {
-						return Swal.fire('Validation Error!', 'Fields under Noon Meal Center are required.', 'warning');
-					}*/
+					
 					if (noonMealpresent === '1' && (!noonMealBuilding || !vegetableGarden)) {
 						return Swal.fire({
 							title: 'Validation Error!',
@@ -814,69 +1057,156 @@
 							showConfirmButton: true
 						});
 					}
+					
+					 
+				    // === OLD ANGANWADIS ===
+					const oldAnganwadiEdit = [];
+					let isOldAnganwadiValid = true;  // <-- add this flag
+					let hasOldAnganwadi = $('.old-anganwadis-container input[type="radio"]').length > 0;
+					
+					$('[name^="oldAnganwadi_"]').each(function () {
+					    const name = $(this).attr('name');
+					   // const index = name.split('_')[1];
+					    const selected = $(`input[name="${name}"]:checked`).val();
+					
+					    // Check if selected is undefined (i.e., not answered Yes/No)
+					    if (hasOldAnganwadi && selected === undefined) {
+					        isOldAnganwadiValid = false;
+					        return false; // break on first invalid
+					    }
+					
+					    const label = $(`label:contains("Anganwadi")`, $(this).closest('.old-anganwadis-container')).text();
+					    const match = label.match(/"(.+?)"/); // Extract unique ID from label
+					
+					    if (match && selected !== undefined) {
+					        const exists = oldAnganwadiEdit.some(obj => obj.anganwadi_unique === match[1]);
+					        if (!exists) {
+					            oldAnganwadiEdit.push({
+					                anganwadi_unique: match[1],
+					                is_anganwadiIndividual: selected
+					            });
+					        }
+					    }
+					});
 
-					let anganwadiPresent = $('#editKitchenModal input[name="modalanganwadiPresent"]:checked').val();
-					let anganwadiBuilding = anganwadiPresent === '1' ? $('#editKitchenModal input[name="modalanganwadiBuilding"]:checked').val() : null;
-					let anganwadiNumber = anganwadiPresent === '1' ? $('#editKitchenModal #modalanganwadiNumber').val() : null;
-					/*if (anganwadiPresent === '1' && (!anganwadiBuilding || !anganwadiNumber)) {
-						return Swal.fire('Validation Error!', 'All Anganwadi fields are required.', 'warning');
-					}*/
-					if (anganwadiPresent === '1' && (!anganwadiBuilding || !anganwadiNumber)) {
-						return Swal.fire({
-							title: 'Validation Error!',
-							text: 'All Anganwadi fields are required.',
-							icon: 'warning',
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							showConfirmButton: true
-						});
-					}
+				    
+				 // === NEW ANGANWADIS ===
+				    const newAnganwadiEdit = [];
+				    $('[name^="newAnganwadi_"]').each(function () {
+				        const name = $(this).attr('name');
+				        const index = name.split('_')[1];
+				        const selected = $(`input[name="${name}"]:checked`).val();
+				        const label = $(`label:contains("Anganwadi")`, $(this).closest('.new-anganwadis-container')).text();
+				        const match = label.match(/"(.+?)"/);
+
+				        if (match && selected !== undefined) {
+				            const exists = newAnganwadiEdit.some(obj => obj.anganwadi_unique === match[1]);
+				            if (!exists) {
+				                newAnganwadiEdit.push({
+				                    anganwadi_unique: match[1],
+				                    is_anganwadiIndividual: selected
+				                });
+				            }
+				        }
+				    });
+				    
+				    let isValid = true;
+				    let hasNewAnganwadi = $('.new-anganwadis-container input[type="radio"]').length > 0;
+				    // Loop through all new anganwadi groups
+				    if (hasNewAnganwadi) {
+					    $('.new-anganwadis-container').each(function () {
+					        const radioName = $(this).find('input[type="radio"]').first().attr('name');
+					        
+					        // Check if any radio with this name is checked
+					        if (!$(`input[name="${radioName}"]:checked`).val()) {
+					            isValid = false;
+					            return false; // break loop on first invalid
+					        }
+					    });
+				    }
+				    
+				    if (hasOldAnganwadi && !isOldAnganwadiValid) {
+				    	console.log("11111");
+				        return Swal.fire({
+				            icon: 'warning',
+				            title: 'Incomplete Input',
+				            text: 'Please select Yes or No for all Anganwadi entries.'
+				        });
+				    }
 
-					const requestData = {
-						is_cmbfs: cmbfskitchenPresent,
-						is_cmbfsIndividual: cmbfskitchenBuilding,
-						is_noonmeal: noonMealpresent,
-						is_noonIndividual: noonMealBuilding,
-						is_vegGarden: vegetableGarden,
-						is_anganwadi: anganwadiPresent,
-						anganwadi_unique: anganwadiNumber || null,
-						is_anganwadiIndividual: anganwadiBuilding,
-						school_id: schoolId
-					};
+				    if (hasNewAnganwadi && !isValid) {
+				    	console.log("2222");
+				        Swal.fire({
+				            icon: 'warning',
+				            title: 'Incomplete Input',
+				            text: 'Please select Yes or No for all Anganwadi entries.'
+				        });
+				        return;
+				    }
+
+				    const kitchenEdit = {
+				            is_cmbfs: cmbfskitchenPresent === '1',
+				            is_cmbfsIndividual: cmbfskitchenPresent === '1' ? (cmbfskitchenBuilding === '1') : null,
+				            is_noonmeal: noonMealpresent === '1',
+				            is_noonIndividual: noonMealpresent === '1' ? (noonMealBuilding === '1') : null,
+				            is_vegGarden:  noonMealpresent === '1' ? (vegetableGarden === '1') : null,
+				            is_anganwadi: (oldAnganwadiEdit.length > 0 || newAnganwadiEdit.length > 0),
+				            school_id: schoolId
+
+				        };
+				    
+				    const payload = {
+				            kitchenEdit,
+				            oldAnganwadiEdit: (oldAnganwadiEdit.length > 0 ? oldAnganwadiEdit : null),
+				            newAnganwadiEdit: (newAnganwadiEdit.length > 0 ? newAnganwadiEdit : null)
+				        };
+				    
+				    console.log("payload=",payload);
 
 					$('#updateSubmitBtn').prop('disabled', true).text('Updating...');
 					$('#pageLoader').show();
 
-					$.ajax({
+					 $.ajax({
 						url: '/gcc/api/gccschool/schoolproperty/updateKitchenDetails',
 						type: 'POST',
-						contentType: 'application/x-www-form-urlencoded',
-						data: $.param(requestData),
+						contentType: 'application/json',
+				        data: JSON.stringify(payload),
 						success: function (response) {
 							$('#pageLoader').hide();
+							
 							$('#updateSubmitBtn').prop('disabled', false).text('Submit');
-							//Swal.fire('Success', response, 'success').
-								Swal.fire({
-				title: 'Success',
-				text: 'Kitchen details updated successfully!!',
-				icon: 'success',
-				allowOutsideClick: false,
-				allowEscapeKey: false,
-				allowEnterKey: false,
-				showConfirmButton: true
-			})
 							
+							if(response.status === 'OK'){
 							
-							.then(() => {
+							//Swal.fire('Success', response, 'success').
+								Swal.fire({
+								title: 'Success',
+								text:response.message,
+								icon: 'success',
+								allowOutsideClick: false,
+								allowEscapeKey: false,
+								allowEnterKey: false,
+								showConfirmButton: true
+							}).then(() => {
 								$('#editKitchenModal').modal('hide');
 								location.reload();
 							});
+							}
+							else{
+								Swal.fire({
+									title: 'Error',
+									text:response.message,
+									icon: 'error',
+									allowOutsideClick: false,
+									allowEscapeKey: false,
+									allowEnterKey: false,
+									showConfirmButton: true
+								})
+							}
 						},
 						error: function (xhr) {
 							$('#pageLoader').hide();
-							$('#updateSubmitBtn').prop('disabled', false).text('Submit');
-							//Swal.fire('Error', xhr.responseText || 'Failed to update.', 'error');
+							$('#updateSubmitBtn').prop('disabled', false).text('Submit');						
 							Swal.fire({
 								title: 'Error',
 								text: xhr.responseText || 'Failed to update.',
@@ -887,9 +1217,32 @@
 								showConfirmButton: true
 							});
 						}
-					});
+					}); 
 				}
 			});
+			
+			let kitchenContainer = document.getElementById('kitchenFormContainer');
+
+			let observer = new MutationObserver(function (mutations) {
+				mutations.forEach(function (mutation) {
+					if (mutation.attributeName === "style") {
+						const display = window.getComputedStyle(kitchenContainer).display;
+						if (display === "block") {
+							if ($.fn.DataTable.isDataTable('#CompletedCPSDatatable')) {
+								let questionDatatable = $('#CompletedCPSDatatable').DataTable();
+								questionDatatable.columns.adjust().draw();
+							}
+						}
+					}
+				});
+			});
+
+			// Start observing for style changes
+			observer.observe(kitchenContainer, {
+				attributes: true,
+				attributeFilter: ['style']
+			});	
+			
 		</script>
 
 </body>
diff --git a/src/main/resources/templates/modules/school/otherdetails.html b/src/main/resources/templates/modules/school/otherdetails.html
index 78aff73..1f758bf 100644
--- a/src/main/resources/templates/modules/school/otherdetails.html
+++ b/src/main/resources/templates/modules/school/otherdetails.html
@@ -58,10 +58,13 @@
 					<!-- Card 1: School Information -->
 					<div class="col-md-12">
 						<div class="card">
-							<div class="card-header" style="background-color: #404E67; color: white;">
-								School Information
+							<div class="card-header d-flex justify-content-between align-items-center" style="background-color: #404E67; color: white;">
+							    <span>School Information</span>
+							    <button id="studentRegisterBtn" class="btn btn-light btn-sm text-dark">
+							        Student Registration
+							    </button>
 							</div>
-							<table class="table" id="schoolInfoTable">
+							<table class="table" id="schoolInfoTable" >
 								<!-- Table rows will be dynamically injected -->
 							</table>
 						</div>
@@ -146,6 +149,9 @@
 					<div id="kitchenDetailsSection" style="display: none;">
 						Loading kitchen details...</div>
 
+					<div id="studentRegistrationSection" style="display: none;padding-left: 0px;">
+					    <!-- Content will be loaded here -->Loading Student Register details...
+					</div>
 
 
 
@@ -163,7 +169,7 @@
 									<table class="table table-bordered">
 										<tbody>
 											<tr>
-												<td><b> Site Area (Acre)</b></td>
+												<td><b> Site Area (In Sq. ft)</b></td>
 												<td id="ro_land_area"></td>
 												<td><b> Built-up Area (Sq. ft)</b></td>
 												<td id="ro_buildup_area"></td>
@@ -199,12 +205,12 @@
 								<form id="schoolDetailsForm">
 									<div class="row" style="padding: 15px;">
 										<div class="col-md-6 form-group">
-											<label>Approx Site Area of the School (In Acre) *</label>
+											<label>Approx Site Area of the School (In Sq. ft) <span class="text-danger">*</span></label>
 											<input type="text" id="land_area" class="form-control"
 												placeholder="Enter in Acre" required />
 										</div>
 										<div class="col-md-6 form-group">
-											<label> Approx Built Up Area of the School (In Sq. ft) *</label>
+											<label> Approx Built Up Area of the School (In Sq. ft) <span class="text-danger">*</span></label>
 											<input type="text" id="buildup_area" class="form-control"
 												placeholder="Enter in Sq. ft" required />
 										</div>
@@ -213,14 +219,15 @@
 									<div class="card-header"><b>Compound & Name Board</b></div>
 									<div class="row" style="padding: 15px;">
 										<div class="col-md-6 form-group">
-											<label>Presence of Compound Wall *</label>
+											<label>Presence of Compound Wall <span class="text-danger">*</span></label>
 											<div class="radio-group">
-												<input type="radio" name="compoundWall" value="Yes"> Yes
-												<input type="radio" name="compoundWall" value="No"> No
+												<input type="radio" name="compoundWall" value="1"> Yes
+												<input type="radio" name="compoundWall" value="0"> No
+												<input type="radio" name="compoundWall" value="2">No space
 											</div>
 										</div>
 										<div class="col-md-6 form-group">
-											<label>Presence of School Name Board (New Board) *</label>
+											<label>Presence of School Name Board (New Board) <span class="text-danger">*</span></label>
 											<div class="radio-group">
 												<input type="radio" name="nameBoard" value="Yes"> Yes
 												<input type="radio" name="nameBoard" value="No"> No
@@ -231,21 +238,21 @@
 									<div class="card-header"><b>Electrical</b></div>
 									<div class="row" style="padding: 15px;">
 										<div class="col-md-4 form-group">
-											<label>Is PA System Available? *</label>
+											<label>Is PA System Available? <span class="text-danger">*</span></label>
 											<div class="radio-group">
 												<input type="radio" name="paSystem" value="Yes"> Yes
 												<input type="radio" name="paSystem" value="No"> No
 											</div>
 										</div>
 										<div class="col-md-4 form-group">
-											<label>Is Electric Bell Available? *</label>
+											<label>Is Electric Bell Available? <span class="text-danger">*</span></label>
 											<div class="radio-group">
 												<input type="radio" name="electricBell" value="Yes"> Yes
 												<input type="radio" name="electricBell" value="No"> No
 											</div>
 										</div>
 										<div class="col-md-4 form-group">
-											<label>Is Generator Set Available? *</label>
+											<label>Is Generator Set Available? <span class="text-danger">*</span></label>
 											<div class="radio-group">
 												<input type="radio" name="generatorSet" value="Yes"> Yes
 												<input type="radio" name="generatorSet" value="No"> No
@@ -265,8 +272,9 @@
 					</div>
 
 				</div>
-				<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
+				
 			</div>
+			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
 		</div>
 
 		<!-- Form -->
@@ -287,27 +295,28 @@
 							<form id="updateOtherDetailsForm">
 								<div class="row mb-3">
 									<div class="col-md-6">
-										<label> Approx Site Area of the School (In Acre) *</label>
+										<label> Approx Site Area of the School (In Sq. ft) <span class="text-danger">*</span></label>
 										<input type="text" id="modal_land_area" class="form-control"
 											placeholder="Enter in Acres" required />
 									</div>
 									<div class="col-md-6">
 										<label> Approx Built Up Area of the School (In Sq. ft)
-											*</label>
+											<span class="text-danger">*</span></label>
 										<input type="text" id="modal_buildup_area" class="form-control"
 											placeholder="Enter in Sq. ft" required />
 									</div>
 								</div>
 								<div class="row mb-3">
 									<div class="col-md-6">
-										<label>Presence of Compound Wall *</label>
+										<label>Presence of Compound Wall <span class="text-danger">*</span></label>
 										<div>
 											<input type="radio" name="modalcompoundWall" value="1"> Yes
 											<input type="radio" name="modalcompoundWall" value="0"> No
+											<input type="radio" name="modalcompoundWall" value="2"> No space
 										</div>
 									</div>
 									<div class="col-md-6">
-										<label>Presence of School Name Board (New Board)* </label>
+										<label>Presence of School Name Board (New Board)<span class="text-danger">*</span> </label>
 										<div>
 											<input type="radio" name="modalnameBoard" value="1"> Yes
 											<input type="radio" name="modalnameBoard" value="0">
@@ -317,7 +326,7 @@
 								</div>
 								<div class="row mb-3">
 									<div class="col-md-4">
-										<label>Is PA System Available? *</label>
+										<label>Is PA System Available? <span class="text-danger">*</span></label>
 										<div>
 											<input type="radio" name="modalpaSystem" value="1">
 											Yes
@@ -326,14 +335,14 @@
 										</div>
 									</div>
 									<div class="col-md-4">
-										<label>Is Electric Bell Available? *</label>
+										<label>Is Electric Bell Available? <span class="text-danger">*</span></label>
 										<div>
 											<input type="radio" name="modalelectricBell" value="1"> Yes
 											<input type="radio" name="modalelectricBell" value="0"> No
 										</div>
 									</div>
 									<div class="col-md-4">
-										<label>Is Generator Set Available? *</label>
+										<label>Is Generator Set Available? <span class="text-danger">*</span></label>
 										<div>
 											<input type="radio" name="modalgeneratorSet" value="1"> Yes
 											<input type="radio" name="modalgeneratorSet" value="0"> No
@@ -585,6 +594,19 @@
 					$('#itAssetsContent').html('<p>Loading Asset Room List...</p>');
 					loadData('/gcc/school/roomassets', '#itAssetsContent');
 				});
+				
+				$(document).on('click', '#studentRegisterBtn', function (e) {
+				    e.preventDefault();
+
+				    // Hide all other content sections
+				    $('#otherDetailsSection, #staffDetailsSection, #buildingDetailsSection, #playgroundDetailsSection, #drinkingwaterDetailsSection, #toiletsDetailsSection, #itassestsDetailsSection, #kitchenDetailsSection, #studentRegistrationSection').hide();
+
+				    document.getElementById("myTab").style.display = "none";
+				    document.getElementById("studentRegisterBtn").style.display = "none";
+				    // Show and load the Student Registration section
+				    $('#studentRegistrationSection').show().html('<p>Loading Student Registration...</p>');
+				    loadData('/gcc/school/studentregistration', '#studentRegistrationSection');
+				});
 
 
 				// 🔁 Delegate Click Event for Building Sub-tabs
@@ -735,7 +757,8 @@
 				let formData = {
 					land_area: parseFloat(landArea),
 					buildup_area: parseFloat(buildupArea),
-					is_compound: isCompound ,
+					//is_compound: isCompound ,
+					is_compound: parseInt(isCompound),
 					is_nameboard: isNameboard,
 					is_pasystem: isPasystem, 
 					is_bell: isBell, 
@@ -748,7 +771,7 @@
 					type: 'POST',
 					url: '/gcc/api/gccschool/schoolproperty/saveSchoolBuildupArea',
 					data: $.param(formData), // Serialize object to x-www-form-urlencoded
-					success: function (data) {
+					/*success: function (data) {
 						$('#pageLoader').hide();
 						Swal.fire({
 							title: 'Success!',
@@ -761,7 +784,24 @@
 						}).then(() => {
 							window.location.reload();
 						});
+					},*/
+					success: function (data) {
+					    $('#pageLoader').hide();
+					    Swal.fire({
+					        icon: data.includes("already") ? 'info' : 'success',
+					        title: data.includes("already") ? 'Information' : 'Success',
+					        text: data,
+					        allowOutsideClick: false,
+					        allowEscapeKey: false,
+					        allowEnterKey: false,
+					        confirmButtonText: 'OK'
+					    }).then(() => {
+					        
+					            window.location.reload();
+					        
+					    });
 					},
+
 					error: function (xhr, status, error) {
 						console.error('AJAX Error:', error);
 						$('#pageLoader').hide();
@@ -809,7 +849,9 @@
 								// Fill read-only
 								$('#ro_land_area').text(data.land_area || '');
 								$('#ro_buildup_area').text(data.buildup_area || '');
-								$('#ro_compoundWall').text(data.is_compound ? 'Yes' : 'No');
+								//$('#ro_compoundWall').text(data.is_compound ? 'Yes' : 'No');
+								let compoundMap = { 0: 'No', 1: 'Yes', 2: 'No space' };
+								$('#ro_compoundWall').text(compoundMap[data.is_compound] || '');
 								$('#ro_nameBoard').text(data.is_nameboard ? 'Yes' : 'No');
 								$('#ro_paSystem').text(data.is_pasystem ? 'Yes' : 'No');
 								$('#ro_electricBell').text(data.is_bell ? 'Yes' : 'No');
@@ -857,13 +899,9 @@
 								$('#modal_buildup_area').val(data.buildup_area );
 								
 								
-
-
-
-
-								
 								//$('#buildup_area').val(data.buildup_area);
-								$('input[name="modalcompoundWall"][value="' + (data.is_compound ? '1' : '0') + '"]').prop('checked', true);
+								//$('input[name="modalcompoundWall"][value="' + (data.is_compound ? '1' : '0') + '"]').prop('checked', true);
+								$('input[name="modalcompoundWall"][value="' + data.is_compound + '"]').prop('checked', true);
 								$('input[name="modalnameBoard"][value="' + (data.is_nameboard ? '1' : '0') + '"]').prop('checked', true);
 								$('input[name="modalpaSystem"][value="' + (data.is_pasystem ? '1' : '0') + '"]').prop('checked', true);
 								$('input[name="modalelectricBell"][value="' + (data.is_bell ? '1' : '0') + '"]').prop('checked', true);
@@ -913,7 +951,8 @@
 						const formData = {
 							land_area,
 							buildup_area,
-							is_compound,
+							//is_compound,
+							 is_compound: parseInt(is_compound),
 							is_nameboard,
 							is_pasystem,
 							is_bell,
diff --git a/src/main/resources/templates/modules/school/playground.html b/src/main/resources/templates/modules/school/playground.html
index 7afd4f3..d12fed1 100644
--- a/src/main/resources/templates/modules/school/playground.html
+++ b/src/main/resources/templates/modules/school/playground.html
@@ -99,6 +99,9 @@
 
 <body>
 	<div class="container mt-4">
+				<header th:replace="~{fragments/modules/base/header :: header}"></header>
+				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
+	
 		<form id="playgroundForm">
 			<div class="card p-3">
 				<div class="card-header">
@@ -229,6 +232,8 @@
 	    </div>
 	  </div>
 	</div>
+	<script th:replace="~{fragments/modules/base/script :: script}"></script>
+	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
 
 	<script>
 		$(document).ready(function () {
@@ -658,7 +663,7 @@
 					method: 'POST',
 					contentType: 'application/json',
 					data: JSON.stringify(payload),
-					success: function (response) {
+				/*	success: function (response) {
 						Swal.fire({
 							title: 'Success',
 							text:  'Playground saved successfully!',
@@ -668,7 +673,33 @@
 							allowEnterKey: false,
 							showConfirmButton: true
 						}).then(() => location.reload());
+					},*/
+					success: function (response) {
+						let title, icon;
+						if (response.status === "OK") {
+							title = "Success";
+							icon = "success";
+						} else if (response.status === "SKIPPED") {
+							title = "Notice";
+							icon = "info";
+						} else {
+							title = "Error";
+							icon = "error";
+						}
+
+						Swal.fire({
+							title: title,
+							text: response.message,
+							icon: icon,
+							allowOutsideClick: false,
+							allowEscapeKey: false,
+							allowEnterKey: false,
+							showConfirmButton: true
+						}).then(() => location.reload());
 					},
+
+					
+
 					error: function (xhr) {
 						console.error("Error:", xhr);
 						Swal.fire({
diff --git a/src/main/resources/templates/modules/school/reportfolder/aeoallschools.html b/src/main/resources/templates/modules/school/reportfolder/aeoallschools.html
new file mode 100644
index 0000000..943863f
--- /dev/null
+++ b/src/main/resources/templates/modules/school/reportfolder/aeoallschools.html
@@ -0,0 +1,646 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head th:replace="~{fragments/modules/base/head :: head}">
+
+</head>
+<style>
+#DetailsModal .modal-body {
+			                max-height: 80vh;  /* Limit the height to 70% of the viewport */
+			                overflow-y: auto;  /* Enable vertical scrolling */
+			            }
+</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>Schools Reports</h5>
+										<span>Reports based on Student Enrollment of all or specific AEO</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">School</li>
+										<li class="breadcrumb-item" aria-current="page">Student Enroll Report</li>
+										<li class="breadcrumb-item active" aria-current="page">AEO School wise</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="aeodropdown" style="font-size: medium;">Select AEO:</label>
+								            <select id="aeodropdown" class="form-control">
+								            <option value="">All</option>
+								               
+											</select>
+										</div>
+																																																			
+										
+										</div>
+										
+									
+									
+									<!-- <div class="row mt-4">
+										<div class="col-12 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="reset">Reset</button>
+										</div>
+									</div> -->
+									
+								</div>
+							</div>
+						</div>
+					</div>
+			
+					
+					<div class="row mt-4">
+									<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">UDISE code</th>
+																<th class="text-center" style="width: 100px;">AEO</th>
+																<th class="text-center">Zone</th>
+																<th class="text-center">Division</th>
+																<th class="text-center">School Name</th>
+																<th class="text-center">HM Name</th>
+																<th class="text-center">HM Mobile no</th>																
+																<th class="text-center">Total Students</th>															
+																<th class="text-center">Enrolled Students</th>	
+																<th class="text-center">Pending Students</th>														
+															</tr>
+														</thead>
+														<tbody>
+	
+														</tbody>
+													</table>
+												</div>
+										</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>
+
+			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
+		</div>
+	</div>
+
+
+<div class="modal fade" id="DetailsModal" tabindex="-1" aria-labelledby="DetailsLabel" aria-hidden="true">
+	    <div class="modal-dialog modal-xl">
+	        <div class="modal-content">
+	            <div class="modal-header">
+	                <h5 class="modal-title" id="DeatilsModalTitle">Details</h5>
+	                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+			                    <span aria-hidden="true">&times;</span>
+			                </button>
+	            </div>
+	            <div class="modal-body">
+	                
+	                <table id="DetailsDatatable" class="table table-striped table-bordered table-hover dataTable"
+					role="grid">
+	                   <thead class="thead-dark">
+				        <tr role="row">
+				            <th class="text-center">S.no</th>
+				            <th class="text-center">Reg Date</th>
+				            <th class="text-center">Student Name</th>
+				            <th class="text-center">Class</th>
+				            <th class="text-center">EMIS no</th>				            				            				            
+				            
+				        </tr>			        
+				        </thead>
+				        <tbody>
+				
+				
+				        </tbody>
+	                </table>
+	                
+	            </div>
+	        </div>
+	    </div>
+	</div>
+
+
+
+	<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.addEventListener("DOMContentLoaded", function () {
+		
+		 const urlParams = new URLSearchParams(window.location.search);
+		 const aoeParam = urlParams.get('aoe');
+		 console.log("Transfer aeo="+aoeParam);
+		
+		//fetchAEOStudentData([]);
+	    
+	    let aeoDropdown = document.getElementById('aeodropdown');
+	    	    
+	    fetch('/gcc/api/gccschool/report/getAEOList') 
+	        .then(response => response.json())
+	        .then(data => {
+	            // Clear existing options
+	            aeoDropdown.innerHTML = `<option value="">All</option>`;
+
+	            let matchedValue = null;
+	            
+	            // Add options from the API response
+	            data.data.forEach(aeo => {
+	            	
+	            	// Check if aoeParam matches aeo.aeo_num
+	                if (aoeParam && aeo.aeo_num === aoeParam) {
+	                    matchedValue = aeo.udise;
+	                    aeoDropdown.innerHTML += `<option value="${aeo.udise}" selected>${aeo.aeo_num}</option>`;
+	                } else {
+	                    aeoDropdown.innerHTML += `<option value="${aeo.udise}">${aeo.aeo_num}</option>`;
+	                }
+	            	
+	            });
+	            
+	         	// Trigger change event if a match was found
+	            if (matchedValue) {
+	                aeoDropdown.dispatchEvent(new Event('change'));
+	            } else {
+	                fetchAEOStudentData([]); // fallback if no match or no param
+	            }
+	         	
+	        })
+	        .catch(error => {
+	            console.error('Error fetching in AEO List:', error);
+	        });
+	    
+	    document.getElementById('aeodropdown').addEventListener('change', function (e) {
+  	 	    let aeovalue = this.value; // single selection
+
+  	 	    if (!aeovalue) {
+  	 	    	fetchAEOStudentData([]);
+  	 	    	return;
+  	 	    }
+
+  	 	    // If selected, call fetchAEOStudentData with selected value
+  	 	    fetchAEOStudentData([aeovalue]); // wrap in array if your method expects array
+  	 	});
+	    
+	    
+	});
+	
+	 $(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: true,
+             responsive: false,
+             searching: true,
+             select: false,
+             processing: false
+         });
+     	   
+  	   
+  	 	/* document.getElementById('resetBtn').addEventListener('click', function () {
+      	event.preventDefault();
+      	
+      		location.reload();
+      	
+      	}); */
+  	 	
+/*   	 	document.getElementById('searchBtn').addEventListener('click', function (e) {
+  	 		
+  	 		let aeoDropdown = document.getElementById('aeodropdown');
+	
+  	 		
+  		  
+  		    let aeovalue = Array.from(aeoDropdown.selectedOptions).map(opt => opt.value);
+  		  	    	         	   
+    	   	console.log("aeovalue: ",aeovalue);
+
+    	   
+    	   if (!aeovalue || aeovalue.length === 0) {
+    	        Swal.fire({
+    	            icon: 'info',
+    	            title: 'Info',
+    	            text: 'Please Select AEO',
+    	            showConfirmButton: true,
+    	            timer: 3000
+    	        });
+    	        e.preventDefault(); 
+    	        return; 
+    	    }
+    	   
+    	   fetchAEOStudentData(aeovalue);  	   
+    	   
+  	 	}); */
+  	 	
+  	// Handle onchange of the dropdown
+  	 	
+      	$('#ReportDatatable tbody').off('click').on('click', 'td .clickable-students', function () {
+      	    let udise = $(this).data('udise');
+      	  	let schname = $(this).data('schname');
+      	  
+      	    console.log("Clicked UDISE:", udise,"school=",schname);
+
+      	  openRegisteredDetails(udise,schname); 
+      	});
+  	 	
+     	
+     });
+	 
+	 function openRegisteredDetails(udise,schname){
+		 
+		 $('#pageLoader').show();
+		 
+		 $.ajax({
+			    url: '/gcc/api/gccschool/report/getRegisteredStud',
+			    method: 'GET',
+			    data: {
+			    	udise: udise			        
+			    },
+			    success: function (response) {
+
+			    	$('#pageLoader').hide();
+			    	console.log("Details:", response);
+			    	if(response.Message==="Success"){
+			        if (Array.isArray(response.Data) && response.Data.length > 0){
+			        	
+			        	let table = $('#DetailsDatatable').DataTable({
+         	            	 destroy: true,
+        	                searching: true,
+        	                autoWidth: true,           	                
+        	                paging: true,
+        	                info: true,
+         	                data: response.Data,       	             	
+         	                columns: [
+         	                	{ 
+          	                        data: null, 
+          	                        render: (data, type, row, meta) => meta.row + 1, 
+          	                        className: 'text-center' 
+          	                    },
+          	                  {
+          	                      data: 'cDate',
+          	                      render: function (data, type, row) {
+          	                        if (!data) return '-';
+
+          	                        const date = new Date(data);
+          	                        const day = String(date.getDate()).padStart(2, '0');
+          	                        const month = String(date.getMonth() + 1).padStart(2, '0');
+          	                        const year = date.getFullYear();
+          	                        return `${day}/${month}/${year}`;
+          	                      },
+          	                      className: 'text-center'
+          	                    },
+			                    { data: 'student_name' ,className: 'text-center'},
+			                    { data: 'std' ,className: 'text-center'}, 
+			                    { data: 'emis_no' ,className: 'text-center'}
+       	                    
+         	                              	                      
+         	                ],
+         	                dom: 'Bfrtip',
+         	                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'
+	      		                  }
+	      		              ],
+	      		             columnDefs: [
+	      		                { targets: 'no-sort', orderable: false }
+	      		            ],
+	      		            lengthMenu: [
+	      		                [50, 100, 200, 500, -1],
+	      		                ['50 rows', '100 rows', '200 rows', 'Show all']
+	      		            ],
+	      		         scrollY: '50vh',
+	      		            scrollX: false,   	      		            
+	      		       		responsive: false,
+	                		searching: true
+	      		            });
+			        	
+			        	
+			        	
+			        	
+			        	$('#DeatilsModalTitle').text(schname +' Students Details');
+			        	$('#DetailsModal').modal('show');
+			        	$('#DetailsModal').on('shown.bs.modal', function () {
+			        	    $.fn.dataTable.tables({ visible: true, api: true }).columns.adjust();
+			        	});
+			        }
+			    }
+			        else if (response.Message === "Error") {
+			        	$('#pageLoader').hide();
+			      		//alert("No data available.");
+			        	Swal.fire({
+			 	            icon: 'error',
+			 	            title: 'Error',
+			 	            text: response.Error,
+			 	            showConfirmButton: true,
+			 	            timer: 3000
+			 	        });
+			        	
+		     	         
+			        } 
+			        
+			        else {
+			        	$('#pageLoader').hide();
+			            //alert("Error: " + response.message);
+			        	Swal.fire({
+			 	            icon: 'error',
+			 	            title: 'Error',
+			 	            text: 'Error',
+			 	            showConfirmButton: true,
+			 	            timer: 3000
+			 	        });
+		      	    	
+		      	    	 
+		     	        
+			        }
+			        
+			    },
+			    error: function (xhr, status, error) {
+			    	$('#pageLoader').hide();
+			        //alert("Request failed: " + error);
+			    	Swal.fire({
+		 	            icon: 'error',
+		 	            title: 'Error',
+		 	            text: error,
+		 	            showConfirmButton: true,
+		 	            timer: 3000
+		 	        });
+		  	    	
+		  	    	 
+		 	        
+			    }
+			});
+	 }
+	 
+	 function fetchAEOStudentData(aeovalue)
+	 {
+		 let url = `/gcc/api/gccschool/report/getAEOStudentData`;
+		    
+		 if (aeovalue.length > 0) {
+		        const params = new URLSearchParams();
+		        aeovalue.forEach(val => {
+		            console.log("Appending udise:", val);
+		            params.append("udise", val);
+		        });
+		        url += `?${params.toString()}`;
+		    } else {
+		        // Explicitly send empty udise
+		        url += `?udise=`;
+		    }
+  	   
+  	   $('#pageLoader').show();
+  	   $.ajax({
+             type: "GET",
+             url: url,
+             contentType: "application/json",
+             success: function (response) {
+          	    console.log("API Response:", response);
+          	    $('#pageLoader').hide();
+          	    if (response.Message === "Success") {
+          	        console.log("Details Array:", response.data);
+          	        // Ensure details is an array and has at least one entry
+          	        if (Array.isArray(response.data) && response.data.length > 0) {
+          	        	 let scrollHeight = response.data.length <= 50 ? 'auto' : '80vh';
+          	        	
+          	            let table = $('#ReportDatatable').DataTable({
+          	            	 destroy: true,
+         	                searching: true,
+         	                autoWidth: true,           	                
+         	                paging: true,
+         	                info: true,
+          	                data: response.data,            	             	
+          	                columns: [
+          	                    { 
+          	                        data: null, 
+          	                        render: (data, type, row, meta) => meta.row + 1, 
+          	                        className: 'text-center' 
+          	                    },
+          	                  	{ data: 'udise', defaultContent: '-', className: 'text-center' },
+          	                    { data: 'aeo_num', defaultContent: '-', className: 'text-center' },
+          	                  	{ data: 'zone', defaultContent: '-', className: 'text-center' },
+          	                	{ data: 'division', defaultContent: '-', className: 'text-center' },
+          	                  	{ data: 'school_name', defaultContent: '-', className: 'text-center' },
+          	                	{ data: 'hm_name', defaultContent: '-', className: 'text-center' },
+          	              		{ data: 'hm_mobile', defaultContent: '-', className: 'text-center' },          	                    
+          	                    { data: 'total_students', defaultContent: '-', className: 'text-center' },
+          	                    
+          	                  {
+          	                      data: 'students_registered',
+          	                      defaultContent: '-',
+          	                      className: 'text-center',
+          	                      render: function (data, type, row) {
+          	                        if (parseInt(data) > 0) {
+          	                          return `<span class="clickable-students text-primary" style="cursor: pointer; text-decoration: underline;" data-udise="${row.udise}"data-schname="${row.school_name}">${data}</span>`;
+          	                        } else {
+          	                          return data;
+          	                        }
+          	                      }
+          	                    },
+          	                    
+          	                  	{ data: 'pending', defaultContent: '-', className: 'text-center' }
+          	                    
+          	                              	                      
+          	                ],
+          	                dom: 'Bfrtip',
+          	                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'
+ 	      		                  }
+ 	      		              ],
+ 	      		             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: false,
+	                		searching: true
+ 	      		            });
+          	        }
+          	        
+          	    }
+          	    else if (response.Message === "No Data") {
+      	        	$('#pageLoader').hide();
+      	            Swal.fire({
+      	                icon: 'warning',
+      	                title: response.data,
+      	                text: 'No data available for the selected criteria.'
+      	            });
+      	        }           	    
+          	    else {
+          	    	$('#pageLoader').hide();
+          	        Swal.fire({
+          	            icon: 'error',
+          	            title: 'Error',
+          	            text: response.message || 'Something went wrong!'
+          	        });
+          	    }
+          	},
+
+             error: function (error) {
+             	$('#pageLoader').hide();
+             	Swal.fire({
+  	            icon: 'error',
+  	            title: 'Error',
+  	            text: response.message || 'Something went wrong!'
+  	        });
+             }
+         });
+	 }
+	
+	</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/school/reportfolder/aeolist.html b/src/main/resources/templates/modules/school/reportfolder/aeolist.html
new file mode 100644
index 0000000..ff4b824
--- /dev/null
+++ b/src/main/resources/templates/modules/school/reportfolder/aeolist.html
@@ -0,0 +1,316 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head th:replace="~{fragments/modules/base/head :: head}">
+
+</head>
+<style>
+    .clickable-link {
+        color: blue;
+        text-decoration: underline;
+        cursor: pointer;
+    }
+</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>Schools Reports</h5>
+										<span>Reports based on Student Enrollment in AEO wise</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">School</li>
+										<li class="breadcrumb-item" aria-current="page">Student Enroll Report</li>
+										<li class="breadcrumb-item active" aria-current="page">AEO Wise</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>
+							</div>
+						</div>
+					</div> -->
+			
+					
+					<div class="row mt-4">
+									<div class="col-md-12">
+										<div class="card">
+										<div class="card-header">
+											<span style="font-size: medium;font-weight: bold;">AEO 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">S.No</th>
+																<th class="text-center">AEO</th>
+																<th class="text-center">Total Schools</th>
+																<th class="text-center">Total Students</th>															
+																<th class="text-center">Enrolled Students</th>	
+																<th class="text-center">Pending Students</th>														
+															</tr>
+														</thead>
+														<tbody>
+															
+														</tbody>
+													</table>
+												</div>
+										</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>
+
+			<footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
+		</div>
+	</div>
+
+
+
+
+	<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() {
+		 
+		 fetchAEOStudentData();
+
+	      	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: false,            
+	             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: false,
+	             autoWidth: false,
+	             responsive: false,
+	             searching: true,
+	             select: false,
+	             processing: false
+	         });
+	      	
+	      	$('#ReportDatatable').on('click', '.clickable-link', function () {
+	      		const aoeName = $(this).text().trim();
+	      	    window.location.href = `/gcc/school/aeoschoolentry/aeoallschools?aoe=${aoeName}`;
+	      	    
+	      	});
+	     	   	     	
+	     });
+		 
+		 
+	 
+	 function fetchAEOStudentData()
+	 {
+		  	   
+  	   $('#pageLoader').show();
+  	   $.ajax({
+             type: "GET",
+             url: "/gcc/api/gccschool/report/getAEOStudentsCount" ,
+             contentType: "application/json",
+             success: function (response) {
+          	    console.log("API Response:", response);
+          	    $('#pageLoader').hide();
+          	    if (response.Message === "Success") {
+          	        console.log("Details Array:", response.data);
+          	        // Ensure details is an array and has at least one entry
+          	        if (Array.isArray(response.data) && response.data.length > 0) {
+          	        	 let scrollHeight = response.data.length <= 50 ? 'auto' : '80vh';
+          	        	
+          	            let table = $('#ReportDatatable').DataTable({
+          	                destroy: true,
+          	              	fixedHeader: false,
+          	                searching: true,
+          	                autoWidth: true,          	                
+          	                paging: true,
+          	                info: true,
+          	                data: response.data,            	             	
+          	                columns: [
+          	                    { 
+          	                        data: null, 
+          	                        render: (data, type, row, meta) => meta.row + 1, 
+          	                        className: 'text-center' 
+          	                    },
+          	                  {
+          	                      data: 'aoe',
+          	                      defaultContent: '-',
+          	                      className: 'text-center',
+          	                      render: function (data, type, row, meta) {
+          	                          if (!data) return '-';
+          	                          return `<span class="clickable-link">${data}</span>`;
+          	                      }
+          	                  },
+          	                    { data: 'school_count', defaultContent: '-', className: 'text-center' },
+          	                    { data: 'total_students', defaultContent: '-', className: 'text-center' },
+          	                    { data: 'student_registered', defaultContent: '-', className: 'text-center' },
+          	                  	{ data: 'pending', defaultContent: '-', className: 'text-center' }
+          	                             	                    
+          	                      
+          	                ],
+          	                dom: 'Bfrtip',
+          	                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'
+ 	      		                  }
+ 	      		              ],
+ 	      		             columnDefs: [
+ 	      		                { targets: 'no-sort', orderable: false }
+ 	      		            ],
+ 	      		            lengthMenu: [
+ 	      		                [50, 100, 200, 500, -1],
+ 	      		                ['50 rows', '100 rows', '200 rows', 'Show all']
+ 	      		            ],
+ 	      		            scrollY: scrollHeight,
+ 	      		            scrollX: false,   	      		            
+ 	      		       		responsive: false,
+ 	                		searching: true
+ 	      		            });
+          	        }
+          	        
+          	    }
+          	    else if (response.Message === "No Data") {
+      	        	$('#pageLoader').hide();
+      	            Swal.fire({
+      	                icon: 'warning',
+      	                title: 'No Data',
+      	                text: 'No data available.'
+      	            });
+      	        }           	    
+          	    else {
+          	    	$('#pageLoader').hide();
+          	        Swal.fire({
+          	            icon: 'error',
+          	            title: 'Error',
+          	            text:'Something went wrong!'
+          	        });
+          	    }
+          	},
+
+             error: function (error) {
+             	$('#pageLoader').hide();
+             	Swal.fire({
+  	            icon: 'error',
+  	            title: 'Error',
+  	            text: 'Something went wrong!'
+  	        });
+             }
+         });
+	 }
+	
+	</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/school/reports.html b/src/main/resources/templates/modules/school/reports.html
index 93a27b0..183aeb5 100644
--- a/src/main/resources/templates/modules/school/reports.html
+++ b/src/main/resources/templates/modules/school/reports.html
@@ -114,7 +114,7 @@
 													<thead class="thead-dark">
 														<tr role="row">
 															<th class="text-center no-sort">S.No</th>
-															<th class="text-center" style="width: 200px;">AEO</th>
+															<th class="text-center" style="width: 100px;">AEO</th>
 															<th class="text-center">Zone</th>
 															<th class="text-center">Ward</th>
 															<th class="text-center">UDISE code</th>
@@ -251,7 +251,7 @@
 	
 	 $(document).ready(function() {
 
-     	var table = $('#ReportDatatable').DataTable({
+/*      	var table = $('#ReportDatatable').DataTable({
              dom: 'Bftip',
              columnDefs: [
                  { targets: 'no-sort', orderable: false }
@@ -261,8 +261,7 @@
                  ['50 rows', '100 rows', '200 rows', 'Show all']
              ],
              scrollY: '80vh',
-             scrollX: true,
-             
+             scrollX: true,            
              buttons: [
                  {
                      extend: 'pageLength',
@@ -300,7 +299,7 @@
              searching: true,
              select: false,
              processing: false
-         });
+         }); */
      	   
   	   
   	 	document.getElementById('resetBtn').addEventListener('click', function () {
@@ -316,16 +315,17 @@
   		    let zoneDropdown = document.getElementById('zonedropdown');
   		    let wardDropdown = document.getElementById('warddropdown');	
   	 		
-     	    let aeovalue= document.getElementById('aeodropdown').value;
-     	 	let zonevalue= document.getElementById('zonedropdown').value;
-     	    let wardvalue= document.getElementById('warddropdown').value;
-     	        	    
-     	   
+  		  // ✅ Extract selected values from a multi-select dropdown as an array
+  		    let aeovalue = Array.from(aeoDropdown.selectedOptions).map(opt => opt.value);
+  		  	//let aeovalue =aeoDropdown.value;
+  	    	let zonevalue = zoneDropdown.value;
+  	    	let wardvalue = wardDropdown.value;
+     	         	   
     	   console.log("aeovalue: ",aeovalue);
     	   console.log("zonevalue: ",zonevalue);
     	   console.log("wardvalue: ",wardvalue);
     	   
-    	   if (!aeovalue) {
+    	   if (!aeovalue || aeovalue.length === 0) {
     	        Swal.fire({
     	            icon: 'info',
     	            title: 'Info',
@@ -336,8 +336,8 @@
     	        e.preventDefault(); 
     	        return; 
     	    }
-    	   const aeovalueArray = aeovalue.split(','); // Split comma-separated values into array
-    	   fetchAEOSchoolData(aeovalueArray, zonevalue, wardvalue);  	   
+    	   
+    	   fetchAEOSchoolData(aeovalue, zonevalue, wardvalue);  	   
     	   
   	 	});
   	 	
@@ -345,10 +345,11 @@
      	
      });
 	 
-	 function fetchAEOSchoolData(aeovalueArray, zonevalue, wardvalue)
+	 function fetchAEOSchoolData(aeovalue, zonevalue, wardvalue)
 	 {
 		 const params = new URLSearchParams();
-  	   aeovalueArray.forEach(val => params.append("udise", val)); // Use 'udiseList' as repeated query parameter
+		aeovalue.forEach(val =>{ console.log("Appending udise:", val);
+			params.append("udise", val)}); // Use 'udiseList' as repeated query parameter
   	   params.append("zone", zonevalue);
   	   params.append("ward", wardvalue);
   	   
@@ -364,10 +365,12 @@
           	        console.log("Details Array:", response.data);
           	        // Ensure details is an array and has at least one entry
           	        if (Array.isArray(response.data) && response.data.length > 0) {
+          	        	 let scrollHeight = response.data.length <= 50 ? 'auto' : '80vh';
+          	        	
           	            let table = $('#ReportDatatable').DataTable({
           	                destroy: true,
           	                searching: true,
-          	                autoWidth: true,           	                
+          	                autoWidth: true,          	                
           	                paging: true,
           	                info: true,
           	                data: response.data,          	              
@@ -433,7 +436,7 @@
  	      		                [50, 100, 200, 500, -1],
  	      		                ['50 rows', '100 rows', '200 rows', 'Show all']
  	      		            ],
- 	      		            scrollY: '80vh',
+ 	      		            scrollY: scrollHeight,
  	      		            scrollX: true,   	      		            
  	      		       		responsive: false,
  	                		searching: true
diff --git a/src/main/resources/templates/modules/school/room.html b/src/main/resources/templates/modules/school/room.html
index 870aef3..11bdb1c 100644
--- a/src/main/resources/templates/modules/school/room.html
+++ b/src/main/resources/templates/modules/school/room.html
@@ -59,6 +59,42 @@
 		overflow-y: auto;
 		min-height: 40vh;
 	}
+	/* Default desktop view */
+/*.responsive-section {
+  margin-left: -256px;
+}*/
+
+/* Wider negative margin if needed */
+/*.responsive-section-wide {
+  margin-left: -281px;
+}*/
+
+/* Mobile responsiveness */
+@media (max-width: 768px) {
+  .responsive-section,
+  .responsive-section-wide {
+    margin-left: 0 !important;
+    padding: 0 10px;
+  }
+
+  .btn.mb-2 {
+    width: 100%;
+    margin-top: 10px;
+  }
+
+  .d-flex.justify-content-between {
+    flex-direction: column;
+    align-items: flex-start;
+  }
+
+  .table {
+    display: block;
+    width: 100%;
+    overflow-x: auto;
+    white-space: nowrap;
+  }
+}
+	
 </style>
 
 <body>
@@ -66,25 +102,26 @@
 		<header th:replace="~{fragments/modules/base/header :: header}"></header>
 		<div class="page-wrap">
 			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="main-content" style="margin-top: 6px;">
+			<div class="main-content" style="margin-top: 6px; padding-left: 0px;">
 				<div class="container">
 					
 					<div class="col-md-12">
-						<div class="d-flex justify-content-between align-items-center">
-							<h4 style="margin-left: -256px;">Rooms</h4>
-							<button type="button" class="btn btn-primary mb-2" id="addRoomBtn"
+						<div class="d-flex justify-content-between align-items-center responsive-section">
+							<!--  <h4 style="margin-left: -256px;">Rooms</h4>-->
+							 <h4 >Rooms</h4>
+							<button type="button" class="btn btn-primary mb-2 add-room-btn" id="addRoomBtn"
 								style="background-color: #0D587B; border: none; border-radius: 6px; padding: 6px 16px;"
 								data-bs-toggle="modal" data-bs-target="#addRoomModal">
 								<i class="bi bi-plus-lg"></i>Add Room
 							</button>
 						</div>
 
-						<hr
-							style="border: 1px solid #ccc; margin-top: 10px; margin-bottom: 20px;      margin-left: -256px;">
+						<hr class="responsive-section"
+							style="border: 1px solid #ccc; margin-top: 10px; margin-bottom: 20px;"    >
 					</div>
 
 					
-					<div class="row mt-4" style="margin-left: -281px;">
+					<div class="row mt-4 responsive-section-wide">
 						<div class="col-md-12">
 							<div class="card">
 								<div class="card-block">
@@ -202,6 +239,13 @@
 							<label class="form-label">Room Type</label> <input type="text" id="viewRoomType"
 								class="form-control" readonly>
 						</div>
+						
+					</div>
+					<div class="row mb-3" id="view_Aun_div" style="display: none;">
+						<div class="col-md-6" >
+							<label class="form-label">Anganwadi Unique Number</label> <input type="text" id="viewAUN"
+								class="form-control" readonly>
+						</div>
 					</div>
 				</div>
 
@@ -227,32 +271,38 @@
 
 					<div class="row mb-3">
 						<div class="col-md-6">
-							<label class="form-label">Room Name</label> <input type="text" id="editRoomName"
+							<label class="form-label">Room Name<span style="color: red;">*</span></label> <input type="text" id="editRoomName"
 								class="form-control"> <input type="hidden" id="editRoomId">
 
 						</div>
 						<div class="col-md-6">
-							<label class="form-label">Building</label> <select id="editBuildingId" class="form-control" disabled>
+							<label class="form-label">Building<span style="color: red;">*</span></label> <select id="editBuildingId" class="form-control" disabled>
 								<option value="">Select Building</option>
 							</select>
 
-
 						</div>
 					</div>
 
 					<div class="row mb-3">
 						<div class="col-md-6">
-							<label class="form-label">Floor</label> <select id="editFloorId" class="form-control">
+							<label class="form-label">Floor<span style="color: red;">*</span></label> <select id="editFloorId" class="form-control">
 								<option value="">Select Floor</option>
 							</select>
 						</div>
 						<div class="col-md-6">
-							<label class="form-label">Room Type</label> <select id="editRoomTypeId"
+							<label class="form-label">Room Type<span style="color: red;">*</span></label> <select id="editRoomTypeId"
 								class="form-control">
 								<option value="">Select Room Type</option>
 							</select>
 						</div>
 					</div>
+					
+					<div class="row mb-3" id="edit_Aun_div" style="display: none;">
+						<div class="col-md-6">
+							<label class="form-label">Anganwadi Unique Number<span style="color: red;">*</span></label>
+							<input type="text" class="form-control" id="editAUN">								
+						</div>						
+					</div>
 				</div>
 
 				<div class="modal-footer">
@@ -296,10 +346,16 @@
 								<option value="">Select Room Type</option>
 							</select>
 						</div>
+						
 						<div class="col-md-6">
 							<label class="form-label">Room Name<span style="color: red;">*</span></label> <input type="text" id="addRoomName"
 								class="form-control">
 						</div>
+						
+						<div id="anganwadiNumberDiv" class="col-md-6 mt-3" style="display: none;">
+							<label class="form-label">Anganwadi Unique Number<span style="color: red;">*</span></label>
+							<input type="text" class="form-control" id="anganwadiUniqueNumber" placeholder="Enter Anganwadi Unique Number">
+						</div>
 
 					</div>
 				</div>
@@ -458,6 +514,39 @@ $(document).ready(function () {
 	loadRoomTypesDropdownForAdd();
 	loadBuildingsDropdownForAdd(schoolId);
 	loadSavedRoomDetails(schoolId);
+	
+	$('#addRoomTypeId').on('change', function () {
+	    const selectedRoomId = $(this).val();
+
+	    if (selectedRoomId === "32") {
+	        $('#anganwadiNumberDiv').show();
+	    } else {
+	        $('#anganwadiNumberDiv').hide();
+	        $('#anganwadiUniqueNumber').val(''); 
+	    }
+	});
+	
+	$('#editRoomTypeId').on('change', function () {
+	    const selectedRoomId2 = $(this).val();
+
+	    if (selectedRoomId2 === "32") {
+	        $('#edit_Aun_div').show();
+	        $('#editAUN').val('');
+	    } else {
+	        $('#edit_Aun_div').hide();
+	        $('#editAUN').val(''); 
+	    }
+	});
+	
+	document.getElementById('anganwadiUniqueNumber').addEventListener('input', function () {
+	    // Keep only alphanumeric characters
+	    this.value = this.value.replace(/[^a-zA-Z0-9]/g, '');
+	});
+	document.getElementById('editAUN').addEventListener('input', function () {
+	    // Keep only alphanumeric characters
+	    this.value = this.value.replace(/[^a-zA-Z0-9]/g, '');
+	});
+	
 });
 
 $(document).on('click', '.view-btn2', function () {
@@ -473,6 +562,15 @@ $(document).on('click', '.view-btn2', function () {
 				$('#viewBuildingName').val(room.building_name || '');
 				$('#viewFloor').val(room.floor || '');
 				$('#viewRoomType').val(room.room_type || '');
+				
+				if(room.room_master_id === 32){
+					$('#viewAUN').val(room.anganwadi_unique_number || '');
+					$('#view_Aun_div').show();
+				}
+				else{
+					$('#view_Aun_div').hide();
+				}
+				
 				$('#viewRoomModal').modal('show');
 			} else {
 				Swal.fire("Error", response.data || "Room data not found", "error");
@@ -501,6 +599,15 @@ $(document).on('click', '.edit-btn2', function () {
 				loadBuildingsDropdown(room.school_id, buildingIdFromAttr);
 				loadFloorDropdown(buildingIdFromAttr, room.floors_id);
 				$('#editRoomTypeId').val(room.room_master_id);
+				
+				if(room.room_master_id === 32){
+					$('#editAUN').val(room.anganwadi_unique_number || '');
+					$('#edit_Aun_div').show();
+				}
+				else{
+					$('#edit_Aun_div').hide();
+				}
+				
 				$('#editRoomModal').modal('show');
 			} else {
 				Swal.fire("Error", response.data || "Room not found", "error");
@@ -513,20 +620,91 @@ $(document).on('click', '.edit-btn2', function () {
 });
 
 $('#saveEditRoom').on('click', function () {
-	const updatedRoom = {
+	
+	let  edit_room_id = $('#editRoomId').val();
+	let  edit_room_num = $('#editRoomName').val();
+	let  edit_building_id = $('#editBuildingId').val();
+	let  edit_floors_id = $('#editFloorId').val();
+	let  edit_room_type= $('#editRoomTypeId').val();
+	let  edit_AnganwadiNumber= $('#editAUN').val();
+	let  edit_school_id= schoolId;
+	
+	if (!edit_floors_id) {
+	    Swal.fire({
+	        icon: 'warning',
+	        title: 'Floor Required',
+	        text: 'Please select a floor .',
+	        allowOutsideClick: false,
+	        allowEscapeKey: false,
+	        allowEnterKey: false,
+	        showConfirmButton: true
+	    });
+	    return;
+	}
+
+	if (!edit_room_type) {
+	    Swal.fire({
+	        icon: 'warning',
+	        title: 'Room Type Required',
+	        text: 'Please select a room type.',
+	        allowOutsideClick: false,
+	        allowEscapeKey: false,
+	        allowEnterKey: false,
+	        showConfirmButton: true
+	    });
+	    return;
+	}
+
+	if (!edit_room_num) {
+	    Swal.fire({
+	        icon: 'warning',
+	        title: 'Room Name Required',
+	        text: 'Please enter a room name .',
+	        allowOutsideClick: false,
+	        allowEscapeKey: false,
+	        allowEnterKey: false,
+	        showConfirmButton: true
+	    });
+	    return;
+	}
+	
+	let rooms = {
 		room_id: $('#editRoomId').val(),
 		room_num: $('#editRoomName').val(),
 		building_id: $('#editBuildingId').val(),
-		floors_id: $('#editFloorId').val() || null,
+		floors_id: $('#editFloorId').val(),
 		room_type: $('#editRoomTypeId').val(),
 		school_id: schoolId
 	};
+	
+	if (edit_room_type === "32") {
+		
+		if(!edit_AnganwadiNumber){
+			 Swal.fire({
+			        icon: 'warning',
+			        title: 'Required',
+			        text: 'Please Enter a Anganwadi Unique Number.',
+			        allowOutsideClick: false,
+			        allowEscapeKey: false,
+			        allowEnterKey: false,
+			        showConfirmButton: true
+			    });
+			    return;
+			
+		}
+		
+		rooms['anganwadiUniqueNumber'] = edit_AnganwadiNumber;
+		rooms['anganwadi_check']=false;
+	}
+	
+	//console.log("hiii");
+	console.log("updatedRoom=:",rooms );
 
-	$.ajax({
+	 $.ajax({
 		url: '/gcc/api/gccschool/buildingasset/editRoom',
 		method: 'POST',
 		contentType: 'application/json',
-		data: JSON.stringify(updatedRoom),
+		data: JSON.stringify(rooms),
 		success: function (response) {
 			if (response === 'Rooms Edited Sucessfully') {
 				$('#editRoomModal').modal('hide');
@@ -541,7 +719,20 @@ $('#saveEditRoom').on('click', function () {
 			    }).then(() => {
 			        loadSavedRoomDetails(schoolId);
 			    });
-			} else {
+			} 			
+			else if (response === 'Duplicate') {
+				
+				Swal.fire({
+					title: "Anganwadi Number Already Exists",
+					text: "Duplicate Anganwadi Number Found for this school",
+					icon: "error",
+					allowOutsideClick: false, 
+                    allowEscapeKey: false, 
+                    allowEnterKey: false, 	                   
+                    showConfirmButton: true
+				});
+			}
+			else {
 			    Swal.fire({
 			        icon: 'error',
 			        title: 'Error',
@@ -564,7 +755,7 @@ $('#saveEditRoom').on('click', function () {
 			        showConfirmButton: true
 			    });
 			}
-	});
+	}); 
 });
 
 $('#saveAddRoom').on('click', function () {
@@ -573,7 +764,9 @@ $('#saveAddRoom').on('click', function () {
 		const floorId = $('#addFloorId').val();
 		const roomType = $('#addRoomTypeId').val();
 		const roomName = $('#addRoomName').val().trim();
-
+		const anganwadiUniqueNumber= $('#anganwadiUniqueNumber').val().trim();
+		
+		
 		if (!buildingId) {
 		    Swal.fire({
 		        icon: 'warning',
@@ -625,35 +818,67 @@ $('#saveAddRoom').on('click', function () {
 		    });
 		    return;
 		}
-	
-	
-	const payload = {
-		room_num: $('#addRoomName').val(),
-		building_id: $('#addBuildingId').val(),
-		floors_id: $('#addFloorId').val(),
-		room_type: $('#addRoomTypeId').val(),
-		school_id: schoolId
-	};
+		
+		let payload = {
+					room_num: $('#addRoomName').val(),
+					building_id: $('#addBuildingId').val(),
+					floors_id: $('#addFloorId').val(),
+					room_type: $('#addRoomTypeId').val(),
+					school_id: schoolId
+				};
+		
+		if (roomType === "32") {
+			
+			if(!anganwadiUniqueNumber){
+				 Swal.fire({
+				        icon: 'warning',
+				        title: 'Required',
+				        text: 'Please Enter a Anganwadi Unique Number.',
+				        allowOutsideClick: false,
+				        allowEscapeKey: false,
+				        allowEnterKey: false,
+				        showConfirmButton: true
+				    });
+				    return;
+				
+			}
+			
+			payload['anganwadiUniqueNumber'] = anganwadiUniqueNumber;
+			payload['anganwadi_check']=false;
+		}
+	 
+	 console.log("Payload to send:", payload);
 
-	$.ajax({
+	 $.ajax({
 		url: '/gcc/api/gccschool/buildingasset/saveRoom',
 		type: 'POST',
 		contentType: 'application/json',
 		data: JSON.stringify(payload),
 		success: function (response) {
-			if (response === 'Rooms Mapped Sucessfully') {
+			if (response === 'Saved sucessfully') {
 				$('#addRoomModal').modal('hide');
 				Swal.fire({
 					title: "Success",
 					text: "Room added successfully",
 					icon: "success",
-					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	                   
+					allowOutsideClick: false, 
+                    allowEscapeKey: false, 
+                    allowEnterKey: false, 	                   
                     showConfirmButton: true
 				}).then(() => {
-					location.reload(); // 🔁 This reloads the page after user confirms the success alert
+					location.reload(); 
 				});}
+			else if (response === 'Duplicate') {				
+				Swal.fire({
+					title: "Anganwadi Number Already Exists",
+					text: "Duplicate Anganwadi Number Found for this school",
+					icon: "error",
+					allowOutsideClick: false, 
+                    allowEscapeKey: false, 
+                    allowEnterKey: false, 	                   
+                    showConfirmButton: true
+				});
+				}
 			else {
 				Swal.fire({
 			        icon: 'error',
@@ -677,7 +902,7 @@ $('#saveAddRoom').on('click', function () {
 		        showConfirmButton: true
 		    });
 		}
-	});
+	}); 
 });
 
 function loadFloorDropdown(buildingId, selectedFloorId = null) {
diff --git a/src/main/resources/templates/modules/school/roomassets.html b/src/main/resources/templates/modules/school/roomassets.html
index d32b810..2d58f8b 100644
--- a/src/main/resources/templates/modules/school/roomassets.html
+++ b/src/main/resources/templates/modules/school/roomassets.html
@@ -18,6 +18,20 @@
     max-height: 500px; 
     overflow-y: auto; 
 }
+.custom-card-wrapper {
+  padding: 0;
+  margin-top: -58px;
+  margin-left: -233px;
+}
+
+@media (max-width: 768px) {
+  .custom-card-wrapper {
+    margin-left: 0;
+    margin-top: 0;
+    padding: 10px;
+  }
+}
+
 </style>
 
 <body>
@@ -30,7 +44,8 @@
 					<div class="container">
 						<!-- Card 2: Other Details -->
 						<div class="col-md-12">
-							<div style="margin-top:-58px;margin-left: -233px;">
+						<div class="custom-card-wrapper">
+						<!--  	<div style="margin-top:-58px;margin-left: -233px;">-->
 								<div class="card-header"><b>Room List</b></div>
 								<div class="card-body">
 									<table id="RoomAssetDatatable"
diff --git a/src/main/resources/templates/modules/school/staffdetails.html b/src/main/resources/templates/modules/school/staffdetails.html
index 648830c..91ef6f2 100644
--- a/src/main/resources/templates/modules/school/staffdetails.html
+++ b/src/main/resources/templates/modules/school/staffdetails.html
@@ -35,7 +35,7 @@
       .form-group {
         margin-top: 15px;
       }
-
+      
       .radio-group {
         display: flex;
         gap: 20px;
@@ -46,6 +46,29 @@
       .btn-gap {
         margin-left: 1rem;
       }
+      .select2-container--default .select2-selection--multiple {
+    padding-right: 30px;
+    min-height: 38px;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    position: relative;
+    background-image: none;
+}
+
+.select2-container--default .select2-selection--multiple::after {
+    content: "";
+    position: absolute;
+    top: 50%;
+    right: 8px;
+    width: 14px;
+    height: 14px;
+    transform: translateY(-50%);
+    background-image: url("data:image/svg+xml;utf8,<svg fill='gray' height='20' viewBox='0 0 24 24' width='20' xmlns='http://www.w3.org/2000/svg'><path d='M7 10l5 5 5-5z'/></svg>");
+    background-repeat: no-repeat;
+    background-size: contain;
+    pointer-events: none;
+}
     </style>
     <!-- jQuery -->
     <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
@@ -54,15 +77,24 @@
     <!-- Bootstrap JS Bundle -->
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
   </head>
+  
+  <style>
+  #staffUpdateModal .modal-body{
+					max-height:70vh;
+					overflow-y:auto; 
+				}
+  </style>
+  
   <body>
-    <div class="wrapper">
-      <header th:replace="~{fragments/modules/base/header :: header}"></header>
-      <div class="page-wrap">
-        <div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-        <div class="card">
-          <div class="main-content" style="background-color: white;">
-            <!-- Container for Read-only Table View -->
-         <div id="staffReadOnlyView" class="container mt-4" style="display: none;    margin-left: -204px;margin-top: 5px;"></div>
+  	<div class="container mt-4">
+  				<header th:replace="~{fragments/modules/base/header :: header}"></header>
+				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
+	
+	
+			<div class="card p-3">
+				
+		
+		<div id="staffReadOnlyView" class="container mt-4" style="display: none;   "></div>
             <!-- Update Button for Staff (if record exists) -->
             <div class="text-center mt-3" id="updateStaffContainer" style="display: none;">
               <button type="button" class="btn btn-primary" id="updateStaffBtn">Update</button>
@@ -72,13 +104,13 @@
               <form id="staffStrengthForm" novalidate>
                 <!-- SG Teachers -->
                 <div class="col-md-12">
-                  <div class="card" style="background-color: lightgrey; padding: 20px; margin-left: -127px; margin-top: -67px;">
+                  <div class="card" style="background-color: lightgrey; padding: 20px;">
                     <div class="card-header">
-                      <b>1. SG Teachers *</b>
+                      <b>1. SG Teachers<span class="text-danger">*</span></b>
                     </div>
                     <div class="row mt-3">
                       <div class="col-md-3">
-                        <label>No of Regu Teachers</label>
+                        <label>No of Regular Teachers</label>
                         <input type="number" class="form-control" name="sgRegTeacher" id="sgRegTeacher" placeholder="Enter Value" required />
                       </div>
                       <div class="col-md-3">
@@ -99,13 +131,13 @@
 
                 <!-- BT Teachers -->
                 <div class="col-md-12">
-                  <div class="card" style="background-color: aliceblue; margin-left: -127px; padding: 20px; margin-top: 10px;">
+                  <div class="card" style="background-color: aliceblue;  padding: 20px; ">
                     <div class="card-header">
-                      <b>2. BT Teachers *</b>
+                      <b>2. BT Teachers <span class="text-danger">*</span></b>
                     </div>
                     <div class="row mt-3">
                       <div class="col-md-3">
-                        <label>No of Regu Teachers</label>
+                        <label>No of Regular Teachers</label>
                         <input type="number" class="form-control" name="btRegTeacher" id="btRegTeacher" placeholder="Enter Value" required />
                       </div>
                       <div class="col-md-3">
@@ -126,13 +158,13 @@
 
                 <!-- PG Teachers -->
                 <div class="col-md-12">
-                  <div class="card" style="background-color: cornsilk; margin-left: -127px; padding: 20px; margin-top: 10px;">
+                  <div class="card" style="background-color: cornsilk; padding: 20px;">
                     <div class="card-header">
-                      <b>3. PG Teachers *</b>
+                      <b>3. PG Teachers<span class="text-danger">*</span></b>
                     </div>
                     <div class="row mt-3">
                       <div class="col-md-3">
-                        <label>No of Regu Teachers</label>
+                        <label>No of Regular Teachers</label>
                         <input type="number" class="form-control" name="pgRegTeacher" id="pgRegTeacher" placeholder="Enter Value" required />
                       </div>
                       <div class="col-md-3">
@@ -151,14 +183,14 @@
                   </div>
                 </div>
                 <div class="col-md-12">
-                 <div class="card mt-3" style="background-color: lavender; padding: 20px; margin-left: -127px;">
+                 <div class="card mt-3" style="background-color: lavender; padding: 20px;">
 
                     <div class="card-header">
-                      <b>4. PET Teachers*</b>
+                      <b>4. PET Teachers<span class="text-danger">*</span></b>
                     </div>
                     <div class="row mt-3">
                       <div class="col-md-3">
-                        <label>No of Regu Teachers</label>
+                        <label>No of Regular Teachers</label>
                         <input type="number" class="form-control" name="petRegTeacher" id="petRegTeacher" placeholder="Enter Value" required />
                       </div>
                       <div class="col-md-3">
@@ -173,19 +205,23 @@
                         <label>No of Grade 2 Teachers</label>
                         <input type="number" class="form-control" name="petGrade2Teacher" id="petGrade2Teacher" placeholder="Enter Value" required />
                       </div>
+                      <div class="col-md-3 pt-3">
+                        <label>No of Part-time Teachers</label>
+                        <input type="number" class="form-control" name="petPtTeacher" id="petPtTeacher" placeholder="Enter Value" required />
+                      </div>
                     </div>
                   </div>
                   </div>
                   
                          <div class="col-md-12">
-                 <div class="card mt-3" style="background-color: honeydew; padding: 20px; margin-left: -127px;">
+                 <div class="card mt-3" style="background-color: honeydew; padding: 20px; ">
 
                     <div class="card-header">
-                      <b>5. kG Teachers*</b>
+                      <b>5. kG Teachers<span class="text-danger">*</span></b>
                     </div>
                     <div class="row mt-3">
                       <div class="col-md-3">
-                        <label>No of Regu Teachers</label>
+                        <label>No of Regular Teachers</label>
                         <input type="number" class="form-control" name="kgRegTeacher" id="kgRegTeacher" placeholder="Enter Value" required />
                       </div>
                       <div class="col-md-3">
@@ -196,12 +232,57 @@
                     </div>
                   </div>
                   </div>
+                  
+                  <div class="col-md-12">
+                 <div class="card mt-3" style="background-color: #ecc6c6; padding: 20px; ">
+
+                    <div class="card-header">
+                      <b>6. Special Teachers<span class="text-danger">*</span></b>
+                    </div>
+                    <div class="row mt-3">
+                      <div class="col-md-3">
+                        <label>No of Regular Teachers</label>
+                        <input type="number" class="form-control" name="stRegTeacher" id="stRegTeacher" placeholder="Enter Value" required />
+                      </div>
+                      <div class="col-md-3">
+                        <label>No of Part-time Teachers</label>
+                        <input type="number" class="form-control" name="stPtTeacher" id="stPtTeacher" placeholder="Enter Value" required />
+                      </div>
+                     <div class="col-md-3">
+                        <label>Special Course</label>                       
+                     	
+						 <select  class="form-control" name="stspTeacher" id="stspTeacher" multiple></select>   
+						    
+						
+                      </div>
+                    </div>
+                  </div>
+                  </div>
+                  
+                  <div class="col-md-12">
+                 <div class="card mt-3" style="background-color: #e6ffb3; padding: 20px; ">
+
+                    <div class="card-header">
+                      <b>7. HM Availability<span class="text-danger">*</span></b>
+                    </div>
+                    <div class="row mt-3">
+                      <div class="col-md-3">
+                        <label>HM Availability</label>
+                        <div class="radio-group">
+							<input type="radio" name="hmAvailability" value="1"> Yes
+							<input type="radio" name="hmAvailability" value="0"> No							
+						</div>
+                      </div>
+                                          
+                    </div>
+                  </div>
+                  </div>
 
                 <!-- Other Details -->
                 <div class="col-md-12">
-                  <div class="card" style="padding: 20px; margin-left: -127px; background-color: #f8f9fa; margin-top: 10px;">
+                  <div class="card" style="padding: 20px; background-color: #f8f9fa; margin-top: 10px;">
                     <div class="card-header">
-                      <b>Other Details *</b>
+                      <b>8. Other Details <span class="text-danger">*</span></b>
                     </div>
                     <div class="row mt-3">
                     <!--   <div class="col-md-3">
@@ -226,7 +307,17 @@
                       </div>
                       <div class="col-md-3 mt-3">
                         <label>Watchman</label>
-                        <input type="number" class="form-control" name="watchmen" id="watchmen" placeholder="Enter Value" required />
+                        <!-- <input type="number" class="form-control" name="watchmen" id="watchmen" placeholder="Enter Value" required /> -->
+                     	<select class="form-control" name="watchmen" id="watchmen" required>
+						    <option value="" disabled selected>Select Value</option>
+						    <option value="Not Available">Not Available</option>
+						    <option value="Not Applicable">Not Applicable</option>
+						    <option value="1">1</option>
+						    <option value="2">2</option>
+						    <option value="3">3</option>
+						    <option value="4">4</option>
+						    <option value="5">5</option>
+						 </select>
                       </div>
                       <div class="col-md-3 mt-3">
                         <label>Scavengers</label>
@@ -261,9 +352,12 @@
               </div>
             </div>
           </div>
-        </div>
+	
+	</div>
       </div>
     </div>
+    
+
 
     <!-- Staff Update Modal -->
     <div class="modal fade" id="staffUpdateModal" tabindex="-1">
@@ -277,54 +371,146 @@
       <div class="modal-body">
         <div class="row g-3">
           <!-- SG Section -->
-          <div class="col-md-3"><label>SG - Regu Teachers *</label><input type="number" id="modal_sgRegTeacher" class="form-control" /></div>
-          <div class="col-md-3"><label>SG - Smc Teachers *</label><input type="number" id="modal_sgTempTeacher" class="form-control" /></div>
-          <div class="col-md-3"><label>SG - Part-time Teachers *</label><input type="number" id="modal_sgPtTeacher" class="form-control" /></div>
-          <div class="col-md-3"><label>SG - NGO Teachers *</label><input type="number" id="modal_sgNgoTeacher" class="form-control" /></div>
+          <div class="col-md-3"><label>SG - Regular Teachers <span class="text-danger">*</span></label><input type="number" id="modal_sgRegTeacher" class="form-control" /></div>
+          <div class="col-md-3"><label>SG - Smc Teachers <span class="text-danger">*</span></label><input type="number" id="modal_sgTempTeacher" class="form-control" /></div>
+          <div class="col-md-3"><label>SG - Part-time Teachers <span class="text-danger">*</span></label><input type="number" id="modal_sgPtTeacher" class="form-control" /></div>
+          <div class="col-md-3"><label>SG - NGO Teachers <span class="text-danger">*</span></label><input type="number" id="modal_sgNgoTeacher" class="form-control" /></div>
 
           <!-- BT Section -->
-          <div class="col-md-3"><label>BT - Regu Teachers *</label><input type="number" id="modal_btRegTeacher" class="form-control" /></div>
-          <div class="col-md-3"><label>BT - Smc Teachers *</label><input type="number" id="modal_btTempTeacher" class="form-control" /></div>
-          <div class="col-md-3"><label>BT - Part-time Teachers *</label><inputtype="number" id="modal_btPtTeacher" class="form-control" /></div>
-          <div class="col-md-3"><label>BT - NGO Teachers *</label><input type="number" id="modal_btNgoTeacher" class="form-control" /></div>
+          <div class="col-md-3"><label>BT - Regular Teachers <span class="text-danger">*</span></label><input type="number" id="modal_btRegTeacher" class="form-control" /></div>
+          <div class="col-md-3"><label>BT - Smc Teachers <span class="text-danger">*</span></label><input type="number" id="modal_btTempTeacher" class="form-control" /></div>
+          <div class="col-md-3"><label>BT - Part-time Teachers <span class="text-danger">*</span></label><input type="number" id="modal_btPtTeacher" class="form-control" /></div>
+          <div class="col-md-3"><label>BT - NGO Teachers <span class="text-danger">*</span></label><input type="number" id="modal_btNgoTeacher" class="form-control" /></div>
 
           <!-- PG Section -->
-          <div class="col-md-3"><label>PG - Regu Teachers *</label><input type="number" id="modal_pgRegTeacher" class="form-control" /></div>
-          <div class="col-md-3"><label>PG - Smc Teachers *</label><input type="number" id="modal_pgTempTeacher" class="form-control" /></div>
-          <div class="col-md-3"><label>PG - Part-time Teachers *</label><input type="number" id="modal_pgPtTeacher" class="form-control" /></div>
-          <div class="col-md-3"><label>PG - NGO Teachers *</label><input type="number" id="modal_pgNgoTeacher" class="form-control" /></div>
+          <div class="col-md-3"><label>PG - Regular Teachers <span class="text-danger">*</span></label><input type="number" id="modal_pgRegTeacher" class="form-control" /></div>
+          <div class="col-md-3"><label>PG - Smc Teachers <span class="text-danger">*</span></label><input type="number" id="modal_pgTempTeacher" class="form-control" /></div>
+          <div class="col-md-3"><label>PG - Part-time Teachers <span class="text-danger">*</span></label><input type="number" id="modal_pgPtTeacher" class="form-control" /></div>
+          <div class="col-md-3"><label>PG - NGO Teachers <span class="text-danger">*</span></label><input type="number" id="modal_pgNgoTeacher" class="form-control" /></div>
   <!-- PET Section -->
 
- <div class="col-md-3"><label>PET - Regu Teachers *</label><input type="number" id="modal_petRegTeacher" class="form-control" /></div>
-          <div class="col-md-3"><label>PET - Smc Teachers *</label><input type="number" id="modal_petTempTeacher" class="form-control" /></div>
-          <div class="col-md-3"><label>PET - Grade 1 Teachers *</label><input type="number" id="modal_petg1Teacher" class="form-control" /></div>
-          <div class="col-md-3"><label>PET - Grade 2 Teachers *</label><input type="number" id="modal_petg2Teacher" class="form-control" /></div>
+ 		  <div class="col-md-3"><label>PET - Regular Teachers <span class="text-danger">*</span></label><input type="number" id="modal_petRegTeacher" class="form-control" /></div>
+          <div class="col-md-3"><label>PET - Smc Teachers <span class="text-danger">*</span></label><input type="number" id="modal_petTempTeacher" class="form-control" /></div>
+          <div class="col-md-3"><label>PET - Grade 1 Teachers <span class="text-danger">*</span></label><input type="number" id="modal_petg1Teacher" class="form-control" /></div>
+          <div class="col-md-3"><label>PET - Grade 2 Teachers <span class="text-danger">*</span></label><input type="number" id="modal_petg2Teacher" class="form-control" /></div>
+          <div class="col-md-3"><label>PET - Part-time Teachers <span class="text-danger">*</span></label><input type="number" id="modal_petptTeacher" class="form-control" /></div>
+          
        <!-- kg Section -->   
-          <div class="col-md-3"><label>KG - Regu Teachers *</label><input type="number" id="modal_kgRegTeacher" class="form-control" /></div>
-          <div class="col-md-3"><label>KG - Smc Teachers *</label><input type="number" id="modal_kgTempTeacher" class="form-control" /></div>
+          <div class="col-md-3"><label>KG - Regular Teachers <span class="text-danger">*</span></label><input type="number" id="modal_kgRegTeacher" class="form-control" /></div>
+          <div class="col-md-3"><label>KG - Smc Teachers <span class="text-danger">*</span></label><input type="number" id="modal_kgTempTeacher" class="form-control" /></div>
+        
+ 
+          <div class="col-md-3"><label>Special -Regular Teachers<span class="text-danger">*</span></label><input type="number" id="modal_stRegTeacher" class="form-control" /></div>
+          <div class="col-md-3"><label>Special -Part-time Teachers<span class="text-danger">*</span></label><input type="number" id="modal_stPtTeacher" class="form-control" /></div>
+          <div class="col-md-6">
+			<label>Special Course</label><select id="modal_special_course" class="form-control" multiple="multiple"></select>
+		  </div>
+			
+          <div class="col-md-3">
+			  <label>HM Availability <span class="text-danger">*</span></label>
+			  <div class="radio-group">
+			    <div class="form-check form-check-inline">
+			      <input class="form-check-input" type="radio" name="is_hmAvailability" id="hmYes" value="1">
+			      <label class="form-check-label" for="hmYes">Yes</label>
+			    </div>
+			    <div class="form-check form-check-inline">
+			      <input class="form-check-input" type="radio" name="is_hmAvailability" id="hmNo" value="0">
+			      <label class="form-check-label" for="hmNo">No</label>
+			    </div>
+			  </div>
+			</div>
+			
+			
         
           <!-- Other Section -->
-      <!--      <div class="col-md-3"><label>KG Teachers *</label><input id="modal_kgTeacher" class="form-control" /></div>
-          <div class="col-md-3"><label>PT Teachers *</label><input id="modal_petTeacher" class="form-control" /></div>-->
-          <div class="col-md-3"><label>Total OA *</label><input type="number"  id="modal_totOa" class="form-control" /></div>
-          <div class="col-md-3"><label>KG Ayah *</label><input type="number"  id="modal_kgAyah" class="form-control" /></div>
-          <div class="col-md-3"><label>Computer Assistance *</label><input type="number" id="modal_compAss" class="form-control" /></div>
-          <div class="col-md-3"><label>Watchmen *</label><input type="number" id="modal_watchmen" class="form-control" /></div>
-          <div class="col-md-3"><label>Scavengers *</label><input type="number" id="modal_scavengers" class="form-control" /></div>
-          <div class="col-md-3"><label>Sweeper *</label><input type="number" id="modal_maintenanceWork" class="form-control" /></div>
+      
+          <div class="col-md-3"><label>Total OA <span class="text-danger">*</span></label><input type="number"  id="modal_totOa" class="form-control" /></div>
+          <div class="col-md-3"><label>KG Ayah <span class="text-danger">*</span></label><input type="number"  id="modal_kgAyah" class="form-control" /></div>
+          <div class="col-md-3"><label>Computer Assistance <span class="text-danger">*</span></label><input type="number" id="modal_compAss" class="form-control" /></div>
+          <div class="col-md-3"><label>Watchmen <span class="text-danger">*</span></label><!-- <input type="number" id="modal_watchmen" class="form-control" /> -->
+          <select class="form-control" name="modal_watchmen" id="modal_watchmen" required>
+						    <option value="" disabled selected>Select Value</option>
+						    <option value="Not Available">Not Available</option>
+						    <option value="Not Applicable">Not Applicable</option>
+						    <option value="1">1</option>
+						    <option value="2">2</option>
+						    <option value="3">3</option>
+						    <option value="4">4</option>
+						    <option value="5">5</option>
+						 </select>
+          </div>
+          
+          <div class="col-md-3"><label>Scavengers <span class="text-danger">*</span></label><input type="number" id="modal_scavengers" class="form-control" /></div>
+          <div class="col-md-3"><label>Sweeper <span class="text-danger">*</span></label><input type="number" id="modal_maintenanceWork" class="form-control" /></div>
         </div>
       </div>
       <div class="modal-footer">
         <button class="btn btn-primary" id="saveStaffModalUpdate">Save Changes</button>
-        <button class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+      
       </div>
     </div>
   </div>
 </div>
+<script th:replace="~{fragments/modules/base/script :: script}"></script>
+	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
 
 
     <!-- Scripts -->
     <script>
+    
+    $(document).ready(function () {
+    	  function toggleSpecialCourseAccess() {
+    	    const stRegTeacherVal = parseInt($('#stRegTeacher').val()) || 0;
+    	    const stPtTeacherVal = parseInt($('#stPtTeacher').val()) || 0;
+
+    	    // Enable if either value is greater than 1
+    	    if (stRegTeacherVal > 0 || stPtTeacherVal > 0) {
+    	      $('#stspTeacher').prop('disabled', false);
+    	    } else {
+    	      $('#stspTeacher').prop('disabled', true);
+    	    }
+    	    
+    	    if (stRegTeacherVal === 0 && stPtTeacherVal === 0) {
+    	    	$('#stspTeacher').val(null).trigger('change');
+      	    }
+    	  }
+
+    	  // Run on page load
+    	  toggleSpecialCourseAccess();
+
+    	  // Listen for input changes
+    	  $('#stRegTeacher, #stPtTeacher').on('input', toggleSpecialCourseAccess);
+    	  
+    	  
+    	  function toggleSpecialCourseAccess2() {
+      	    const stRegTeacherVal2 = parseInt($('#modal_stRegTeacher').val()) || 0;
+      	    const stPtTeacherVal2 = parseInt($('#modal_stPtTeacher').val()) || 0;
+
+      	    // Enable if either value is greater than 1
+      	    if (stRegTeacherVal2 > 0 || stPtTeacherVal2 > 0) {
+      	      $('#modal_special_course').prop('disabled', false);
+      	    } else {
+      	      $('#modal_special_course').prop('disabled', true);
+      	    }
+      	    
+      	  if (stRegTeacherVal2 === 0 || stPtTeacherVal2 === 0) {
+      			$('#modal_special_course').val(null).trigger('change');
+      	    }
+      	    
+      	  }
+
+      	  // Run on page load
+      	  toggleSpecialCourseAccess2();
+
+      	  // Listen for input changes
+      	  $('#modal_stRegTeacher, #modal_stPtTeacher').on('input', toggleSpecialCourseAccess2);
+    	  
+    	  
+    	  
+    	});
+
+    
+    
       $(document).ready(function () {
         const urlParams = new URLSearchParams(window.location.search);
         const schoolId = urlParams.get("schoolId");
@@ -338,6 +524,48 @@
             }
           });
         });
+        
+        
+        /* let spDropdown =document.getElementById('stspTeacher');
+
+        
+        fetch('/gcc/api/gccschool/dropdown/getSpecialCategory') 
+	    .then(response => response.json())
+	    .then(data => {
+	        // Clear existing options
+	        spDropdown.innerHTML = `<option value="">Choose...</option>`;
+	
+	        // Add options from the API response
+	        data.data.forEach(item => {
+	        	spDropdown.innerHTML += `<option value="${item.special_category}">${item.special_category}</option>`;
+	        });
+	    })
+	    .catch(error => {
+	        console.error('Error fetching in Special Category Dropdown:', error);
+	    }); */
+        
+        $.get('/gcc/api/gccschool/dropdown/getSpecialCategory', function (response) {
+		    const $equip = $('#stspTeacher').empty();
+		    //$equip.append('<option value="">Select Special Courses </option>');
+		    response.data.forEach(item => {
+		        $equip.append(`<option value="${item.special_category_id}">${item.special_category}</option>`);
+		    });
+
+		    $equip.select2({
+		        //placeholder: "Select Special Courses",
+		        width: '100%',
+		        multiple: true,
+		        minimumResultsForSearch: Infinity, // disables search typing
+		        closeOnSelect: false
+		    });
+
+		    // Optional: disable typing in the input
+		    $equip.on('select2:opening', function() {
+		        setTimeout(() => {
+		            $('.select2-search__field').prop('readonly', true);
+		        }, 0);
+		    });
+		});
 
         // Fetch staff data against schoolId
         $.ajax({
@@ -348,16 +576,22 @@
             console.log(response);
             if (response.status === 'OK' && response.staffStrength.length > 0) {
               const data = response.staffStrength[0];
+              
+              let specialCourses = '';
 
+              if (response.special_category && response.special_category.length > 0) {
+                specialCourses = response.special_category.map(item => item.sc_names).join(', ');
+              }
+              
               // Build a read-only table with fetched staff data
    const tableHtml = `
 	   <h6 class="text-left mb-3"><b>Staff Strength Details</b></h6>
 	   <hr>
 	   <!-- SG Teachers -->
-  <h6><b>1. SG Teachers *</b></h6>
+  <h6><b>1. SG Teachers <span class="text-danger">*</span></b></h6>
   <table class="table">
     <tbody>
-      <tr><td>No of Regu Teachers</td><td>${data.sg_reg_teacher || 0}</td></tr>
+      <tr><td>No of Regular Teachers</td><td>${data.sg_reg_teacher || 0}</td></tr>
       <tr><td>No of Smc Teachers</td><td>${data.sg_temp_teacher || 0}</td></tr>
       <tr><td>No of Part-time Teachers</td><td>${data.sg_pt_teacher || 0}</td></tr>
       <tr><td>No of NGO Teachers</td><td>${data.sg_ngo_teacher || 0}</td></tr>
@@ -365,10 +599,10 @@
   </table>
 
   <!-- BT Teachers -->
-  <h6><b>2. BT Teachers *</b></h6>
+  <h6><b>2. BT Teachers <span class="text-danger">*</span></b></h6>
   <table class="table">
     <tbody>
-      <tr><td>No of Regu Teachers</td><td>${data.bt_reg_teacher || 0}</td></tr>
+      <tr><td>No of Regular Teachers</td><td>${data.bt_reg_teacher || 0}</td></tr>
       <tr><td>No of Smc Teachers</td><td>${data.bt_temp_teacher || 0}</td></tr>
       <tr><td>No of Part-time Teachers</td><td>${data.bt_pt_teacher || 0}</td></tr>
       <tr><td>No of NGO Teachers</td><td>${data.bt_ngo_teacher || 0}</td></tr>
@@ -376,10 +610,10 @@
   </table>
 
   <!-- PG Teachers -->
-  <h6><b>3. PG Teachers *</b></h6>
+  <h6><b>3. PG Teachers <span class="text-danger">*</span></b></h6>
   <table class="table">
     <tbody>
-      <tr><td>No of Regu Teachers</td><td>${data.pg_reg_teacher || 0}</td></tr>
+      <tr><td>No of Regular Teachers</td><td>${data.pg_reg_teacher || 0}</td></tr>
       <tr><td>No of Smc Teachers</td><td>${data.pg_temp_teacher || 0}</td></tr>
       <tr><td>No of Part-time Teachers</td><td>${data.pg_pt_teacher || 0}</td></tr>
       <tr><td>No of NGO Teachers</td><td>${data.pg_ngo_teacher || 0}</td></tr>
@@ -387,30 +621,47 @@
   </table>
   
   <!-- PG Teachers -->
-  <h6><b>4.  PET Teachers *</b></h6>
+  <h6><b>4.  PET Teachers <span class="text-danger">*</span></b></h6>
   <table class="table">
     <tbody>
-      <tr><td>No of Regu Teachers</td><td>${data.pet_reg_teacher || 0}</td></tr>
+      <tr><td>No of Regular Teachers</td><td>${data.pet_reg_teacher || 0}</td></tr>
       <tr><td>No of Smc Teachers</td><td>${data.pet_temp_teacher || 0}</td></tr>
       <tr><td>No of Grade 1 Teachers</td><td>${data.pet_grade1_teacher || 0}</td></tr>
       <tr><td>No of Grade 2 Teachers</td><td>${data.pet_grade2_teacher || 0}</td></tr>
+      <tr><td>No of Part-time Teachers</td><td>${data.pet_pt_teacher || 0}</td></tr>
     </tbody>
   </table>
   
-  <!-- PG Teachers -->
-  <h6><b>5. kG Teachers *</b></h6>
+  
+ 
+  
+  <h6><b>5. kG Teachers <span class="text-danger">*</span></b></h6>
   <table class="table">
     <tbody>
-      <tr><td>No of Regu Teachers</td><td>${data.kg_reg_teacher || 0}</td></tr>
+      <tr><td>No of Regular Teachers</td><td>${data.kg_reg_teacher || 0}</td></tr>
       <tr><td>No of Smc Teachers</td><td>${data.kg_temp_teacher || 0}</td></tr>
    
     </tbody>
   </table>
   
+  <h6><b>6.Special Teachers <span class="text-danger">*</span></b></h6>
+  <table class="table">
+    <tbody>
+      <tr><td>No of Regular Teachers</td><td>${data.st_reg_teacher }</td></tr>
+      <tr><td>No of Part-time Teachers</td><td>${data.st_pt_teacher }</td></tr>
+      <tr><td>Special course</td><td>${specialCourses}</td></tr> 
+    </tbody>
+  </table>
   
+  <h6><b>7. HM Availability <span class="text-danger">*</span></b></h6>
+  <table class="table">
+    <tbody>
+    <tr><td>HM Availability</td><td>${data.is_hm === 1 ? 'Yes' : 'No'}</td></tr>
+    </tbody>
+  </table>
 
   <!-- Other Details -->
-  <h6><b>6. Other Details *</b></h6>
+  <h6><b>8. Other Details <span class="text-danger">*</span></b></h6>
   <table class="table">
     <tbody>
 
@@ -452,16 +703,73 @@
             	  $('#modal_petTempTeacher').val(data.pet_temp_teacher);
             	  $('#modal_petg1Teacher').val(data.pet_grade1_teacher);
             	  $('#modal_petg2Teacher').val(data.pet_grade2_teacher);
+            	  $('#modal_petptTeacher').val(data.pet_pt_teacher);
             	  
             	  $('#modal_kgRegTeacher').val(data.kg_reg_teacher);
             	  $('#modal_kgTempTeacher').val(data.kg_temp_teacher);
             	  
+            	  $('#modal_stRegTeacher').val(data.st_reg_teacher);
+            	  $('#modal_stPtTeacher').val(data.st_pt_teacher);
+            	  
+            	// Parse values separately
+            	  let reg = parseInt(data.st_reg_teacher) || 0;
+            	  let pt = parseInt(data.st_pt_teacher) || 0;
+
+            	  // Enable or disable based on either value > 0
+            	  if (reg > 0 || pt > 0) {
+            	      $('#modal_special_course').prop('disabled', false);
+            	  } else {
+            	      $('#modal_special_course').prop('disabled', true);
+            	  }
+            	  
+            	  const $specialCourseSelect = $('#modal_special_course');
+
+            	    // Step 1: Get selected special category IDs from API
+            	    const specialCategoryData = response.special_category || [];
+            	    const selectedCategoryIds = specialCategoryData.map(sc => sc.special_category_id.toString());
+
+            	    // Step 2: Fetch full dropdown list
+            	    $.get('/gcc/api/gccschool/dropdown/getSpecialCategory', function (response) {
+            	        $specialCourseSelect.empty();
+
+            	        // Populate options
+            	        response.data.forEach(item => {
+            	            $specialCourseSelect.append(
+            	                `<option value="${item.special_category_id}">${item.special_category}</option>`
+            	            );
+            	        });
+
+            	        // Initialize select2
+            	        $specialCourseSelect.select2({
+            	            //placeholder: "Select Special Courses",
+            	            width: '100%',
+            	            multiple: true,
+            	            closeOnSelect: false,
+            	            minimumResultsForSearch: Infinity
+            	        });
+
+            	        // Disable typing
+            	        $specialCourseSelect.on('select2:opening', function () {
+            	            setTimeout(() => {
+            	                $('.select2-search__field').prop('readonly', true);
+            	            }, 0);
+            	        });
+
+            	        // Step 3: Pre-select based on API response
+            	        setTimeout(() => {
+            	            $specialCourseSelect.val(selectedCategoryIds).trigger('change');
+            	        }, 100); // small delay to ensure select2 initializes
+            	    });
+            	  
+            	  
+            	  $('input[name="is_hmAvailability"][value="' + data.is_hm + '"]').prop('checked', true);
             	  
 
             	  $('#modal_totOa').val(data.tot_oa);
             	  $('#modal_kgAyah').val(data.kg_ayah);
             	  $('#modal_compAss').val(data.comp_ass);
-            	  $('#modal_watchmen').val(data.watchmen);
+            	  //$('#modal_watchmen').val(data.watchmen);
+            	  $('#modal_watchmen').val(String(data.watchmen));
             	  $('#modal_scavengers').val(data.scavengers);
             	  $('#modal_maintenanceWork').val(data.maintenance_work);
 
@@ -483,29 +791,6 @@
           console.log("Submit button clicked for Staff");
           console.log("SchoolId:", schoolId);
 
-          // Validation: Check required fields
-         /* const requiredFields = {
-            'sgRegTeacher': 'SG - Regular Teachers',
-            'sgTempTeacher': 'SG - Temp Teachers',
-            'sgPtTeacher': 'SG - Part-time Teachers',
-            'sgNgoTeacher': 'SG - NGO Teachers',
-            'btRegTeacher': 'BT - Regular Teachers',
-            'btTempTeacher': 'BT - Temp Teachers',
-            'btPtTeacher': 'BT - Part-time Teachers',
-            'btNgoTeacher': 'BT - NGO Teachers',
-            'pgRegTeacher': 'PG - Regular Teachers',
-            'pgTempTeacher': 'PG - Temp Teachers',
-            'pgPtTeacher': 'PG - Part-time Teachers',
-            'pgNgoTeacher': 'PG - NGO Teachers',
-            'kgTeacher': 'KG Teachers',
-            'petTeacher': 'PT Teachers',
-            'totOa': 'Total OA',
-            'kgAyah': 'KG Ayah',
-            'compAss': 'Computer Assistance',
-            'watchmen': 'Watchman',
-            'scavengers': 'Scavengers',
-            'maintenanceWork': 'Maintenance Works'
-          };*/
           const requiredFields = {
         		  sgRegTeacher: 'SG - Regular Teachers',
         		  sgTempTeacher: 'SG - Smc Teachers',
@@ -526,9 +811,15 @@
         		  petTempTeacher: 'PET - Smc Teachers',
         		  petGrade1Teacher: 'PET - Grade 1 Teachers',
         		  petGrade2Teacher: 'PET - Grade 2 Teachers',
+        		  petPtTeacher: 'PET - Part-time Teachers',
 
         		  kgRegTeacher: 'KG - Regular Teachers',
         		  kgTempTeacher: 'KG - Smc Teachers',
+        		  
+        		  stRegTeacher:'Special Teacher - Regular Teachers',
+        		  stPtTeacher:'Special Teacher - Part-time Teachers',        		 
+        		  
+        		  hmAvailability:'HM Availability',
 
         		  totOa: 'Total OA',
         		  kgAyah: 'KG Ayah',
@@ -537,81 +828,130 @@
         		  scavengers: 'Scavengers',
         		  maintenanceWork: 'Sweeper'
         		};
+          
+          const payload = {};
 
 
           for (let fieldId in requiredFields) {
-            const value = $(`#${fieldId}`).val();
-            if (value === null || value.trim() === "" || isNaN(Number(value)) || parseInt(value) < 0) {
-              Swal.fire({
-                icon: 'warning',
-                title: 'Missing or Invalid Input',
-                text: `Please enter a valid number for "${requiredFields[fieldId]}"`,
-                allowOutsideClick: false,
-                allowEscapeKey: false,
-                allowEnterKey: false,
-                showConfirmButton: true
-              });
-              return;
-            }
-          }
+        	  let value;
+
+        	  // Handle radio button for 'hmAvailability'
+        	  if (fieldId === 'hmAvailability') {
+        	    value = $(`input[name="${fieldId}"]:checked`).val();
+        	  } else {
+        	    value = $(`#${fieldId}`).val();
+        	  }
+
+          	   
+        	  if (value === undefined || value === null || (typeof value === 'string' && value.trim() === "")) {
+              	    Swal.fire({
+              	      icon: 'warning',
+              	      title: 'Missing Input',
+              	      text: `Please enter a "${requiredFields[fieldId]}"`,
+              	      allowOutsideClick: false,
+              	      allowEscapeKey: false,
+              	      allowEnterKey: false,
+              	      showConfirmButton: true
+              	    });
+              	    return;
+              	  }
+        		  
+          	  
+
+        	  // Extra numeric validation for all except 'watchmen'
+        	  if (fieldId !== 'watchmen' && fieldId !== 'hmAvailability'  && (isNaN(Number(value)) || parseInt(value) < 0)) {
+        	    Swal.fire({
+        	      icon: 'warning',
+        	      title: 'Invalid Input',
+        	      text: `Please enter a valid number for "${requiredFields[fieldId]}"`,
+        	      allowOutsideClick: false,
+        	      allowEscapeKey: false,
+        	      allowEnterKey: false,
+        	      showConfirmButton: true
+        	    });
+        	    return;
+        	  }
+        	  
+        	  if (fieldId === 'hmAvailability') {
+        		  payload[fieldId] = value === "1" ? true : false;
+        		} else {
+        		  payload[fieldId] = value;
+        		}
+        	}
+          
+          const spCourseList = $('#stspTeacher').val();
+          
+          const stRegTeacherValue = parseInt($('#stRegTeacher').val());
+          const stPtTeacherValue = parseInt($('#stPtTeacher').val());
+          const totalSpecialTeachers =stRegTeacherValue + stPtTeacherValue;
+          
+           if ( totalSpecialTeachers >0 && spCourseList.length === 0) {
+				return Swal.fire({
+					title: 'Validation Error',
+					text: 'Select Special Teacher - Special Course.',
+					icon: 'warning',
+					allowOutsideClick: false,
+					allowEscapeKey: false,
+					allowEnterKey: false,
+					showConfirmButton: true
+				});
+			} 
+
 
           // Show loader before submitting
-          $('#pageLoader').show();
+         $('#pageLoader').show();
 
-          // Prepare form data
-          var formData = new FormData(document.getElementById("staffStrengthForm"));
-          formData.append("schoolId", schoolId);
+          
+             payload['specialCategoryId'] = spCourseList;
+    		payload['schoolId'] = schoolId;
 
-          // Debug log (optional)
-          const debugObj = {};
-          formData.forEach((value, key) => {
-            debugObj[key] = value;
-          });
-          console.log("Form Data Collected:", debugObj);
+    		console.log("Payload to send:", payload);
 
           // Submit via AJAX
-          $.ajax({
+            $.ajax({
             type: "POST",
             url: "/gcc/api/gccschool/schoolproperty/saveStaffStrength",
-            data: formData,
-            processData: false,
-            contentType: false,
+            data: JSON.stringify(payload),
+            contentType: "application/json",
+            processData: false,          
             success: function (response) {
-              $("#pageLoader").hide();
-              console.log("Data Submitted Successfully:", response);
-              Swal.fire({
-                icon: "success",
-                title: "Data Saved!",
-                text: "Staff strength details saved successfully!",
-                confirmButtonColor: "#3085d6",
-                allowOutsideClick: false,
-                allowEscapeKey: false,
-                allowEnterKey: false,
-                showConfirmButton: true
-              }).then(() => {
-                $("#staffStrengthForm")[0].reset();
-                // Optionally, reload page to refresh view
-                location.reload();
-              });
-            },
-            error: function (xhr, status, error) {
-              $("#pageLoader").hide();
-              console.error("Submission Error:", xhr.responseText);
-              Swal.fire({
-                icon: "error",
-                title: "Error!",
-                text: "Something went wrong. Please try again.",
-                allowOutsideClick: false,
-                allowEscapeKey: false,
-                allowEnterKey: false,
-                confirmButtonColor: "#d33"
-              });
-            }
-          });
+            	  $("#pageLoader").hide();
+            	  //console.log("Data Submitted Successfully:", response);
+            	  Swal.fire({
+                      icon: response === "Staff Details Saved Sucessfully" ? "success" :
+                            response === "Error" ? "error" : "info",
+                      title: response === "Staff Details Saved Sucessfully" ? "Success!" :
+                             response === "Error" ? "Error!" : "Notice",
+                      text: response,                    
+                      allowOutsideClick: false,
+                      allowEscapeKey: false,
+                      allowEnterKey: false,
+                      showConfirmButton: true
+                  }).then(() => {                     
+                          location.reload();                 
+                  });
+            	},
+
+            	error: function (xhr, status, error) {
+                    $("#pageLoader").hide();
+                    console.error("Submission Error:", xhr.responseText);
+                    Swal.fire({
+                        icon: "error",
+                        title: "Error!",
+                        text: "Something went wrong. Please try again.",
+                        allowOutsideClick: false,
+                        allowEscapeKey: false,
+                        allowEnterKey: false,
+                        confirmButtonColor: "#d33"
+                    });
+                }
+          });  
         });
         function resetStaffFields() {
         	  console.log("Reset button clicked");
         	  $('#staffStrengthForm input[type="number"]').val('');
+        	  $('#staffStrengthForm select').prop('selectedIndex', 0);
+        	  $('#staffStrengthForm input[type="radio"]').prop('checked', false);
         	}
      
         $(document).on('click', '#resetButton', function (event) {
@@ -661,9 +1001,15 @@
 			        			  modal_petTempTeacher: 'PET - Smc Teachers',
 			        			  modal_petg1Teacher: 'PET - Grade 1 Teachers',
 			        			  modal_petg2Teacher: 'PET - Grade 2 Teachers',
+			        			  modal_petptTeacher:'PET - Part-time  Teachers',
 
 			        			  modal_kgRegTeacher: 'KG - Regular Teachers',
 			        			  modal_kgTempTeacher: 'KG - Smc Teachers',
+			        			  
+			        			  modal_stRegTeacher:'Special - Regular Teachers',
+			        			  modal_stPtTeacher:'Special - Part-time Teachers',
+			        			  
+			        			  is_hmAvailability:'HM Availability',
 
 			        			  modal_totOa: 'Total OA',
 			        			  modal_kgAyah: 'KG Ayah',
@@ -672,14 +1018,39 @@
 			        			  modal_scavengers: 'Scavengers',
 			        			  modal_maintenanceWork: 'Sweeper'
 			        			};
+			
+							const payload={};
 			        	
 			        		  for (let fieldId in modalRequiredFields) {
-			        			  const value = $(`#${fieldId}`).val();
-
-			        		    if (value === null || value.trim() === "" || isNaN(Number(value)) || parseInt(value) < 0) {
+			        			  let value;
+
+			                	  // Handle radio button for 'hmAvailability'
+			                	  if (fieldId === 'is_hmAvailability') {
+			                	    value = $(`input[name="${fieldId}"]:checked`).val();
+			                	  } else {
+			                	    value = $(`#${fieldId}`).val();
+			                	  }
+
+			        			  
+			                	  if (value === undefined || value === null || (typeof value === 'string' && value.trim() === "")){
+			        				  Swal.fire({
+			        				      icon: 'warning',
+			        				      title: 'Missing Input',
+			        				      text: `Please enter a "${modalRequiredFields[fieldId]}"`,
+			        				      allowOutsideClick: false,
+			        				      allowEscapeKey: false,
+			        				      allowEnterKey: false,
+			        				      showConfirmButton: true
+			        				    });
+			        				    return;
+			        			  }
+
+			        			  //if (fieldId !== 'modal_watchmen' && (isNaN(Number(value)) || parseInt(value) < 0))
+			        			  if (fieldId !== 'modal_watchmen' && fieldId !== 'is_hmAvailability'  && (isNaN(Number(value)) || parseInt(value) < 0))
+			        			  {
 			        		      Swal.fire({
 			        		        icon: 'warning',
-			        		        title: 'Missing or Invalid Input',
+			        		        title: 'Invalid Input',
 			        		        text: `Please enter a valid number for "${modalRequiredFields[fieldId]}"`,
 			        		        allowOutsideClick: false,
 			        		        allowEscapeKey: false,
@@ -688,83 +1059,90 @@
 			        		      });
 			        		      return false; // Prevent further execution if validation fails
 			        		    }
+			        			 
+			        			  if (fieldId === 'is_hmAvailability') {
+			                		  payload[fieldId] = value === "1" ? true : false;
+			                		} else {
+			                		  payload[fieldId] = value;
+			                		}
+			        			  
 			        		  }
-        	 const updatedData = {
-        			    sgRegTeacher: $('#modal_sgRegTeacher').val(),
-        			    sgTempTeacher: $('#modal_sgTempTeacher').val(),
-        			    sgPtTeacher: $('#modal_sgPtTeacher').val(),
-        			    sgNgoTeacher: $('#modal_sgNgoTeacher').val(),
-        			    
-        			    btRegTeacher: $('#modal_btRegTeacher').val(),
-        			    btTempTeacher: $('#modal_btTempTeacher').val(),
-        			    btPtTeacher: $('#modal_btPtTeacher').val(),
-        			    btNgoTeacher: $('#modal_btNgoTeacher').val(),
-        			    
-        			    pgRegTeacher: $('#modal_pgRegTeacher').val(),
-        			    pgTempTeacher: $('#modal_pgTempTeacher').val(),
-        			    pgPtTeacher: $('#modal_pgPtTeacher').val(),
-        			    pgNgoTeacher: $('#modal_pgNgoTeacher').val(),
-        			    
-        			    
-        			    petRegTeacher: $('#modal_petRegTeacher').val(),
-        			    petTempTeacher: $('#modal_petTempTeacher').val(),
-        			    petGrade1Teacher: $('#modal_petg1Teacher').val(),
-        			    petGrade2Teacher: $('#modal_petg2Teacher').val(),
-        			    
-        			    kgRegTeacher: $('#modal_kgRegTeacher').val(),
-        			    kgTempTeacher: $('#modal_kgTempTeacher').val(),
-
-
-        		
-        			    totOa: $('#modal_totOa').val(),
-        			    kgAyah: $('#modal_kgAyah').val(),
-        			    compAss: $('#modal_compAss').val(),
-        			    watchmen: $('#modal_watchmen').val(),
-        			    scavengers: $('#modal_scavengers').val(),
-        			    maintenanceWork: $('#modal_maintenanceWork').val(),
-
-        			    school_id: schoolId // IMPORTANT: use same name as @RequestParam
-        			  };
+			        		  
+			        const editspCourseList = $('#modal_special_course').val();
+			        
+			        const modal_stRegTeacherValue = parseInt($('#modal_stRegTeacher').val());
+			          const modal_stPtTeacherValue = parseInt($('#modal_stPtTeacher').val());
+			          const modal_totalSpecialTeachers =modal_stRegTeacherValue + modal_stPtTeacherValue;
+			          
+			           if ( modal_totalSpecialTeachers > 0 && editspCourseList.length === 0) {
+			        	   
+			        	   Swal.fire({
+								title: 'Validation Error',
+								text: 'Select Special Teacher - Special Course.',
+								icon: 'warning',
+								allowOutsideClick: false,
+								allowEscapeKey: false,
+								allowEnterKey: false,
+								showConfirmButton: true
+							});
+			        	   return;
+			        	   
+			           }
+        	 
+        	 payload['specialCategoryId'] = editspCourseList;
+     		payload['schoolId'] = schoolId;
+     		
+     		console.log("Payload to sendEdit:", payload);
 
 
           $('#pageLoader').show();
           $.ajax({
             url: '/gcc/api/gccschool/schoolproperty/updateStaffDetails',
             type: 'POST',
-            contentType: 'application/x-www-form-urlencoded',
-            data: $.param(updatedData),
-            success: function (res) {
-              $('#pageLoader').hide();
-              $('#staffUpdateModal').modal('hide');
-             // Swal.fire('Updated!', res, 'success').then(() => location.reload());
-              Swal.fire({
-            	  title: 'Updated!',
-            	  text: 'Staff strength details updated successfully!',
-            	  icon: 'success',
-            	  allowOutsideClick: false,
-            	  allowEscapeKey: false,
-            	  allowEnterKey: false,
-            	  showConfirmButton: true
-            	}).then(() => location.reload());
-
-            },
-            error: function (err) {
-              $('#pageLoader').hide();
-              Swal.fire({
-            	  title: 'Error',
-            	  text: err.responseText,
-            	  icon: 'error',
-            	  allowOutsideClick: false,
-            	  allowEscapeKey: false,
-            	  allowEnterKey: false,
-            	  showConfirmButton: true
-            	});
-
-              //Swal.fire('Error', err.responseText, 'error');
-            }
-          });
+            data: JSON.stringify(payload),
+            contentType: "application/json",
+            processData: false,
+            success: function (response) {
+          	  $("#pageLoader").hide();
+          	  console.log("Data Submitted Successfully:", response);
+          	  Swal.fire({
+                    icon: response === "Staff Details Updated Sucessfully" ? "success" :
+                          response === "Error" ? "error" : "info",
+                    title: response === "Staff Details Updated Sucessfully" ? "Success!" :
+                           response === "Error" ? "Error!" : "Notice",
+                    text: response,                    
+                    allowOutsideClick: false,
+                    allowEscapeKey: false,
+                    allowEnterKey: false,
+                    showConfirmButton: true
+                }).then(() => {                     
+                        location.reload();                 
+                });
+          	},
+
+          	error: function (xhr, status, error) {
+                  $("#pageLoader").hide();
+                  console.error("Submission Error:", xhr.responseText);
+                  Swal.fire({
+                      icon: "error",
+                      title: "Error!",
+                      text: "Something went wrong. Please try again.",
+                      allowOutsideClick: false,
+                      allowEscapeKey: false,
+                      allowEnterKey: false,
+                      confirmButtonColor: "#d33"
+                  });
+              }
+          }); 
+          
         });
       });
+      
+      $(document).ready(function () {
+    	  
+    	});
+      
     </script>
+    
   </body>
 </html>
diff --git a/src/main/resources/templates/modules/school/studentdetails.html b/src/main/resources/templates/modules/school/studentdetails.html
index 2765902..f1fecea 100644
--- a/src/main/resources/templates/modules/school/studentdetails.html
+++ b/src/main/resources/templates/modules/school/studentdetails.html
@@ -71,6 +71,21 @@
 		margin-left: 1rem;
 		/* or any value you like */
 	}
+	.student-data-wrapper {
+  padding: 0px;
+  margin-top: -58px;
+  margin-left: -186px;
+  width: 120%;
+}
+
+@media (max-width: 768px) {
+  .student-data-wrapper {
+    margin-left: 0;
+    width: 100%;
+    padding: 0 15px; /* Optional horizontal spacing */
+  }
+}
+	
 </style>
 
 <body>
@@ -132,7 +147,8 @@
 
 								</div>
 							</div>-->
-							<div style="padding: 0px;margin-top:-58px;margin-left: -186px;width:120%;">
+						<div class="student-data-wrapper">
+
 						<div class="card-header d-flex justify-content-between align-items-center">
 							<b>Student Details</b>
 
@@ -157,6 +173,10 @@
 									<td>Transgender</td>
 									<td id="readonly_others">-</td>
 								</tr>
+								<tr>
+									<td>Special Child</td>
+									<td id="readonly_sp_child">-</td>
+								</tr>
 							</table>
 							<br>
 							<div class=" text-center">
@@ -175,18 +195,22 @@
 								</div>
 							</div>
 							<div class="row p-3">
-								<div class="col-md-4 form-group">
+								<div class="col-md-3 form-group">
 									<label>No of Boys <span class="text-danger">*</span></label>
 									<input type="text" class="form-control" id="total_boys" required />
 								</div>
-								<div class="col-md-4 form-group">
+								<div class="col-md-3 form-group">
 									<label>No of Girls <span class="text-danger">*</span></label>
 									<input type="text" class="form-control" id="total_girls" required />
 								</div>
-								<div class="col-md-4 form-group">
+								<div class="col-md-3 form-group">
 									<label>Transgender <span class="text-danger">*</span></label>
 									<input type="text" class="form-control" id="others" required />
 								</div>
+								<div class="col-md-3 form-group">
+									<label>Special Child <span class="text-danger">*</span></label>
+									<input type="text" class="form-control" id="sp_child" required />
+								</div>
 							</div>
 							<div class="card-footer text-center">
 								<button type="submit" class="btn btn-primary" id="StudentSubmitBtn"><i
@@ -215,6 +239,8 @@
 												id="modal_total_girls" class="form-control"></div>
 										<div class="form-group"><label>Transgender *</label><input id="modal_others"
 												class="form-control"></div>
+										<div class="form-group"><label>Special Child *</label><input id="modal_sp_child"
+												class="form-control"></div>
 									</div>
 									<div class="modal-footer">
 										<button type="button" class="btn btn-primary" id="saveModalUpdate">Save
@@ -284,6 +310,13 @@
 					this.value = '';
 				}
 			});
+			
+			document.getElementById('sp_child').addEventListener('input', function () {
+				this.value = this.value.replace(/[^0-9]/g, '');
+				if (parseInt(this.value) < 0) {
+					this.value = '';
+				}
+			});
 			document.getElementById('modal_total_students').addEventListener('input', function () {
 				this.value = this.value.replace(/[^0-9]/g, '');
 				if (parseInt(this.value) < 0) {
@@ -311,6 +344,13 @@
 					this.value = '';
 				}
 			});
+			
+			document.getElementById('modal_sp_child').addEventListener('input', function () {
+				this.value = this.value.replace(/[^0-9]/g, '');
+				if (parseInt(this.value) < 0) {
+					this.value = '';
+				}
+			});
 
 			/* $.ajax({
 						url: '/gcc/api/gccschool/buildingasset/getStudentStrengthBySchoolId',
@@ -364,6 +404,7 @@
 						$('#readonly_total_boys').text(data.total_boys || 0);
 						$('#readonly_total_girls').text(data.total_girls || 0);
 						$('#readonly_others').text(data.others || 0);
+						$('#readonly_sp_child').text(data.special_child);
 
 						$('#studentReadOnlyView').show();
 						$('#studentEntryForm').hide();
@@ -384,6 +425,7 @@
 				$('#modal_total_boys').val($('#readonly_total_boys').text());
 				$('#modal_total_girls').val($('#readonly_total_girls').text());
 				$('#modal_others').val($('#readonly_others').text());
+				$('#modal_sp_child').val($('#readonly_sp_child').text());
 				$('#studentUpdateModal').modal('show');
 			});
 
@@ -393,6 +435,7 @@
 					total_boys: parseInt($('#modal_total_boys').val()) || 0,
 					total_girls: parseInt($('#modal_total_girls').val()) || 0,
 					others: parseInt($('#modal_others').val()) || 0,
+					special_child: parseInt($('#modal_sp_child').val()) || 0,
 					school_id: schoolId
 				};
 				if (!$('#modal_total_students').val().trim()) {
@@ -446,9 +489,22 @@
 					});
 					return;
 				}
+				
+				if (!$('#modal_sp_child').val().trim()) {
+					Swal.fire({
+						icon: 'warning',
+						title: 'Validation Error',
+						text: 'Please enter  No of Special Child.',
+						allowOutsideClick: false,
+						allowEscapeKey: false,
+						allowEnterKey: false,
+						showConfirmButton: true
+					});
+					return;
+				}
 
-				if (requestData.total_students !== (requestData.total_boys + requestData.total_girls + requestData.others)) {
-					Swal.fire('Validation Error', 'Total should equal Boys + Girls + Transgender.', 'warning');
+				if (requestData.total_students !== (requestData.total_boys + requestData.total_girls + requestData.others + requestData.special_child)) {
+					Swal.fire('Validation Error', 'Total should equal Boys + Girls + Transgender + Special Child.', 'warning');
 					return;
 				}
 
@@ -502,6 +558,7 @@
 				let total_boys = parseInt($('#total_boys').val()) || 0;
 				let total_girls = parseInt($('#total_girls').val()) || 0;
 				let others = parseInt($('#others').val()) || 0;
+				let sp_child = parseInt($('#sp_child').val()) || 0;
 				//let school_id = 1;
 
 				console.log("total_students=", total_students);
@@ -509,6 +566,7 @@
 				console.log("total_girls=", total_girls);
 				console.log("others=", others);
 				console.log("school_id=", schoolId);
+				console.log("sp_child=",sp_child );
 				if (!$('#total_students').val().trim()) {
 					Swal.fire({
 						icon: 'warning',
@@ -560,6 +618,21 @@
 					});
 					return;
 				}
+				
+				
+				
+				if (!$('#sp_child').val().trim()) {
+					Swal.fire({
+						icon: 'warning',
+						title: 'Validation Error',
+						text: 'Please enter No of Special Child.',
+						allowOutsideClick: false,
+						allowEscapeKey: false,
+						allowEnterKey: false,
+						showConfirmButton: true
+					});
+					return;
+				}
 
 
 				// Validate inputs
@@ -568,6 +641,7 @@
 					"No of Boys": total_boys,
 					"No of Girls": total_girls,
 					"Others": others,
+					"Special Child":sp_child
 				};
 
 
@@ -583,11 +657,11 @@
 					}
 				}*/
 
-				if (total_students !== (total_boys + total_girls + others)) {
+				if (total_students !== (total_boys + total_girls + others + sp_child)) {
 					Swal.fire({
 						icon: 'warning',
 						title: 'Validation Error',
-						text: 'Total Students must be equal to the sum of No of Boys, No of Girls, and Transgender.',
+						text: 'Total Students must be equal to the sum of No of Boys, No of Girls,Transgender and Special Child.',
 						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	                   
@@ -603,34 +677,36 @@
 					total_boys: total_boys,
 					total_girls: total_girls,
 					school_id: schoolId,
-					others: others
+					others: others,
+					special_child:sp_child
 				};
 
 				$('#StudentSubmitBtn').prop('disabled', true).text('Processing...');
 				$('#pageLoader').show();
-				$.ajax({
+				 $.ajax({
 					url: '/gcc/api/gccschool/schoolproperty/saveStudentStrength',
 					type: 'POST',
 					contentType: 'application/x-www-form-urlencoded',
-					data: $.param(requestData),
+					data: $.param(requestData),					
 					success: function (response) {
-						$('#pageLoader').hide();
-						$('#StudentSubmitBtn').prop('disabled', false).text('Submit');
-						Swal.fire({
-							icon: 'success',
-							title: 'Success',
-							text: response,
-							allowOutsideClick: false,
-							allowEscapeKey: false,
-							allowEnterKey: false,
-							confirmButtonText: 'OK'
-						}).then((result) => {
-							if (result.isConfirmed) {
-								$('#StudentSubmitBtn').prop('disabled', false).text('Submit');
-								location.reload();
-							}
-						});
+					    $('#pageLoader').hide();
+					    $('#StudentSubmitBtn').prop('disabled', false).text('Submit');
+					    Swal.fire({
+					        icon: response.includes("already") ? 'info' : 'success',
+					        title: response.includes("already") ? 'Information' : 'Success',
+					        text: response,
+					        allowOutsideClick: false,
+					        allowEscapeKey: false,
+					        allowEnterKey: false,
+					        confirmButtonText: 'OK'
+					    }).then((result) => {
+					       
+					        	$('#StudentSubmitBtn').prop('disabled', false).text('Submit');
+					            location.reload();
+					        
+					    });
 					},
+
 					error: function (xhr, status, error) {
 						$('#pageLoader').hide();
 						$('#StudentSubmitBtn').prop('disabled', false).text('Submit');
@@ -644,7 +720,7 @@
 						});
 						console.error('Error:', xhr.responseText);
 					}
-				});
+				}); 
 
 
 
diff --git a/src/main/resources/templates/modules/school/studentregister.html b/src/main/resources/templates/modules/school/studentregister.html
new file mode 100644
index 0000000..b0bf7f5
--- /dev/null
+++ b/src/main/resources/templates/modules/school/studentregister.html
@@ -0,0 +1,3704 @@
+<!DOCTYPE html>
+<html lang="en" dir="ltr" xmlns:th="http://www.thymeleaf.org">
+
+<head th:replace="~{fragments/modules/base/head :: head}"></head>
+<style>
+	body {
+		background-color: #f8f9fa;
+		/*  font-family: Arial, sans-serif;*/
+	}
+
+#AddStudentModal .modal-body{
+	max-height:80vh;
+	overflow-y:auto; 
+}
+
+#StudentListModal .modal-body{
+	max-height:80vh;
+	overflow-y:auto; 
+}
+
+#EditStudentListModal .modal-body{
+	max-height:80vh;
+	overflow-y:auto; 
+}
+
+#SpecificStudentModal .modal-body{
+	max-height:80vh;
+	overflow-y:auto; 
+	
+}
+
+#AadharFileModal .modal-body{
+	max-height:80vh;
+	overflow-y:auto; 
+}
+.border-bottom label{
+	font-weight: bold;
+}
+
+.border-bottom span{
+	padding-left: 10px;	
+} 
+.mb-3 span{
+	padding-left: 10px;	
+}
+/* .sno-column {
+    width: 10%; 
+  }
+ .action-column{
+ 	 width: 60%; 
+  } */
+  
+  #info_container label{
+  	font-weight: bold;
+  }
+</style>
+
+<body>
+	<div class="card">
+		<div class="card-header">
+			<b>Student Registration for Class</b><span th:text="${userId}" style="display:none;" id="userIdSpan"></span>
+		</div>
+		<div class="card-body">
+		
+		<div class="row mb-4 p-2" style="border: 2px solid gray;border-radius: 10px;" id="info_container">
+			<div class="col-4">
+				<label for="tot_stu_count">Total Student count:</label>
+				<input type="text" class="form-control" id="tot_stu_count" readonly="readonly">
+			</div>
+			<div class="col-4">
+				<label for="aadhar_enroll_count">Aadhar Enrolled student count:</label>
+				<input type="text" class="form-control" id="aadhar_enroll_count" readonly="readonly">
+			</div>
+			<div class="col-4">
+				<label for="pending_enroll_count">Pending Enroll student count:</label>
+				<input type="text" class="form-control" id="pending_enroll_count" readonly="readonly">
+			</div>
+		</div>
+
+			<table id="StudentEntrytable"
+				class="table table-striped table-bordered table-hover dataTable"
+				role="grid" style="width: 100%">
+				<thead class="thead-dark">
+					<tr>
+						<th class="text-center">S.NO</th>
+						<th class="text-center">Standard</th>
+						<th class="text-center">Students Enrolled</th>
+						<th class="text-center">Action</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr>
+
+					</tr>
+
+				</tbody>
+			</table>
+
+		</div>
+		<div class="card-footer text-center">
+			<button  class="btn btn-secondary" id="studentBackBtn">Back</button>
+		</div>
+		
+	</div>
+	
+	
+	<!-- Add Student Modal -->
+		<div class="modal fade" id="AddStudentModal" tabindex="-1" aria-labelledby="AddStudentModalLabel" aria-hidden="true" >
+			<div class="modal-dialog modal-lg">
+				<div class="modal-content">
+					<div class="modal-header">
+						<h5 class="modal-title" id="AddStudentModalTitle">Add Student</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 id="student_id" style="display: none;"></div>						
+				    <div id="raw_father_file" style="display: none;"></div>
+				     <div id="raw_mother_file" style="display: none;"></div>
+				      <div id="raw_guardian_file" style="display: none;"></div>
+				       <div id="raw_student_file" style="display: none;"></div>
+				       
+				       <div id="previous_father_aadhar" style="display: none;"></div>
+				       <div id="previous_mother_aadhar" style="display: none;"></div>
+				       <div id="previous_guardian_aadhar" style="display: none;"></div>
+				       <div id="previous_student_aadhar" style="display: none;"></div>
+				       				      
+						<form id="studentForm">
+			                <div class="form-row">
+			                    <div class="form-group col-md-6">
+			                        <label for="studentName">Student Name<span style="color: red;">*</span></label>
+			                        <input type="text" class="form-control" id="studentName" placeholder="Enter student name">
+			                    </div>
+			                    <div class="form-group col-md-6">
+			                        <label for="EmisNumber">Student EMIS Number<span style="color: red;">*</span></label>
+			                        <input type="number" class="form-control" id="EmisNumber" placeholder="Enter EMIS number">
+			                    </div>
+			                </div>
+			                
+			                 <div class="form-row">
+			                 
+			                 	<div class="form-group col-md-6">
+			                        <label for="standard">Standard</label>
+			                        <input type="text" class="form-control" id="standard" readonly="readonly">
+			                    </div>
+			                    
+			                    <div class="form-group col-md-6">
+			                        <label for="section">Section<span style="color: red;">*</span></label>
+			                        <!-- <input type="text" class="form-control" id="section"> -->
+			                        <select class="form-control" id="sectionDropdown">
+							            <option selected disabled>Choose...</option>						           
+							        </select>
+			                    </div>
+			                 
+			                 </div>
+			
+			                <div class="form-row">
+			                
+			                
+			                	<div class="form-group col-md-6">
+							        <label for="medium">Medium<span style="color: red;">*</span></label>
+							        <select class="form-control" id="medium">
+							            <option selected disabled>Choose...</option>						           
+							        </select>
+							    </div>
+			                
+			                	 <div class="form-group col-md-6">
+							        <label for="gender">Gender<span style="color: red;">*</span></label>
+							        <select class="form-control" id="gender">
+							            <option selected disabled>Choose...</option>
+							            <option value="boy">Boy</option>
+							            <option value="girl">Girl</option>
+							            <option value="transgender">Transgender</option>
+							        </select>
+							    </div>
+			                   
+			                   
+			                    
+			                </div>
+			                
+			                <div class="form-row">
+			                
+			               		<div class="form-group col-md-6">
+			                        <label for="dob">Date of Birth<span style="color: red;">*</span></label>
+			                        <input type="date" class="form-control" id="dob" onclick="this.showPicker()">
+			                    </div>
+			                    <div class="form-group col-md-6">
+			                        <label for="age">Age</label>
+			                        <input type="number" class="form-control" id="age"  readonly="readonly">
+			                    </div>
+						    
+						    </div>
+						    
+						    
+						    
+						    <div class="form-row">
+			                
+			                	 <div class="form-group col-md-6">
+							        <label for="parentType">Select Parent Type<span style="color: red;">*</span></label>
+							        <select class="form-control" id="parentType">
+							            <option value="" disabled>--Select--</option>
+							            <option value="Parent">Parent</option>
+							            <option value="SingleParent_Father">Single Parent/Father</option>
+							            <option value="SingleParent_Mother">Single Parent/Mother</option>
+							            <option value="Guardian">Guardian</option>
+							        </select>
+							    </div>			                   			                  
+			                    
+			                </div>
+			                
+			                <div id="singleParentFatherDiv" style="display: none;">
+			                	
+			                	
+			                	<div class="form-row">
+			                    
+				                    <div class="form-group col-md-6">
+				                        <label for="sfatherName">Father Name<span style="color: red;">*</span></label>
+				                        <input type="text" class="form-control" id="sfatherName" placeholder="Enter father name">
+				                    </div>
+				                    <div class="form-group col-md-6">
+				                        <label for="sfatherMobile">Father Mobile Number<span style="color: red;">*</span></label>
+				                        <input type="number" class="form-control" id="sfatherMobile" placeholder="Enter father mobile">
+				                    </div>
+				                </div>
+			                    
+			                    <div class="form-row">
+			                    
+				                    <div class="form-group col-md-6">
+				                        <label for="sfatherAadhar">Father Aadhar Number<span style="color: red;">*</span></label>
+				                        <input type="number" class="form-control" id="sfatherAadhar" placeholder="Enter father Aadhar number">
+				                    </div>
+				                     <div class="form-group col-md-6">
+				                        <label for="sfatherAadharUpload">Father Aadhar Upload<span style="color: red;">*</span></label>
+				                        <input type="file" class="form-control-file" id="sfatherAadharUpload">
+				                        <div id="sFatherAadharPreview" class="mt-2" style="display: none;"></div>
+				                    </div>
+			               
+			                  </div>
+			                
+			                </div>
+			                
+			                <div id="singleParentMotherDiv" style="display: none;">
+			                	
+			                	
+			                	<div class="form-row">
+			                    				                    
+				                    <div class="form-group col-md-6">
+				                        <label for="smotherName">Mother Name<span style="color: red;">*</span></label>
+				                        <input type="text" class="form-control" id="smotherName" placeholder="Enter mother name">
+				                    </div>
+				                     <div class="form-group col-md-6">
+				                        <label for="smotherMobile">Mother Mobile Number<span style="color: red;">*</span></label>
+				                        <input type="number" class="form-control" id="smotherMobile" placeholder="Enter mother mobile">
+			                    	</div>
+			                	</div>
+			                	
+			                	<div class="form-row">
+			                    			                    
+				                    <div class="form-group col-md-6">
+				                        <label for="smotherAadhar">Mother Aadhar Number<span style="color: red;">*</span></label>
+				                        <input type="number" class="form-control" id="smotherAadhar" placeholder="Enter mother Aadhar number">
+				                    </div>
+				                    
+				                    <div class="form-group col-md-6">
+				                        <label for="smotherAadharUpload">Mother Aadhar Upload<span style="color: red;">*</span></label>
+				                        <input type="file" class="form-control-file" id="smotherAadharUpload">
+				                         <div id="sMotherAadharPreview" class="mt-2" style="display: none;"></div>
+				                    </div>
+			                    
+			                	</div>
+			                
+			                </div>
+						    
+						    <div id="guardianDiv" style="display: none;">
+			                
+			              
+			                
+			                <div class="form-row">
+			                    				                    
+				                    <div class="form-group col-md-6">
+				                        <label for="guardianName">Guardian Name<span style="color: red;">*</span></label>
+				                        <input type="text" class="form-control" id="guardianName" placeholder="Enter mother name">
+				                    </div>
+				                     <div class="form-group col-md-6">
+				                        <label for="guardianMobile">Guardian Mobile Number<span style="color: red;">*</span></label>
+				                        <input type="number" class="form-control" id="guardianMobile" placeholder="Enter mother mobile">
+			                    	</div>
+			                	</div>
+			                	
+			                	<div class="form-row">
+			                    			                    
+				                    <div class="form-group col-md-6">
+				                        <label for="guardianAadhar">Guardian Aadhar Number<span style="color: red;">*</span></label>
+				                        <input type="number" class="form-control" id="guardianAadhar" placeholder="Enter mother Aadhar number">
+				                    </div>
+				                    
+				                    <div class="form-group col-md-6">
+				                        <label for="guardianAadharUpload">Guardian Aadhar Upload<span style="color: red;">*</span></label>
+				                        <input type="file" class="form-control-file" id="guardianAadharUpload">
+				                        <div id="GuardianAadharPreview" class="mt-2" style="display: none;"></div>
+				                        				                        
+				                    </div>
+			                    
+			                	</div>
+			                	
+			                	<div class="form-row">
+			                    
+			                    <div class="form-group col-md-6">
+			                        <label for="gfatherName">Father Name</label>
+			                        <input type="text" class="form-control" id="gfatherName" placeholder="Enter father name">
+			                    </div>
+			                    <div class="form-group col-md-6">
+			                        <label for="gmotherName">Mother Name</label>
+			                        <input type="text" class="form-control" id="gmotherName" placeholder="Enter mother name">
+			                    </div>
+			                </div>
+			
+			                <div class="form-row">
+			                    <div class="form-group col-md-6">
+			                        <label for="gfatherMobile">Father Mobile Number</label>
+			                        <input type="number" class="form-control" id="gfatherMobile" placeholder="Enter father mobile">
+			                    </div>
+			                    <div class="form-group col-md-6">
+			                        <label for="gmotherMobile">Mother Mobile Number</label>
+			                        <input type="number" class="form-control" id="gmotherMobile" placeholder="Enter mother mobile">
+			                    </div>
+			                </div>
+			
+			                <div class="form-row">
+			                    
+			                    <div class="form-group col-md-6">
+			                        <label for="gfatherAadhar">Father Aadhar Number</label>
+			                        <input type="number" class="form-control" id="gfatherAadhar" placeholder="Enter father Aadhar number">
+			                    </div>
+			                    <div class="form-group col-md-6">
+			                        <label for="gmotherAadhar">Mother Aadhar Number</label>
+			                        <input type="number" class="form-control" id="gmotherAadhar" placeholder="Enter mother Aadhar number">
+			                    </div>
+			                </div>
+			
+			                <div class="form-row">
+			                    
+			                    <div class="form-group col-md-6">
+			                        <label for="gfatherAadharUpload">Father Aadhar Upload</label>
+			                        <input type="file" class="form-control-file" id="gfatherAadharUpload">
+			                        <div id="gFatherAadharPreview" class="mt-2" style="display: none;"></div>
+			                    </div>
+			                    <div class="form-group col-md-6">
+			                        <label for="gmotherAadharUpload">Mother Aadhar Upload</label>
+			                        <input type="file" class="form-control-file" id="gmotherAadharUpload">
+			                        <div id="gMotherAadharPreview" class="mt-2" style="display: none;"></div>
+			                    </div>
+			                </div>			                			           		                
+			                
+			                </div>
+						    
+							<div id="parentDiv" style="display: none;">
+							
+							<p style="color:orange;margin-bottom: 0px;">You can enter either Father’s / Mother’s or both their details (If available).</p>
+							
+			                <div class="form-row">
+			                    
+			                    <div class="form-group col-md-6">
+			                        <label for="fatherName">Father Name<span style="color: red;">*</span></label>
+			                        <input type="text" class="form-control" id="fatherName" placeholder="Enter father name">
+			                    </div>
+			                    <div class="form-group col-md-6">
+			                        <label for="motherName">Mother Name<span style="color: red;">*</span></label>
+			                        <input type="text" class="form-control" id="motherName" placeholder="Enter mother name">
+			                    </div>
+			                </div>
+			
+			                <div class="form-row">
+			                    <div class="form-group col-md-6">
+			                        <label for="fatherMobile">Father Mobile Number</label>
+			                        <input type="number" class="form-control" id="fatherMobile" placeholder="Enter father mobile">
+			                    </div>
+			                    <div class="form-group col-md-6">
+			                        <label for="motherMobile">Mother Mobile Number</label>
+			                        <input type="number" class="form-control" id="motherMobile" placeholder="Enter mother mobile">
+			                    </div>
+			                </div>
+			
+			                <div class="form-row">
+			                    
+			                    <div class="form-group col-md-6">
+			                        <label for="fatherAadhar">Father Aadhar Number</label>
+			                        <input type="number" class="form-control" id="fatherAadhar" placeholder="Enter father Aadhar number">
+			                    </div>
+			                    <div class="form-group col-md-6">
+			                        <label for="motherAadhar">Mother Aadhar Number</label>
+			                        <input type="number" class="form-control" id="motherAadhar" placeholder="Enter mother Aadhar number">
+			                    </div>
+			                </div>
+			
+			                <div class="form-row">
+			                    
+			                    <div class="form-group col-md-6">
+			                        <label for="fatherAadharUpload">Father Aadhar Upload</label>
+			                        <input type="file" class="form-control-file" id="fatherAadharUpload">
+			                         <div id="FatherAadharPreview" class="mt-2" style="display: none;"></div>
+			                    </div>
+			                    <div class="form-group col-md-6">
+			                        <label for="motherAadharUpload">Mother Aadhar Upload</label>
+			                        <input type="file" class="form-control-file" id="motherAadharUpload">
+			                         <div id="MotherAadharPreview" class="mt-2" style="display: none;"></div>
+			                    </div>
+			                </div>
+			                
+			                </div>
+			                
+			                <div class="form-row">
+			                
+		               		 	<div class="form-group col-md-6">
+			                        <label for="studentAadhar">Student Aadhar Number</label>
+			                        <input type="number" class="form-control" id="studentAadhar" placeholder="Enter father Aadhar number">
+			                    </div>
+			                     <div class="form-group col-md-6">
+			                        <label for="studentAadharUpload">Student Aadhar Upload</label>
+			                        <input type="file" class="form-control-file" id="studentAadharUpload">
+			                         <div id="studentAadharPreview" class="mt-2" style="display: none;"></div>
+			                    </div>
+						    
+						    </div>
+			
+			                <div class="form-row ">
+			                    <div class="col-12 d-flex justify-content-center mt-4 mb-4">
+			                    	<button type="button" class="btn btn-primary" id="saveStudentdDetails">Save</button>
+			                    	<button type="button" class="btn btn-primary" id="updateStudentdDetails" style="display: none;">Update</button>
+			                    </div>			           
+			                </div>
+			            </form>
+
+					</div>
+				</div>
+			</div>
+		</div>
+		
+		
+		<!-- View Students List -->
+		<div class="modal fade" id="StudentListModal" tabindex="-1" aria-labelledby="StudentListModalLabel" aria-hidden="true">
+	    <div class="modal-dialog modal-lg">
+	        <div class="modal-content">
+	            <div class="modal-header">
+	                <h5 class="modal-title" id="StudentListModalTitle">Student List</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">
+	                
+	             <table id="StudentListDatatable"
+						class="table table-striped table-bordered table-hover dataTable"
+						role="grid" style="width: 100%">
+						<thead class="thead-dark">
+							<tr>
+								<th class="text-center">S.NO</th>
+								<th class="text-center">Name</th>
+								<th class="text-center">EMIS Number</th>
+								<th class="text-center no-sort">Action</th>
+							</tr>
+						</thead>
+						<tbody>
+
+		
+						</tbody>
+					</table>  
+	                
+	            </div>
+	        </div>
+	    </div>
+	</div>
+	
+	
+	<!-- Particular Student Details -->
+	<div class="modal fade" id="SpecificStudentModal" tabindex="-1" aria-labelledby="SpecificStudentModalLabel" aria-hidden="true">
+	    <div class="modal-dialog modal-xl">
+	        <div class="modal-content">
+	            <div class="modal-header">
+	                <h5 class="modal-title" id="SpecificStudentModalTitle">Student Details</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="container-fluid">
+					    <!-- Student Info -->
+					    <div class="mb-3 border-bottom pb-2">
+					        <h5 class="text-primary">Student Information</h5>
+					        <div class="row">
+					            <div class="col-md-4"><label>Name:</label> <span id="viewstudentName"></span></div>
+					            <div class="col-md-4"><label>EMIS No:</label> <span id="viewEmisNumber"></span></div>
+					            <div class="col-md-4"><label>Gender:</label> <span id="viewgender"></span></div>
+					        </div>
+					        <div class="row mt-2">
+					            <div class="col-md-4"><label>Standard:</label> <span id="viewstandard"></span></div>
+					            <div class="col-md-4"><label>Date of Birth:</label> <span id="viewdob"></span></div>
+					            <div class="col-md-4"><label>Age:</label> <span id="viewage"></span></div>
+					        </div>
+					        <div class="row mt-2">					         			   				    				 
+				    			<div class="col-md-4"><label>Section:</label> <span id="viewsection"></span></div>
+				    			<div class="col-md-4"><label>Medium:</label> <span id="viewmedium"></span></div>
+					            <div class="col-md-4"><label>Student Aadhar Number:</label> <span id="viewstudentAadharNumber"></span></div>
+					        </div>
+					    </div>
+					
+					    <!-- Parent Info -->
+					    <div class="mb-3 border-bottom pb-2">
+					        <h5 class="text-primary">Parent/Guardian Information</h5>
+					         <div class="row">
+					            <div class="col-md-4"><label>Parent Type:</label> <span id="viewparentType"></span></div>					            
+					        </div>
+					        <div class="row">
+					            <div class="col-md-4"><label>Father Name:</label> <span id="viewfatherName"></span></div>
+					            <div class="col-md-4"><label>Mother Name:</label> <span id="viewmotherName"></span></div>
+					            <div class="col-md-4"><label>Guardian Name:</label> <span id="viewguardianName"></span></div>
+					        </div>
+					        <div class="row mt-2">
+					            <div class="col-md-4"><label>Father Mobile:</label> <span id="viewfatherMobile"></span></div>
+					            <div class="col-md-4"><label>Mother Mobile:</label> <span id="viewmotherMobile"></span></div>
+					            <div class="col-md-4"><label>Guardian Mobile:</label> <span id="viewguardianMobile"></span></div>
+					        </div>
+					        <div class="row mt-2">
+					            <div class="col-md-4"><label>Father Aadhar:</label> <span id="viewfatherAadhar"></span></div>
+					            <div class="col-md-4"><label>Mother Aadhar:</label> <span id="viewmotherAadhar"></span></div>
+					            <div class="col-md-4"><label>Guardian Aadhar:</label> <span id="viewguardianAadhar"></span></div>
+					        </div>
+					    </div>
+					
+					    <!-- Aadhar File Views -->
+					    <div class="mb-3">
+					        <h5 class="text-primary">Aadhar File Uploads</h5>
+					        <div class="row">
+					            <div class="col-md-4"><label>Father Aadhar File:</label> <span id="viewfatherAadharUpload"></span></div>
+					            <div class="col-md-4"><label>Mother Aadhar File:</label> <span id="viewmotherAadharUpload"></span></div>
+					            <div class="col-md-4"><label>Guardian Aadhar File:</label> <span id="viewguardianAadharUpload"></span></div>
+					        </div>
+					        <div class="row mt-2">
+					            <div class="col-md-4"><label>Student Aadhar File:</label> <span id="viewstudentAadharUpload"></span></div>
+					        </div>
+					    </div>
+					</div>
+	              
+	                
+	            </div>
+	        </div>
+	    </div>
+	</div>
+	
+	
+
+ 			<div class="modal fade" id="docModal" tabindex="-1" aria-hidden="true">
+				  <div class="modal-dialog modal-dialog-scrollable modal-xl">
+				    <div class="modal-content border-0">
+				     <div class="modal-header">
+				        <h5 class="modal-title">Aadhar Document</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 p-0 text-center" style="background-color: #f8f9fa;">
+				        <div id="docContainer" style="max-height: 90vh; overflow: auto;"></div>
+				      </div>
+				    </div>
+				  </div>
+				</div>
+				
+				
+		<!-- View Students List -->
+		<!-- <div class="modal fade" id="EditStudentListModal" tabindex="-1" aria-labelledby="EditStudentListModalLabel" aria-hidden="true">
+	    <div class="modal-dialog modal-lg">
+	        <div class="modal-content">
+	            <div class="modal-header">
+	                <h5 class="modal-title" id="EditStudentListModalTitle">Student List</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">
+	                
+	             <table id="EditStudentListDatatable"
+						class="table table-striped table-bordered table-hover dataTable"
+						role="grid" style="width: 100%">
+						<thead class="thead-dark">
+							<tr>
+								<th class="text-center">S.NO</th>
+								<th class="text-center">Name</th>								
+								<th class="text-center">EMIS Number</th>
+								<th class="text-center">Action</th>
+							</tr>
+						</thead>
+						<tbody>
+
+		
+						</tbody>
+					</table>  
+	                
+	            </div>
+	        </div>
+	    </div>
+	</div> -->
+	
+			<div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
+				    <div style="position: relative; top: 50%; transform: translateY(-50%);">
+				        <div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
+				            <span class="sr-only">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>
+	
+
+	<script th:replace="~{fragments/modules/base/script :: script}"></script>
+	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
+	
+	<script>
+	
+let globalUdise = "";	
+const srurlParams = new URLSearchParams(window.location.search);
+const srschoolId = srurlParams.get("schoolId");
+let userId = document.getElementById('userIdSpan').textContent;
+console.log("userId="+userId);
+$(document).ready(function () {
+	
+	
+	$.ajax({
+		type: 'GET',
+		url: '/gcc/api/gccschool/schoolproperty/getSchoolDetails',
+		data: {schoolId: srschoolId},
+		success: function (data) {
+			//console.log(data);
+			if(data.udise){
+				globalUdise = data.udise;
+				loadSavedStandards(globalUdise);
+				
+				displayinfo(srschoolId,globalUdise);
+			}
+			else{
+				console.log("No UDISE Found");
+			}
+		},
+		error: function () {
+	        alert("Error calling in display standards API!");
+	    }
+	});
+	
+	
+	
+	
+		let mediumDropdown = document.getElementById('medium');	
+	
+		fetch('/gcc/api/gccschool/studentInfo/getMedium') 
+	    .then(response => response.json())
+	    .then(data => {
+	        // Clear existing options
+	        mediumDropdown.innerHTML = `<option value="">Choose...</option>`;
+	
+	        // Add options from the API response
+	        data.Data.forEach(medium => {
+	        	mediumDropdown.innerHTML += `<option value="${medium.medium_type}">${medium.medium_type}</option>`;
+	        });
+	    })
+	    .catch(error => {
+	        console.error('Error fetching in Medium Dropdown:', error);
+	    });
+		
+		
+		let sectionDropdown = document.getElementById('sectionDropdown');	
+		
+		fetch('/gcc/api/gccschool/studentInfo/getSections') 
+	    .then(response => response.json())
+	    .then(data => {
+	        // Clear existing options
+	        sectionDropdown.innerHTML = `<option value="">Choose...</option>`;
+	
+	        // Add options from the API response
+	        data.Data.forEach(section => {
+	        	sectionDropdown.innerHTML += `<option value="${section.section}">${section.section}</option>`;
+	        });
+	    })
+	    .catch(error => {
+	        console.error('Error fetching in Section Dropdown:', error);
+	    });
+		    
+
+	    $('#parentType').change(function () {
+	        const selectedType = $(this).val();
+
+	         $('#singleParentFatherDiv,#singleParentMotherDiv, #guardianDiv, #parentDiv').hide().each(function () {
+	            // Reset all input, select, and textarea fields inside each div
+	            $(this).find('input, select, textarea').each(function () {
+	                if ($(this).attr('type') === 'file') {
+	                    // Replace file input with its clone to clear safely
+	                    //$(this).replaceWith($(this).clone());
+	                     $(this).val(''); // Better than replacing
+	                } else {
+	                    $(this).val('');
+	                }
+	            });
+	        }); 
+	        
+
+	        // Show the selected one
+	        if (selectedType === 'Parent') {
+	            $('#parentDiv').show();
+	            $('#FatherAadharPreview').hide();
+	            $('#MotherAadharPreview').hide();
+	        } else if (selectedType === 'SingleParent_Father') {
+	            $('#singleParentFatherDiv').show();	            
+	            $('#sFatherAadharPreview').hide();
+	        } else if (selectedType === 'SingleParent_Mother') {
+	            $('#singleParentMotherDiv').show();	            
+	            $('#sMotherAadharPreview').hide();
+	        } else if (selectedType === 'Guardian') {
+	            $('#guardianDiv').show();	            
+	            $('#GuardianAadharPreview').hide();
+	            $('#gFatherAadharPreview').hide();
+	            $('#gMotherAadharPreview').hide();
+	        }
+	        else{
+	        	 $('#parentType').val('');
+	        }
+	    });
+	    
+	    $(document).on('change', '#fatherAadharUpload, #motherAadharUpload, #sfatherAadharUpload, #smotherAadharUpload, #gfatherAadharUpload, #guardianAadharUpload, #gmotherAadharUpload, #studentAadharUpload', function () {
+	        let file = this.files[0];
+
+	        if (file) {
+	        	//console.log("file="+file);
+	            const allowedTypes = ['application/pdf', 'image/jpeg', 'image/jpg'];
+	            const fileType = file.type.toLowerCase();
+	            const maxSize = 3 * 1024 * 1024;
+
+	            if (!allowedTypes.includes(fileType)) {
+	                Swal.fire({
+	                    icon: 'error',
+	                    title: 'Invalid File Type',
+	                    text: 'Only PDF, JPG, or JPEG files are allowed.'
+	                });
+
+	                // Clear the invalid file
+	                $(this).val('');   
+	                return;
+	            }
+	            
+	            if (file.size > maxSize) {
+	                Swal.fire({
+	                    icon: 'warning',
+	                    title: 'File Too Large',
+	                    text: 'File size should not exceed 3 MB.'
+	                });
+	                $(this).val(''); // Clear large file
+	                return;
+	            }
+	            
+	        }
+	    });
+	    
+	    $(document).on('input', '#fatherMobile, #motherMobile, #EmisNumber, #sfatherMobile, #smotherMobile, #guardianMobile, #gfatherMobile, #gmotherMobile', function () {
+	        let val = $(this).val();
+
+	        // Remove non-digit characters just in case and limit to 10 digits
+	        val = val.replace(/\D/g, '').slice(0, 10);
+	        
+	        $(this).val(val);
+	    });
+	    
+	    $(document).on('input', '#studentName, #fatherName, #motherName, #sfatherName, #smotherName, #guardianName,#gfatherName,#gmotherName', function () {
+	        let val = $(this).val();
+
+	        // Allow only letters (a-z, A-Z), space, and dot
+	        val = val.replace(/[^a-zA-Z\s.]/g, '');
+	        
+	        $(this).val(val);
+	    });
+	    
+	    $(document).on('input', '#fatherAadhar, #motherAadhar, #sfatherAadhar, #smotherAadhar, #guardianAadhar, #gfatherAadhar, #gmotherAadhar,#studentAadhar', function () {
+	        let val = $(this).val();
+
+	        // Remove non-digit characters just in case and limit to 10 digits
+	        val = val.replace(/\D/g, '').slice(0, 12);
+	        
+	        $(this).val(val);
+	    });
+	    
+	    
+	     
+	});
+	
+
+
+  function openDocModal(fileUrl) {
+      const container = document.getElementById('docContainer');
+      const ext = fileUrl.split('.').pop().toLowerCase();
+
+      if (ext === 'pdf') {
+          container.innerHTML = `<iframe src="${fileUrl}" style="width:100%; height:90vh;" frameborder="0"></iframe>`;
+      } else {
+          container.innerHTML = `<img src="${fileUrl}" class="img-fluid" style="max-height:90vh; max-width:100%;">`;
+      }
+
+      $('#docModal').modal('show');
+  }  
+
+	let buttons1 = [
+		{
+			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',
+			title: 'School Standard List'
+		},
+		{
+			extend: 'csvHtml5',
+			text: 'CSV',
+			className: 'btn btn-secondary',
+			id: 'csvBtn',
+			title: 'School Standard List'
+		},
+		{
+			extend: 'pdfHtml5',
+			text: 'PDF',
+			className: 'btn btn-secondary',
+			id: 'pdfBtn',
+			title: 'School Standard List'
+		},
+		{
+			extend: 'print',
+			text: 'Print',
+			className: 'btn btn-secondary',
+			id: 'printBtn',
+			title: 'School Standard List',
+			exportOptions: {
+				columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
+			}
+		}
+	];
+	
+	function loadSavedStandards(globalUdise) {
+		//console.log("start");
+		$.get('/gcc/api/gccschool/studentInfo/getStandards', {udise: globalUdise}, res => {
+			
+
+			if (res.Message === "Success") {
+				//console.log("res="+res);
+				if ($.fn.DataTable.isDataTable('#StudentEntrytable')) {
+					$('#StudentEntrytable').DataTable().clear().destroy(true);
+				}
+
+				$('#StudentEntrytable').DataTable({
+					data: res.Data,
+					columns: [
+						{data: null, render: (d, t, r, m) => m.row + 1,class:"text-center"},
+						{data: 'Designation',class:"text-center"},
+						{data: 'Student_Count',class:"text-center"},
+						{
+				            data: 'Designation',
+				            render: (designation) => `
+				                <div class="text-center">
+				                    <button class="btn btn-sm btn-primary schooladd-btn" data-design-name="${designation}">
+				                        <i class="ik ik-plus"></i>Add
+				                    </button>
+				                    <button class="btn btn-sm btn-success ml-2 schoolview-btn" data-designs-name="${designation}">
+				                        <i class="ik ik-eye"></i>View
+				                    </button>				                      
+				                </div>`
+				        }
+					],
+					lengthMenu: [
+						[50, 100, 200, 500, -1],
+						['50 rows', '100 rows', '200 rows', '500 rows', 'Show all']
+					],
+
+					dom: 'Bftip',
+					autoWidth: false,
+					fixedColumns: {left: 0, right: 0},
+					scrollY: '60vh',
+					scrollCollapse: true,
+					buttons: [buttons1],
+					responsive: false,
+					searching: true,
+					select: false,
+					processing: false,
+				});
+			} else {
+				$('#StudentEntrytable tbody').html('<tr><td colspan="3" class="text-center text-danger">No Data found</td></tr>');
+			}
+		});
+	}
+	
+function displayinfo(srschoolId,globalUdise){
+		
+		$.ajax({
+			type: 'GET',
+			url: '/gcc/api/gccschool/studentInfo/checkStudent',
+			data: {schoolId: srschoolId,udise:globalUdise},
+			success: function (data) {
+				if (data.Status === "Sucess") {
+		            $("#tot_stu_count").val(data.Student_Strength);
+		            $("#aadhar_enroll_count").val(data.Aadhar_strength);
+		            $("#pending_enroll_count").val(data.Allowable_strength);
+		        } else {
+		            //alert("Failed to fetch student info!");
+		        	Swal.fire({
+	                    icon: 'error',
+	                    title: data.Status,
+	                    text: data.Message
+	                });
+		        }
+			},
+			error: function () {
+		        alert("Error calling in display info API!");
+		    }
+		});
+		
+	}
+	
+	$(document).on('click', '.schooladd-btn', function () {
+		
+		let allow=$("#pending_enroll_count").val();
+		if (allow>0){
+			let standard = $(this).data('design-name');
+			sentAddStudent(standard);
+		}
+		else{
+			Swal.fire({
+		        icon: 'warning',
+		        title: 'Entry Restricted',
+		        text: 'The maximum student entry for the school has been exceeded. To add new data, you must first update the Student Count Master.'
+		    });
+		}
+					
+	}); 
+	$(document).on('click', '.schoolview-btn', function () {
+		let viewstandard = $(this).data('designs-name');
+		sentViewStudentList(viewstandard,globalUdise);
+					
+	});
+	
+	/* $(document).on('click', '.schooledit-btn', function () {
+		let editstandard = $(this).data('designs-name');
+		sentEditStudentList(editstandard,globalUdise);
+					
+	});  */
+	
+	$(document).on('click', '.view-student-btn', function () {
+		let studentview = $(this).data('student-id');
+		sentStudentDetails(studentview);
+					
+	});
+	
+	$(document).on('click', '.edit-student-btn', function () {
+		let studentedit = $(this).data('student-id');
+		sentEditStudentDetails(studentedit);
+					
+	});
+	$(document).on('click', '.delete-student-btn', function () {
+		let studentdelete = $(this).data('student-id');
+		let studentdeletename = $(this).data('student-name');
+		
+		Swal.fire({
+        	allowOutsideClick: false, 
+            allowEscapeKey: false, 
+            allowEnterKey: false, 
+            title: `Are you sure to delete "${studentdeletename}" Details ?`,
+		    icon: 'warning',
+		    showCancelButton: true,
+		    confirmButtonColor: 'blue',
+		    cancelButtonColor: 'grey',
+		    confirmButtonText: 'Yes', // Confirm button text
+		    cancelButtonText: 'No', // Cancel button text		    
+		}).then((result) => {
+            if (result.isConfirmed) {
+            	sentDeleteStudentDetails(studentdelete);
+            } 
+        });		
+		
+					
+	});
+	
+	
+$(document).on('click', '#saveStudentdDetails', function (e) {
+	
+		//console.log("Father Aadhar Input Exists:", $('#fatherAadharUpload').length);
+		//console.log("Mother Aadhar Input Exists:", $('#motherAadharUpload').length);
+			
+		let studentName = $('#studentName').val().trim();
+	    let EmisNumber = $('#EmisNumber').val().trim();
+	    let gender = $('#gender').val();
+	    let section = $('#sectionDropdown').val();
+	    let medium = $('#medium').val();                  
+	    let dob = $('#dob').val();
+	    let age = $('#age').val();
+	    let parentType = $('#parentType').val();
+	    let sentstandard = $('#standard').val();
+	    let studentAadhar = $('#studentAadhar').val();
+	    let studentAadharUpload = $('#studentAadharUpload')[0].files[0];
+	    
+	    //console.log(" medium  section"+medium ,section);
+	    
+	    if (!studentName || !EmisNumber || !gender || !dob || !parentType || !medium || !section) {
+	        Swal.fire('Validation Error', 'Please fill in all required fields marked with *', 'warning');
+	        return;
+	    }
+	    
+	    if (!/^[A-Za-z\s.]+$/.test(studentName) ) {				
+			 Swal.fire({
+			        icon: 'warning',
+			        title: 'Validation Error',
+			        text: 'Name should contain only alphabets.'
+			    });
+			    return;
+		}
+	    
+	    if (!/^\d{10}$/.test(EmisNumber)) {
+		    Swal.fire({
+		        icon: 'warning',
+		        title: 'Validation Error',
+		        text: 'Please enter 10-digit EMIS number.'
+		    });
+		    return;
+		}
+	    
+	    if (!/^[A-Za-z0-9-]{1,4}$/.test(section)) {
+	        Swal.fire({
+	            icon: 'warning',
+	            title: 'Validation Error',
+	            text: 'Section can have 1 to 4 characters, using only letters, numbers, or hyphens(-).'
+	        });
+	        return;
+	    }
+	    
+	    if(studentAadhar){
+	    	
+	    	if (!/^\d{12}$/.test(studentAadhar)) {
+			    Swal.fire({
+			        icon: 'warning',
+			        title: 'Validation Error',
+			        text: 'Please enter a valid 12-digit Aadhar number.'
+			    });
+			    return;
+			}
+	    }
+	    
+	    
+	    const formData = new FormData();
+
+	    // Required fields
+	    formData.append("student_name", studentName);
+	    formData.append("emis_no", EmisNumber);
+	    formData.append("gender", gender);
+	    formData.append("std", sentstandard);
+	    formData.append("dob", dob);
+	    formData.append("age", age);
+	    formData.append("parent_type", parentType);
+	    formData.append("section",section);
+	    formData.append("medium",medium);
+	    
+	    formData.append("student_aadhar", studentAadhar);
+	    formData.append("student_aadhar_file", studentAadharUpload);
+	    formData.append("udise", globalUdise);
+	    
+	 // Conditional: Parent details
+	    if (parentType === 'Parent') {
+	        let fatherName = $('#fatherName').val().trim();
+	        let motherName = $('#motherName').val().trim();
+	        let fatherMobile = $('#fatherMobile').val().trim();
+	        let motherMobile = $('#motherMobile').val().trim();
+	        let fatherAadhar = $('#fatherAadhar').val().trim();
+	        let motherAadhar = $('#motherAadhar').val().trim();
+	        let fatherAadharUpload = $('#fatherAadharUpload')[0].files[0];	        							
+	        let motherAadharUpload = $('#motherAadharUpload')[0].files[0]; 
+	        
+	        
+	        let fatherAadharUploads = document.getElementById("fatherAadharUpload")?.files?.[0] ;
+	        let motherAadharUploads = document.getElementById("motherAadharUpload")?.files?.[0] ;
+
+	        //console.log("Father Aadhar Upload File: ", fatherAadharUploads);
+	        //console.log("Mother Aadhar Upload File: ", motherAadharUploads);
+	        							 
+	        //console.log("Parent Details:");
+	        //console.log("Father Name: ", fatherName);
+	        //console.log("Mother Name: ", motherName);
+	        //console.log("Father Mobile: ", fatherMobile);
+	        //console.log("Mother Mobile: ", motherMobile);
+	        //console.log("Father Aadhar: ", fatherAadhar);
+	        //console.log("Mother Aadhar: ", motherAadhar);
+ 	        //console.log("Father Aadhar Upload File: ", fatherAadharUpload);
+	        //console.log("Mother Aadhar Upload File: ", motherAadharUpload); 
+	        
+		    
+
+/* 	        if (!fatherName || !motherName || !fatherMobile || !motherMobile || !fatherAadhar || !motherAadhar || !fatherAadharUpload || !motherAadharUpload) {
+	            Swal.fire('Error', 'Please complete parent details including Aadhar uploads.', 'error');
+	            return;
+	        }  */
+	        
+	        if(!fatherName || !motherName){
+	        	Swal.fire('Error', 'Please enter both father and mother name', 'error');
+	            return;
+	        }
+	        
+	        if (!/^[A-Za-z\s.]+$/.test(fatherName)  ||   !/^[A-Za-z\s.]+$/.test(motherName) ) {				
+				 Swal.fire({
+				        icon: 'warning',
+				        title: 'Validation Error',
+				        text: 'Name should contain only alphabets.'
+				    });
+				    return;
+			}
+	        
+	        formData.append("father_name", fatherName);
+	        formData.append("mother_name", motherName);
+	        
+	        if(fatherMobile || motherMobile){
+	        	
+	        	if(fatherMobile){
+	        		
+	        		if (!/^\d{10}$/.test(fatherMobile)) {
+	    			    Swal.fire({
+	    			        icon: 'warning',
+	    			        title: 'Validation Error',
+	    			        text: 'Please enter a valid 10-digit Father mobile number.'
+	    			    });
+	    			    return;
+	    			}
+	    		    
+	    		    if (/^0{10}$/.test(fatherMobile)) {
+	    			    Swal.fire({
+	    			        icon: 'warning',
+	    			        title: 'Validation Error',
+	    			        text: 'Father Mobile number cannot be all zeros.'
+	    			    });
+	    			    return;
+	    			}
+
+	    			if (fatherMobile.startsWith('0')) {
+	    			    Swal.fire({
+	    			        icon: 'warning',
+	    			        title: 'Validation Error',
+	    			        text: 'Father Mobile number cannot start with zero.'
+	    			    });
+	    			    return;
+	    			}
+
+	    			if (/^(\d)\1{9}$/.test(fatherMobile)) {
+	    			    Swal.fire({
+	    			        icon: 'warning',
+	    			        title: 'Validation Error',
+	    			        text: 'Father Mobile number cannot have all digits the same.'
+	    			    });
+	    			    return;
+	    			}
+	    			
+	    			formData.append("father_mobile", fatherMobile);
+	    			
+	        		
+	        		if(!fatherAadhar){
+	        			Swal.fire('warning', 'Please enter father aadhar number', 'warning');
+	    	            return;
+	        		}
+	        		if(fatherAadhar){
+	        			
+	        			if (!/^\d{12}$/.test(fatherAadhar)) {
+		    			    Swal.fire({
+		    			        icon: 'warning',
+		    			        title: 'Validation Error',
+		    			        text: 'Please enter a valid 12-digit Father Aadhar number.'
+		    			    });
+		    			    return;
+		    			}
+	        			
+	        			formData.append("father_aadhar", fatherAadhar);
+	        			
+	        			if(!fatherAadharUpload){
+	        				Swal.fire('warning', 'Please upload father aadhar file', 'warning');
+		    	            return;
+	        			}
+	        			
+	        		}
+	        		
+	        		
+	        	}
+	        	
+	        	if(motherMobile){
+	        		
+	        			        			        	    	        
+	    	        if (!/^\d{10}$/.test(motherMobile)) {
+	    			    Swal.fire({
+	    			        icon: 'warning',
+	    			        title: 'Validation Error',
+	    			        text: 'Please enter a valid 10-digit Mother mobile number.'
+	    			    });
+	    			    return;
+	    			}
+	    		    
+	    		    if (/^0{10}$/.test(motherMobile)) {
+	    			    Swal.fire({
+	    			        icon: 'warning',
+	    			        title: 'Validation Error',
+	    			        text: 'Mother Mobile number cannot be all zeros.'
+	    			    });
+	    			    return;
+	    			}
+
+	    			if (motherMobile.startsWith('0')) {
+	    			    Swal.fire({
+	    			        icon: 'warning',
+	    			        title: 'Validation Error',
+	    			        text: 'Mother Mobile number cannot start with zero.'
+	    			    });
+	    			    return;
+	    			}
+
+	    			if (/^(\d)\1{9}$/.test(motherMobile)) {
+	    			    Swal.fire({
+	    			        icon: 'warning',
+	    			        title: 'Validation Error',
+	    			        text: 'Mother Mobile number cannot have all digits the same.'
+	    			    });
+	    			    return;
+	    			}
+	    			
+	    			formData.append("mother_mobile", motherMobile);
+	    			
+	    			if(!motherAadhar){
+	        			Swal.fire('warning', 'Please enter mother aadhar number', 'warning');
+	    	            return;
+	        		}
+	        		if(motherAadhar){
+	        			
+	        			if (!/^\d{12}$/.test(motherAadhar)) {
+		    			    Swal.fire({
+		    			        icon: 'warning',
+		    			        title: 'Validation Error',
+		    			        text: 'Please enter a valid 12-digit Mother Aadhar number.'
+		    			    });
+		    			    return;
+		    			}
+	        			
+	        			formData.append("mother_aadhar", motherAadhar);
+	        			
+	        			if(!motherAadharUpload){
+	        				Swal.fire('warning', 'Please upload mother aadhar file', 'warning');
+		    	            return;
+	        			}
+	        			
+	        		}
+	        		
+	        	}
+	        }
+	        else{
+	        	Swal.fire('warning', 'Please enter atleast anyone  mobile number', 'warning');
+	            return;
+	        }
+	        
+	        
+	        
+	        /* if (!/^\d{10}$/.test(fatherMobile) || !/^\d{10}$/.test(motherMobile)) {
+			    Swal.fire({
+			        icon: 'warning',
+			        title: 'Validation Error',
+			        text: 'Please enter a valid 10-digit mobile number.'
+			    });
+			    return;
+			}
+		    
+		    if (/^0{10}$/.test(fatherMobile) || /^0{10}$/.test(motherMobile)) {
+			    Swal.fire({
+			        icon: 'warning',
+			        title: 'Validation Error',
+			        text: 'Mobile number cannot be all zeros.'
+			    });
+			    return;
+			}
+
+			if (fatherMobile.startsWith('0') ||  motherMobile.startsWith('0')) {
+			    Swal.fire({
+			        icon: 'warning',
+			        title: 'Validation Error',
+			        text: 'Mobile number cannot start with zero.'
+			    });
+			    return;
+			}
+
+			if (/^(\d)\1{9}$/.test(fatherMobile) || /^(\d)\1{9}$/.test(motherMobile)) {
+			    Swal.fire({
+			        icon: 'warning',
+			        title: 'Validation Error',
+			        text: 'Mobile number cannot have all digits the same.'
+			    });
+			    return;
+			}
+			
+			if (!/^\d{12}$/.test(fatherAadhar) || !/^\d{12}$/.test(motherAadhar)) {
+			    Swal.fire({
+			        icon: 'warning',
+			        title: 'Validation Error',
+			        text: 'Please enter a valid 12-digit Aadhar number.'
+			    });
+			    return;
+			} */
+			  
+	        
+	        formData.append("father_aadhar_file", fatherAadharUpload);
+	        formData.append("mother_aadhar_file", motherAadharUpload);
+
+	    }
+
+	    // Conditional: Single Parent - Father
+	    else if (parentType === 'SingleParent_Father') {
+	        let sfatherName = $('#sfatherName').val().trim();
+	        let sfatherMobile = $('#sfatherMobile').val().trim();
+	        let sfatherAadhar = $('#sfatherAadhar').val().trim();
+	        let sfatherAadharUpload = $('#sfatherAadharUpload')[0].files[0];
+
+/* 	        if (sfatherAadharUpload) {
+		        console.log("Father Aadhar File:", sfatherAadharUpload.name, "-", sfatherAadharUpload.type);
+		    } else {
+		        console.log("Father Aadhar File: Not uploaded");
+		    }
+ */	        
+	        if (!sfatherName || !sfatherMobile || !sfatherAadhar || !sfatherAadharUpload) {
+	            Swal.fire('Error', 'Please complete single father details including Aadhar upload.', 'error');
+	            return;
+	        }
+	        if (!/^[A-Za-z\s.]+$/.test(sfatherName)) {				
+				 Swal.fire({
+				        icon: 'warning',
+				        title: 'Validation Error',
+				        text: 'Name should contain only alphabets.'
+				    });
+				    return;
+			}
+	        
+	        if (!/^\d{10}$/.test(sfatherMobile) ) {
+			    Swal.fire({
+			        icon: 'warning',
+			        title: 'Validation Error',
+			        text: 'Please enter a valid 10-digit mobile number.'
+			    });
+			    return;
+			}
+		    
+		    if (/^0{10}$/.test(sfatherMobile)) {
+			    Swal.fire({
+			        icon: 'warning',
+			        title: 'Validation Error',
+			        text: 'Mobile number cannot be all zeros.'
+			    });
+			    return;
+			}
+
+			if ( sfatherMobile.startsWith('0') ) {
+			    Swal.fire({
+			        icon: 'warning',
+			        title: 'Validation Error',
+			        text: 'Mobile number cannot start with zero.'
+			    });
+			    return;
+			}
+
+			if (/^(\d)\1{9}$/.test(sfatherMobile)) {
+			    Swal.fire({
+			        icon: 'warning',
+			        title: 'Validation Error',
+			        text: 'Mobile number cannot have all digits the same.'
+			    });
+			    return;
+			}
+			
+			if ( !/^\d{12}$/.test(sfatherAadhar) ) {
+			    Swal.fire({
+			        icon: 'warning',
+			        title: 'Validation Error',
+			        text: 'Please enter a valid 12-digit Aadhar number.'
+			    });
+			    return;
+			}
+			
+			formData.append("father_name", sfatherName);
+	        formData.append("father_mobile", sfatherMobile);
+	        formData.append("father_aadhar", sfatherAadhar);
+	        formData.append("father_aadhar_file", sfatherAadharUpload);
+	    }
+
+	    // Conditional: Single Parent - Mother
+	    else if (parentType === 'SingleParent_Mother') {
+	        let smotherName = $('#smotherName').val().trim();
+	        let smotherMobile = $('#smotherMobile').val().trim();
+	        let smotherAadhar = $('#smotherAadhar').val().trim();
+	       
+	        let smotherAadharUpload = $('#smotherAadharUpload')[0].files[0];
+
+	        if (!smotherName || !smotherMobile || !smotherAadhar || !smotherAadharUpload) {
+	            Swal.fire('Error', 'Please complete single mother details including Aadhar upload.', 'error');
+	            return;
+	        }
+	        
+	        
+	        if (!/^[A-Za-z\s.]+$/.test(smotherName)) {				
+				 Swal.fire({
+				        icon: 'warning',
+				        title: 'Validation Error',
+				        text: 'Name should contain only alphabets.'
+				    });
+				    return;
+			}
+	        
+	        if (!/^\d{10}$/.test(smotherMobile)) {
+			    Swal.fire({
+			        icon: 'warning',
+			        title: 'Validation Error',
+			        text: 'Please enter a valid 10-digit mobile number.'
+			    });
+			    return;
+			}
+		    
+		    if (/^0{10}$/.test(smotherMobile)) {
+			    Swal.fire({
+			        icon: 'warning',
+			        title: 'Validation Error',
+			        text: 'Mobile number cannot be all zeros.'
+			    });
+			    return;
+			}
+
+			if ( smotherMobile.startsWith('0')) {
+			    Swal.fire({
+			        icon: 'warning',
+			        title: 'Validation Error',
+			        text: 'Mobile number cannot start with zero.'
+			    });
+			    return;
+			}
+
+			if (/^(\d)\1{9}$/.test(smotherMobile)) {
+			    Swal.fire({
+			        icon: 'warning',
+			        title: 'Validation Error',
+			        text: 'Mobile number cannot have all digits the same.'
+			    });
+			    return;
+			}
+			
+			if (!/^\d{12}$/.test(smotherAadhar)) {
+			    Swal.fire({
+			        icon: 'warning',
+			        title: 'Validation Error',
+			        text: 'Please enter a valid 12-digit Aadhar number.'
+			    });
+			    return;
+			}
+			
+			formData.append("mother_name", smotherName);
+	        formData.append("mother_mobile", smotherMobile);
+	        formData.append("mother_aadhar", smotherAadhar);
+	        formData.append("mother_aadhar_file", smotherAadharUpload);
+
+	    }
+
+	    // Conditional: Guardian
+	    else if (parentType === 'Guardian') {
+	        let guardianName = $('#guardianName').val().trim();
+	        let guardianMobile = $('#guardianMobile').val().trim();
+	        let guardianAadhar = $('#guardianAadhar').val().trim();
+	        let guardianFileInput = document.getElementById('guardianAadharUpload');
+	        let guardianAadharUpload = guardianFileInput ? guardianFileInput.files[0] : null;
+
+	        if (!guardianName || !guardianMobile || !guardianAadhar || !guardianAadharUpload) {
+	            Swal.fire('Error', 'Please complete guardian details including guardian Aadhar upload.', 'error');
+	            return;
+	        }
+	         
+	        if (!/^[A-Za-z\s.]+$/.test(guardianName)) {				
+				 Swal.fire({
+				        icon: 'warning',
+				        title: 'Validation Error',
+				        text: 'Name should contain only alphabets.'
+				    });
+				    return;
+			}
+	        
+	        if (!/^\d{10}$/.test(guardianMobile)) {
+			    Swal.fire({
+			        icon: 'warning',
+			        title: 'Validation Error',
+			        text: 'Please enter a valid 10-digit mobile number.'
+			    });
+			    return;
+			}
+		    
+		    if ( /^0{10}$/.test(guardianMobile)) {
+			    Swal.fire({
+			        icon: 'warning',
+			        title: 'Validation Error',
+			        text: 'Mobile number cannot be all zeros.'
+			    });
+			    return;
+			}
+
+			if (guardianMobile.startsWith('0')) {
+			    Swal.fire({
+			        icon: 'warning',
+			        title: 'Validation Error',
+			        text: 'Mobile number cannot start with zero.'
+			    });
+			    return;
+			}
+
+			if (/^(\d)\1{9}$/.test(guardianMobile)) {
+			    Swal.fire({
+			        icon: 'warning',
+			        title: 'Validation Error',
+			        text: 'Mobile number cannot have all digits the same.'
+			    });
+			    return;
+			}
+			
+			if (!/^\d{12}$/.test(guardianAadhar)) {
+			    Swal.fire({
+			        icon: 'warning',
+			        title: 'Validation Error',
+			        text: 'Please enter a valid 12-digit Aadhar number.'
+			    });
+			    return;
+			}
+			
+			
+			formData.append("guardian_name", guardianName);
+	        formData.append("guardian_mobile", guardianMobile);
+	        formData.append("guardian_aadhar", guardianAadhar);
+	        formData.append("guardian_aadhar_file", guardianAadharUpload);
+	        
+	        let gfatherName = $('#gfatherName').val().trim();
+	        let gfatherMobile = $('#gfatherMobile').val().trim();
+	        let gfatherAadhar = $('#gfatherAadhar').val().trim();
+	        let gfatherAadharUpload = $('#gfatherAadharUpload')[0].files[0];
+
+	        // Check if any one is filled
+	        let anyGfatherFieldFilled = gfatherName || gfatherMobile || gfatherAadhar || gfatherAadharUpload;
+
+	        if (anyGfatherFieldFilled) {
+	            if (!gfatherName || !gfatherMobile || !gfatherAadhar || !gfatherAadharUpload) {
+	                Swal.fire('Error', 'Please complete all Father details including Aadhar upload.', 'error');
+	                return;
+	            }
+
+	            // Append only if all are filled
+	            formData.append("father_name", gfatherName);
+	            formData.append("father_mobile", gfatherMobile);
+	            formData.append("father_aadhar", gfatherAadhar);
+	            formData.append("father_aadhar_file", gfatherAadharUpload);
+	        }
+	        
+	        let gmotherName = $('#gmotherName').val().trim();
+	        let gmotherMobile = $('#gmotherMobile').val().trim();
+	        let gmotherAadhar = $('#gmotherAadhar').val().trim();
+	        let gmotherAadharUpload = $('#gmotherAadharUpload')[0].files[0];
+
+	        // Check if any one is filled
+	        let anyGmotherFieldFilled = gmotherName || gmotherMobile || gmotherAadhar || gmotherAadharUpload;
+
+	        if (anyGmotherFieldFilled) {
+	            if (!gmotherName || !gmotherMobile || !gmotherAadhar || !gmotherAadharUpload) {
+	                Swal.fire('Error', 'Please complete all Mother details including Aadhar upload.', 'error');
+	                return;
+	            }
+
+	            // Append only if all are filled
+	            formData.append("mother_name", gmotherName);
+	            formData.append("mother_mobile", gmotherMobile);
+	            formData.append("mother_aadhar", gmotherAadhar);
+	            formData.append("mother_aadhar_file", gmotherAadharUpload);
+	        }
+
+	    }
+	    
+	    let aadharInputs = {
+	    	    studentAadhar: $('#studentAadhar').val().trim(),
+	    	    fatherAadhar: $('#fatherAadhar').val().trim(),
+	    	    motherAadhar: $('#motherAadhar').val().trim(),
+	    	    sfatherAadhar: $('#sfatherAadhar').val().trim(),
+	    	    smotherAadhar: $('#smotherAadhar').val().trim(),
+	    	    guardianAadhar: $('#guardianAadhar').val().trim(),
+	    	    gfatherAadhar: $('#gfatherAadhar').val().trim(),
+	    	    gmotherAadhar: $('#gmotherAadhar').val().trim()
+	    	};
+
+	    	// Friendly names for display
+	    	let fieldLabels = {
+	    	    studentAadhar: 'Student',
+	    	    fatherAadhar: 'Father',
+	    	    motherAadhar: 'Mother',
+	    	    sfatherAadhar: 'Father',
+	    	    smotherAadhar: 'Mother',
+	    	    guardianAadhar: 'Guardian',
+	    	    gfatherAadhar: 'Father',
+	    	    gmotherAadhar: 'Mother'
+	    	};
+	    	
+	    	// Map values to their corresponding field keys
+	    	let valueMap = {};
+	    	for (let key in aadharInputs) {
+	    	    let val = aadharInputs[key];
+	    	    if (val !== '') {
+	    	        valueMap[val] = valueMap[val] ? [...valueMap[val], key] : [key];
+	    	    }
+	    	}
+
+	    	// Find duplicates
+	    	let duplicateEntries = Object.entries(valueMap).filter(([val, keys]) => keys.length > 1);
+
+	    	if (duplicateEntries.length > 0) {
+/* 	    	    let message = '';
+
+	    	    duplicateEntries.forEach(([val, keys]) => {
+	    	        let fieldList = keys.map(k => `• ${fieldLabels[k] || k}`).join('<br>');
+	    	        message += `<strong>Aadhar:</strong> ${val}<br><em>Used in:</em><br>${fieldList}<br><br>`;
+	    	    }); */
+
+	    	    Swal.fire({
+	    	        icon: 'warning',
+	    	        title: 'Duplicate Aadhar Numbers Found',
+	    	        //html: message
+	    	    });
+
+	    	    return; // Stop further processing
+	    	}
+	    	
+			
+	    	//Map input IDs to friendly labels
+	    	let fileFields = {
+	    	    studentAadharUpload: 'Student',
+	    	    fatherAadharUpload: 'Father',
+	    	    motherAadharUpload: 'Mother',
+	    	    sfatherAadharUpload: 'Father',
+	    	    smotherAadharUpload: 'Mother',
+	    	    guardianAadharUpload: 'Guardian',
+	    	    gfatherAadharUpload: 'Father',
+	    	    gmotherAadharUpload: 'Mother'
+	    	};
+
+	    	// On form submit or trigger point
+	    	function checkDuplicateFileNames() {
+	    	    let fileNameMap = {};
+
+	    	    for (let id in fileFields) {
+	    	        let input = document.getElementById(id);
+	    	        if (input && input.files.length > 0) {
+	    	            let fileName = input.files[0].name.trim();
+
+	    	            if (fileNameMap[fileName]) {
+	    	                fileNameMap[fileName].push(fileFields[id]);
+	    	            } else {
+	    	                fileNameMap[fileName] = [fileFields[id]];
+	    	            }
+	    	        }
+	    	    }
+
+	    	    // Find duplicates
+	    	    let duplicates = Object.entries(fileNameMap).filter(([name, fields]) => fields.length > 1);
+
+	    	    if (duplicates.length > 0) {
+	    	        /* let message = '';
+	    	        duplicates.forEach(([name, fields]) => {
+	    	            let usedIn = fields.map(f => `• ${f}`).join('<br>');
+	    	            message += `<strong>File:</strong> ${name}<br><em>Used in:</em><br>${usedIn}<br><br>`;
+	    	        }); */
+
+	    	        Swal.fire({
+	    	            icon: 'error',
+	    	            title: 'Duplicate Aadhar Files Found',
+	    	            //html: message
+	    	        });
+
+	    	        return false; // stop form submission or further processing
+	    	    }
+
+	    	    return true; // no duplicates
+	    	}
+	    	
+	    	
+	    	if (!checkDuplicateFileNames()) {
+	            e.preventDefault(); // stop form submit
+	            return;
+	        }
+	    
+	    // Send AJAX request
+ 	   $('#saveStudentdDetails').prop('disabled', true).text('Saving...');
+ 	  $('#pageLoader').show();
+	     $.ajax({
+	        url: '/gcc/api/gccschool/studentInfo/saveStudent', 
+	        type: 'POST',
+	        data: formData,
+	        contentType: false,
+	        processData: false,
+	        success: function (response) {
+	        	$('#pageLoader').hide();
+	        	$('#saveStudentdDetails').prop('disabled', false).text('Save');
+	        	if (response.Message === 'Saved Sucessfully' && response.Data === 'Success') {
+	                Swal.fire({
+	                    icon: 'success',
+	                    title: 'Success',
+	                    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
+	                    showConfirmButton: true, // Ensure the confirm button is visible
+	                    text: 'Student details saved successfully!'
+	                }).then((result) => {
+	                    if (result.isConfirmed) {
+	                    		                    	
+	                    	location.reload();
+	                    	
+	                    	
+	                    }
+	                });
+	                
+	            } 
+	        	
+	        	else if (response.Message === 'Duplicate') {
+	                Swal.fire({
+	                    icon: 'warning',
+	                    title: 'Warning',
+	                    text: response.Error || 'An unknown error occurred.'
+	                });
+	            }
+	        	
+	        	else if (response.Message === 'Error') {
+	                Swal.fire({
+	                    icon: 'error',
+	                    title: 'Error',
+	                    text: response.Error || 'An unknown error occurred.'
+	                });
+	            } else {
+	            	 let errorMessage = 'An error occurred while saving student details.';
+	            	    if (xhr.responseJSON && xhr.responseJSON.Error) {
+	            	        errorMessage = xhr.responseJSON.Error;
+	            	    }
+	            	    Swal.fire({
+	            	        icon: 'error',
+	            	        title: 'Error',
+	            	        text: errorMessage
+	            	    });
+	            	    console.error('AJAX error:', error);
+	            }
+	            
+	        },
+	        error: function () {
+	        	$('#pageLoader').hide();
+	        	$('#saveStudentdDetails').prop('disabled', false).text('Save');
+	            Swal.fire({
+	                icon: 'error',
+	                title: 'Error',
+	                text: 'Something went wrong while saving.'
+	            });
+	        }
+	    }); 
+	    
+	}); 
+
+
+	
+$(document).on('click', '#updateStudentdDetails', function (e) {
+	
+	//console.log("Hiiiiii");
+	let student_id = $('#student_id').text();
+	//console.log("student_id=" + student_id);
+	
+	let studentNameEdit = $('#studentName').val().trim();
+    let EmisNumberEdit = $('#EmisNumber').val().trim();
+    let genderEdit = $('#gender').val();
+    let sectionEdit = $('#sectionDropdown').val().trim();
+    let mediumEdit = $('#medium').val();                  
+    let dobEdit = $('#dob').val();
+    let ageEdit = $('#age').val();
+    let parentTypeEdit = $('#parentType').val();
+    let sentstandardEdit = $('#standard').val();
+    let studentAadharEdit = $('#studentAadhar').val();
+    let studentAadharUploadEdit = $('#studentAadharUpload')[0].files[0];
+    
+    let FatherAadharPreview = $('#FatherAadharPreview');
+    let MotherAadharPreview= $('#MotherAadharPreview');
+    let sFatherAadharPreview= $('#sFatherAadharPreview');
+    let sMotherAadharPreview = $('#sMotherAadharPreview');
+    let GuardianAadharPreview = $('#GuardianAadharPreview');
+    let gFatherAadharPreview = $('#gFatherAadharPreview');
+    let gMotherAadharPreview = $('#gMotherAadharPreview');
+    let studentAadharPreview =$('#studentAadharPreview');
+    
+
+    
+    let raw_father_file_update = $('#raw_father_file').text();
+    let raw_mother_file_update = $('#raw_mother_file').text();
+    let raw_guardian_file_update = $('#raw_guardian_file').text();
+    let raw_student_file_update = $('#raw_student_file').text();
+    
+    let previous_father_aadhar = $('#previous_father_aadhar').text();
+    let previous_mother_aadhar = $('#previous_mother_aadhar').text();
+    let previous_guardian_aadhar = $('#previous_guardian_aadhar').text();
+    let previous_student_aadhar = $('#previous_student_aadhar').text();
+    
+    //console.log("previous_father_aadhar =",previous_father_aadhar );
+    
+/*  console.log("raw_father_file_update =", raw_father_file_update);
+    console.log("raw_mother_file_update =", raw_mother_file_update);
+    console.log("raw_guardian_file_update =", raw_guardian_file_update);
+    console.log("raw_student_file_update =", raw_student_file_update); */
+    
+   // console.log(" medium  section"+mediumEdit ,sectionEdit);
+    
+    if (!studentNameEdit || !EmisNumberEdit || !genderEdit || !dobEdit || !parentTypeEdit || !mediumEdit || !sectionEdit) {
+        Swal.fire('Validation Error', 'Please fill in all required fields marked with *', 'warning');
+        return;
+    }
+    
+    if (!/^[A-Za-z\s.]+$/.test(studentNameEdit) ) {				
+		 Swal.fire({
+		        icon: 'warning',
+		        title: 'Validation Error',
+		        text: 'Name should contain only alphabets.'
+		    });
+		    return;
+	}
+    
+    if (!/^\d{10}$/.test(EmisNumberEdit)) {
+	    Swal.fire({
+	        icon: 'warning',
+	        title: 'Validation Error',
+	        text: 'Please enter 10-digit EMIS number.'
+	    });
+	    return;
+	}
+    
+    if (!/^[A-Za-z0-9-]{1,4}$/.test(sectionEdit)) {
+        Swal.fire({
+            icon: 'warning',
+            title: 'Validation Error',
+            text: 'Section can have 1 to 4 characters, using only letters, numbers, or hyphens(-).'
+        });
+        return;
+    }
+    
+    
+    const formData1 = new FormData();
+    
+    formData1.append("student_id",student_id);
+    formData1.append("user_id",userId);
+    formData1.append("action_type",'EDIT');
+    
+ 	if(studentAadharEdit){
+ 		
+    	
+    	if (!/^\d{12}$/.test(studentAadharEdit)) {
+    		
+		    Swal.fire({
+		        icon: 'warning',
+		        title: 'Validation Error',
+		        text: 'Please enter a valid 12-digit Student Aadhar number.'
+		    });
+		    return;
+		}
+    	
+    	formData1.append("student_aadhar", studentAadharEdit); 
+    }
+    else{
+    	
+    	formData1.append("student_aadhar", "");
+    }
+
+    // Required fields
+    formData1.append("student_name", studentNameEdit);
+    formData1.append("emis_no", EmisNumberEdit);
+    formData1.append("gender", genderEdit);
+    formData1.append("std", sentstandardEdit);
+    formData1.append("dob", dobEdit);
+    formData1.append("age", ageEdit);
+    formData1.append("parent_type", parentTypeEdit);
+    formData1.append("section",sectionEdit);
+    formData1.append("mediums",mediumEdit);
+    
+   
+         
+    formData1.append("udise", globalUdise);
+    
+    if(studentAadharPreview.html().trim() !== ''){
+    	if(studentAadharUploadEdit){
+   		 formData1.append("student_aadhar_file", studentAadharUploadEdit);
+       }
+    	else{
+    		if(raw_student_file_update){
+    			formData1.append("raw_student_aadhar", raw_student_file_update);
+    		}
+    	}
+    }
+    else{
+    	if(studentAadharUploadEdit){
+   		 formData1.append("student_aadhar_file", studentAadharUploadEdit);
+       }
+    	
+    }
+    
+	
+	
+	
+	if (parentTypeEdit === 'Parent') {
+        let fatherNameEdit = $('#fatherName').val().trim();
+        let motherNameEdit = $('#motherName').val().trim();
+        let fatherMobileEdit = $('#fatherMobile').val().trim();
+        let motherMobileEdit = $('#motherMobile').val().trim();
+        let fatherAadharEdit = $('#fatherAadhar').val().trim();
+        let motherAadharEdit = $('#motherAadhar').val().trim();
+        let fatherAadharUploadEdit = $('#fatherAadharUpload')[0].files[0];	        							
+        let motherAadharUploadEdit = $('#motherAadharUpload')[0].files[0]; 
+        
+        							 
+/*         console.log("Parent Details:");
+        console.log("Father Name: ", fatherNameEdit);
+        console.log("Mother Name: ", motherNameEdit);
+        console.log("Father Mobile: ", fatherMobileEdit);
+        console.log("Mother Mobile: ", motherMobileEdit);
+        console.log("Father Aadhar: ", fatherAadharEdit);
+        console.log("Mother Aadhar: ", motherAadharEdit);
+	    console.log("Father Aadhar Upload File: ", fatherAadharUploadEdit);
+        console.log("Mother Aadhar Upload File: ", motherAadharUploadEdit);  */
+        
+        
+        if(!fatherNameEdit || !motherNameEdit){
+        	Swal.fire('Error', 'Please enter both father and mother name', 'error');
+            return;
+        }
+        
+        if (!/^[A-Za-z\s.]+$/.test(fatherNameEdit)  ||   !/^[A-Za-z\s.]+$/.test(motherNameEdit) ) {				
+			 Swal.fire({
+			        icon: 'warning',
+			        title: 'Validation Error',
+			        text: 'Name should contain only alphabets.'
+			    });
+			    return;
+		}
+        
+        formData1.append("father_name", fatherNameEdit);
+        formData1.append("mother_name", motherNameEdit);
+        
+        if(fatherMobileEdit || motherMobileEdit){
+        	
+        	if(fatherMobileEdit){
+        		
+        		if (!/^\d{10}$/.test(fatherMobileEdit)) {
+    			    Swal.fire({
+    			        icon: 'warning',
+    			        title: 'Validation Error',
+    			        text: 'Please enter a valid 10-digit Father mobile number.'
+    			    });
+    			    return;
+    			}
+    		    
+    		    if (/^0{10}$/.test(fatherMobileEdit)) {
+    			    Swal.fire({
+    			        icon: 'warning',
+    			        title: 'Validation Error',
+    			        text: 'Father Mobile number cannot be all zeros.'
+    			    });
+    			    return;
+    			}
+
+    			if (fatherMobileEdit.startsWith('0')) {
+    			    Swal.fire({
+    			        icon: 'warning',
+    			        title: 'Validation Error',
+    			        text: 'Father Mobile number cannot start with zero.'
+    			    });
+    			    return;
+    			}
+
+    			if (/^(\d)\1{9}$/.test(fatherMobileEdit)) {
+    			    Swal.fire({
+    			        icon: 'warning',
+    			        title: 'Validation Error',
+    			        text: 'Father Mobile number cannot have all digits the same.'
+    			    });
+    			    return;
+    			}
+    			
+    			formData1.append("father_mobile", fatherMobileEdit);
+    			
+        		
+        		if(!fatherAadharEdit){
+        			Swal.fire('warning', 'Please enter father aadhar number', 'warning');
+    	            return;
+        		}
+        		if(fatherAadharEdit){
+        			
+        			if (!/^\d{12}$/.test(fatherAadharEdit)) {
+	    			    Swal.fire({
+	    			        icon: 'warning',
+	    			        title: 'Validation Error',
+	    			        text: 'Please enter a valid 12-digit Father Aadhar number.'
+	    			    });
+	    			    return;
+	    			}       			        			
+        			
+        			formData1.append("father_aadhar", fatherAadharEdit);
+        			
+        			if(FatherAadharPreview.html().trim() !== ''){
+        				       				
+        				
+        				if(fatherAadharUploadEdit){
+            				formData1.append("father_aadhar_file", fatherAadharUploadEdit);
+            			}
+        				else{
+        					
+        					if(fatherAadharEdit != previous_father_aadhar){
+                  				 Swal.fire({
+           	    			        icon: 'warning',
+           	    			        title: 'Upload Father Aadhar',
+           	    			        text: 'You Changed father aadhar number.So,Please Upload New Father Aadhar File.'
+           	    			    });
+           	    			    return;
+                  			}
+        					
+        					formData1.append("raw_father_aadhar", raw_father_file_update);
+        				}
+        			}
+        			else{
+        				
+        				if(fatherAadharUploadEdit){
+            				formData1.append("father_aadhar_file", fatherAadharUploadEdit);
+            				
+            			}
+        				else{
+        					Swal.fire('warning', 'Please upload father aadhar file', 'warning');
+    	    	            return;
+        				}
+        			}
+        			        			
+        			
+        		}
+        		
+        		
+        	}
+        	
+        	else{
+        		formData1.append("father_mobile", "");
+        		
+        		if(fatherAadharEdit){
+        			Swal.fire('warning', 'Enter all father details or remove all father details', 'warning');
+    	            return;
+        		}
+        		else{
+        			formData1.append("father_aadhar", "");
+        			
+        			if(FatherAadharPreview.html().trim() !== ''){
+        				if(fatherAadharUploadEdit){
+        					Swal.fire('warning', 'Enter all father details or remove all father details', 'warning');
+            	            return;
+            			}
+        				else{
+        					formData1.append("father_aadhar_file", "");
+        					formData1.append("raw_father_aadhar", "");
+        				}
+        			}
+        			else{
+        				if(fatherAadharUploadEdit){
+        					Swal.fire('warning', 'Enter all father details or remove all father details', 'warning');
+            	            return;
+            			}
+        			}
+        		}
+        	}
+        	
+        	if(motherMobileEdit){ 
+        		
+        			        			        	    	        
+    	        if (!/^\d{10}$/.test(motherMobileEdit)) {
+    			    Swal.fire({
+    			        icon: 'warning',
+    			        title: 'Validation Error',
+    			        text: 'Please enter a valid 10-digit Mother mobile number.'
+    			    });
+    			    return;
+    			}
+    		    
+    		    if (/^0{10}$/.test(motherMobileEdit)) {
+    			    Swal.fire({
+    			        icon: 'warning',
+    			        title: 'Validation Error',
+    			        text: 'Mother Mobile number cannot be all zeros.'
+    			    });
+    			    return;
+    			}
+
+    			if (motherMobileEdit.startsWith('0')) {
+    			    Swal.fire({
+    			        icon: 'warning',
+    			        title: 'Validation Error',
+    			        text: 'Mother Mobile number cannot start with zero.'
+    			    });
+    			    return;
+    			}
+
+    			if (/^(\d)\1{9}$/.test(motherMobileEdit)) {
+    			    Swal.fire({
+    			        icon: 'warning',
+    			        title: 'Validation Error',
+    			        text: 'Mother Mobile number cannot have all digits the same.'
+    			    });
+    			    return;
+    			}
+    			
+    			formData1.append("mother_mobile", motherMobileEdit);
+    			
+    			if(!motherAadharEdit){
+        			Swal.fire('warning', 'Please enter mother aadhar number', 'warning');
+    	            return;
+        		}
+        		if(motherAadharEdit){
+        			
+        			if (!/^\d{12}$/.test(motherAadharEdit)) {
+	    			    Swal.fire({
+	    			        icon: 'warning',
+	    			        title: 'Validation Error',
+	    			        text: 'Please enter a valid 12-digit Mother Aadhar number.'
+	    			    });
+	    			    return;
+	    			}
+        			
+        			formData1.append("mother_aadhar", motherAadharEdit);
+        			
+					if(MotherAadharPreview.html().trim() !== ''){
+        				
+        				if(motherAadharUploadEdit){
+            				formData1.append("mother_aadhar_file", motherAadharUploadEdit);
+            			}
+        				else{
+        					
+        					if(motherAadharEdit != previous_mother_aadhar){
+                 				 Swal.fire({
+          	    			        icon: 'warning',
+          	    			        title: 'Upload Mother Aadhar',
+          	    			        text: 'You Changed mother aadhar number.So,Please Upload New Mother Aadhar File.'
+          	    			    });
+          	    			    return;
+                 			}
+        					
+        					formData1.append("raw_mother_aadhar", raw_mother_file_update);
+        				}
+        			}
+        			else{
+        				
+        				if(motherAadharUploadEdit){
+            				formData1.append("mother_aadhar_file", motherAadharUploadEdit);
+            			}
+        				else{
+        					Swal.fire('warning', 'Please upload mother aadhar file', 'warning');
+    	    	            return;
+        				}
+        			}
+        			        			
+        			
+        		}
+        		
+        	}
+			else{
+        		
+        		
+				formData1.append("mother_mobile", "");
+        		
+        		if(motherAadharEdit){
+        			Swal.fire('warning', 'Enter all mother details or remove all mother details', 'warning');
+    	            return;
+        		}
+        		else{
+        			formData1.append("mother_aadhar", "");
+        			
+        			if(MotherAadharPreview.html().trim() !== ''){
+        				if(motherAadharUploadEdit){
+        					Swal.fire('warning', 'Enter all mother details or remove all mother details', 'warning');
+            	            return;
+            			}
+        				else{
+        					formData1.append("mother_aadhar_file", "");
+        					formData1.append("raw_mother_aadhar", "");
+        					
+        				}
+        			}
+        			else{
+        				if(motherAadharUploadEdit){
+        					Swal.fire('warning', 'Enter all mother details or remove all mother details', 'warning');
+            	            return;
+            			}
+        			}
+        		}
+        	}
+        }
+        else{
+        	Swal.fire('warning', 'Please enter atleast anyone  mobile number', 'warning');
+            return;
+        }
+        
+    }
+	
+	else if (parentTypeEdit === 'SingleParent_Father') {
+        let sfatherNameEdit = $('#sfatherName').val().trim();
+        let sfatherMobileEdit = $('#sfatherMobile').val().trim();
+        let sfatherAadharEdit = $('#sfatherAadhar').val().trim();
+        let sfatherAadharUploadEdit = $('#sfatherAadharUpload')[0].files[0];
+
+/*         if (sfatherAadharUploadEdit) {
+	        console.log("Father Aadhar File:", sfatherAadharUpload.name, "-", sfatherAadharUpload.type);
+	    } else {
+	        console.log("Father Aadhar File: Not uploaded");
+	    } */
+        
+        if (!sfatherNameEdit || !sfatherMobileEdit || !sfatherAadharEdit) {
+            Swal.fire('Error', 'Please complete single father details.', 'error');
+            return;
+        }
+        if (!/^[A-Za-z\s.]+$/.test(sfatherNameEdit)) {				
+			 Swal.fire({
+			        icon: 'warning',
+			        title: 'Validation Error',
+			        text: 'Name should contain only alphabets.'
+			    });
+			    return;
+		}
+        
+        if (!/^\d{10}$/.test(sfatherMobileEdit) ) {
+		    Swal.fire({
+		        icon: 'warning',
+		        title: 'Validation Error',
+		        text: 'Please enter a valid 10-digit mobile number.'
+		    });
+		    return;
+		}
+	    
+	    if (/^0{10}$/.test(sfatherMobileEdit)) {
+		    Swal.fire({
+		        icon: 'warning',
+		        title: 'Validation Error',
+		        text: 'Mobile number cannot be all zeros.'
+		    });
+		    return;
+		}
+
+		if ( sfatherMobileEdit.startsWith('0') ) {
+		    Swal.fire({
+		        icon: 'warning',
+		        title: 'Validation Error',
+		        text: 'Mobile number cannot start with zero.'
+		    });
+		    return;
+		}
+
+		if (/^(\d)\1{9}$/.test(sfatherMobileEdit)) {
+		    Swal.fire({
+		        icon: 'warning',
+		        title: 'Validation Error',
+		        text: 'Mobile number cannot have all digits the same.'
+		    });
+		    return;
+		}
+		
+		if ( !/^\d{12}$/.test(sfatherAadharEdit) ) {
+		    Swal.fire({
+		        icon: 'warning',
+		        title: 'Validation Error',
+		        text: 'Please enter a valid 12-digit Aadhar number.'
+		    });
+		    return;
+		}
+		
+		formData1.append("father_name", sfatherNameEdit);
+        formData1.append("father_mobile", sfatherMobileEdit);
+        formData1.append("father_aadhar", sfatherAadharEdit);
+        if(sFatherAadharPreview.html().trim() === ''){
+	        if(sfatherAadharUploadEdit){
+	        	formData1.append("father_aadhar_file", sfatherAadharUploadEdit);
+	        }
+	        else{
+	        	 Swal.fire('Error', 'Please complete single Father details including Aadhar upload.', 'error');
+		            return;
+	        }
+        }
+        else
+        {
+        	if(sfatherAadharUploadEdit){
+	        	formData1.append("father_aadhar_file", sfatherAadharUploadEdit);
+	        }
+        	else{
+        		
+        		if(sfatherAadharEdit != previous_father_aadhar){
+    				 Swal.fire({
+	    			        icon: 'warning',
+	    			        title: 'Upload Father Aadhar',
+	    			        text: 'You Changed father aadhar number.So,Please Upload New Father Aadhar File.'
+	    			    });
+	    			    return;
+    			}
+        		
+        		formData1.append("raw_father_aadhar", raw_father_file_update);
+        	}
+        }
+        
+        
+    }
+	
+	else if (parentTypeEdit === 'SingleParent_Mother') {
+        let smotherNameEdit = $('#smotherName').val().trim();
+        let smotherMobileEdit = $('#smotherMobile').val().trim();
+        let smotherAadharEdit = $('#smotherAadhar').val().trim();
+       
+        let smotherAadharUploadEdit = $('#smotherAadharUpload')[0].files[0];
+
+        if (!smotherNameEdit || !smotherMobileEdit || !smotherAadharEdit) {
+            Swal.fire('Error', 'Please complete single mother details.', 'error');
+            return;
+        }
+        
+        
+        if (!/^[A-Za-z\s.]+$/.test(smotherNameEdit)) {				
+			 Swal.fire({
+			        icon: 'warning',
+			        title: 'Validation Error',
+			        text: 'Name should contain only alphabets.'
+			    });
+			    return;
+		}
+        
+        if (!/^\d{10}$/.test(smotherMobileEdit)) {
+		    Swal.fire({
+		        icon: 'warning',
+		        title: 'Validation Error',
+		        text: 'Please enter a valid 10-digit mobile number.'
+		    });
+		    return;
+		}
+	    
+	    if (/^0{10}$/.test(smotherMobileEdit)) {
+		    Swal.fire({
+		        icon: 'warning',
+		        title: 'Validation Error',
+		        text: 'Mobile number cannot be all zeros.'
+		    });
+		    return;
+		}
+
+		if ( smotherMobileEdit.startsWith('0')) {
+		    Swal.fire({
+		        icon: 'warning',
+		        title: 'Validation Error',
+		        text: 'Mobile number cannot start with zero.'
+		    });
+		    return;
+		}
+
+		if (/^(\d)\1{9}$/.test(smotherMobileEdit)) {
+		    Swal.fire({
+		        icon: 'warning',
+		        title: 'Validation Error',
+		        text: 'Mobile number cannot have all digits the same.'
+		    });
+		    return;
+		}
+		
+		if (!/^\d{12}$/.test(smotherAadharEdit)) {
+		    Swal.fire({
+		        icon: 'warning',
+		        title: 'Validation Error',
+		        text: 'Please enter a valid 12-digit Aadhar number.'
+		    });
+		    return;
+		}
+		
+		formData1.append("mother_name", smotherNameEdit);
+        formData1.append("mother_mobile", smotherMobileEdit);
+        formData1.append("mother_aadhar", smotherAadharEdit);
+        
+       
+        if(sMotherAadharPreview.html().trim() === ''){
+	        if(smotherAadharUploadEdit){
+	        	formData1.append("mother_aadhar_file", smotherAadharUploadEdit);
+	        }
+	        else{
+	        	 Swal.fire('Error', 'Please complete single Mother details including Aadhar upload.', 'error');
+		            return;
+	        }
+        }
+        else
+        {
+        	if(smotherAadharUploadEdit){
+	        	formData1.append("mother_aadhar_file", smotherAadharUploadEdit);
+	        }  
+        	else{
+        		
+        		if(smotherAadharEdit != previous_mother_aadhar){
+   				 Swal.fire({
+	    			        icon: 'warning',
+	    			        title: 'Upload Mother Aadhar',
+	    			        text: 'You Changed mother aadhar number.So,Please Upload New Mother Aadhar File.'
+	    			    });
+	    			    return;
+   			}
+        		
+        		formData1.append("raw_mother_aadhar", raw_mother_file_update);	
+        	}
+        }
+
+    }
+	
+	else if (parentTypeEdit === 'Guardian') {
+        let guardianNameEdit = $('#guardianName').val().trim();
+        let guardianMobileEdit = $('#guardianMobile').val().trim();
+        let guardianAadharEdit = $('#guardianAadhar').val().trim();
+        let guardianFileInputEdit = document.getElementById('guardianAadharUpload');
+        let guardianAadharUploadEdit = guardianFileInputEdit ? guardianFileInputEdit.files[0] : null;
+
+        if (!guardianNameEdit || !guardianMobileEdit || !guardianAadharEdit) {
+            Swal.fire('Error', 'Please complete guardian details.', 'error');
+            return;
+        }
+         
+        if (!/^[A-Za-z\s.]+$/.test(guardianNameEdit)) {				
+			 Swal.fire({
+			        icon: 'warning',
+			        title: 'Validation Error',
+			        text: 'Name should contain only alphabets.'
+			    });
+			    return;
+		}
+        
+        if (!/^\d{10}$/.test(guardianMobileEdit)) {
+		    Swal.fire({
+		        icon: 'warning',
+		        title: 'Validation Error',
+		        text: 'Please enter a valid 10-digit mobile number.'
+		    });
+		    return;
+		}
+	    
+	    if ( /^0{10}$/.test(guardianMobileEdit)) {
+		    Swal.fire({
+		        icon: 'warning',
+		        title: 'Validation Error',
+		        text: 'Mobile number cannot be all zeros.'
+		    });
+		    return;
+		}
+
+		if (guardianMobileEdit.startsWith('0')) {
+		    Swal.fire({
+		        icon: 'warning',
+		        title: 'Validation Error',
+		        text: 'Mobile number cannot start with zero.'
+		    });
+		    return;
+		}
+
+		if (/^(\d)\1{9}$/.test(guardianMobileEdit)) {
+		    Swal.fire({
+		        icon: 'warning',
+		        title: 'Validation Error',
+		        text: 'Mobile number cannot have all digits the same.'
+		    });
+		    return;
+		}
+		
+		if (!/^\d{12}$/.test(guardianAadharEdit)) {
+		    Swal.fire({
+		        icon: 'warning',
+		        title: 'Validation Error',
+		        text: 'Please enter a valid 12-digit Aadhar number.'
+		    });
+		    return;
+		}
+		
+		
+		formData1.append("guardian_name", guardianNameEdit);
+        formData1.append("guardian_mobile", guardianMobileEdit);
+        formData1.append("guardian_aadhar", guardianAadharEdit);
+        
+        
+        if(GuardianAadharPreview.html().trim() === ''){
+        	if(guardianAadharUploadEdit){
+        		formData1.append("guardian_aadhar_file", guardianAadharUploadEdit);
+	        }
+	        else{
+	        	 Swal.fire('Error', 'Please complete Guardian details including Aadhar upload.', 'error');
+		            return;
+	        }
+        }
+        else
+        {
+        	if(guardianAadharUploadEdit){
+        		formData1.append("guardian_aadhar_file", guardianAadharUploadEdit);
+	        }  
+        	else{
+        		
+        		if(guardianAadharEdit != previous_guardian_aadhar){
+      				 Swal.fire({
+   	    			        icon: 'warning',
+   	    			        title: 'Upload Guardian Aadhar',
+   	    			        text: 'You Changed guardian aadhar number.So,Please Upload New Guardian Aadhar File.'
+   	    			    });
+   	    			    return;
+      			}
+        		
+        		formData1.append("raw_guardian_aadhar", raw_guardian_file_update);	
+        	}
+        }
+             
+        let gfatherNameEdit = $('#gfatherName').val().trim();
+        let gfatherMobileEdit = $('#gfatherMobile').val().trim();
+        let gfatherAadharEdit = $('#gfatherAadhar').val().trim();
+        let gfatherAadharUploadEdit = $('#gfatherAadharUpload')[0].files[0];
+
+        // Check if any one is filled
+        let anyGfatherFieldFilledEdit = gfatherNameEdit || gfatherMobileEdit || gfatherAadharEdit;
+
+        if (anyGfatherFieldFilledEdit) {
+            if (!gfatherNameEdit || !gfatherMobileEdit || !gfatherAadharEdit) {
+                Swal.fire('Error', 'Please complete all Father details.', 'error');
+                return;
+            }
+
+            // Append only if all are filled
+            formData1.append("father_name", gfatherNameEdit);
+            formData1.append("father_mobile", gfatherMobileEdit);
+            formData1.append("father_aadhar", gfatherAadharEdit);                  
+            
+        }
+        
+        if(gfatherNameEdit && gfatherMobileEdit && gfatherAadharEdit)
+        {
+	        if(gFatherAadharPreview.html().trim() !== ''){
+	        	if(gfatherAadharUploadEdit){
+	        		formData1.append("father_aadhar_file", gfatherAadharUploadEdit);
+	        	}  
+	        	else{
+	        		
+	        		if(gfatherAadharEdit != previous_father_aadhar){
+	      				 Swal.fire({
+	   	    			        icon: 'warning',
+	   	    			        title: 'Upload Father Aadhar',
+	   	    			        text: 'You Changed father aadhar number.So,Please Upload New Father Aadhar File.'
+	   	    			    });
+	   	    			    return;
+	      			}
+	        		
+	        		formData1.append("raw_father_aadhar", raw_father_file_update);
+	        	}
+	        }
+	        else{	        	
+	        	if(!gfatherAadharUploadEdit){
+	        		Swal.fire('Error', 'Please complete all Father details including Aadhar upload.', 'error');
+	                return;
+	        	}
+	        	if(gfatherAadharUploadEdit){
+	        		formData1.append("father_aadhar_file", gfatherAadharUploadEdit);
+	        	}
+	        }
+        }
+        else{
+        	if(gFatherAadharPreview.html().trim() === ''){
+        		if(gfatherAadharUploadEdit){
+        			Swal.fire('Error', 'Please complete all Father details including Aadhar upload.', 'error');
+	                return;
+	        	}        		
+        		
+        	}
+        	else{
+        		if(!gfatherAadharUploadEdit){
+        			formData1.append("father_aadhar_file", "");
+        			formData1.append("raw_father_aadhar", "");
+        		}
+        		else{
+        			Swal.fire('Error', 'Please complete all Father details including Aadhar upload.', 'error');
+	                return;
+        		}
+        	}
+        }
+        
+        
+        
+        
+        let gmotherNameEdit= $('#gmotherName').val().trim();
+        let gmotherMobileEdit = $('#gmotherMobile').val().trim();
+        let gmotherAadharEdit = $('#gmotherAadhar').val().trim();
+        let gmotherAadharUploadEdit = $('#gmotherAadharUpload')[0].files[0];
+
+        // Check if any one is filled
+        let anyGmotherFieldFilledEdit = gmotherNameEdit || gmotherMobileEdit || gmotherAadharEdit;
+
+        if (anyGmotherFieldFilledEdit) {
+            if (!gmotherNameEdit || !gmotherMobileEdit || !gmotherAadharEdit) {
+                Swal.fire('Error', 'Please complete all Mother details.', 'error');
+                return;
+            }
+
+            // Append only if all are filled
+            formData1.append("mother_name", gmotherNameEdit);
+            formData1.append("mother_mobile", gmotherMobileEdit);
+            formData1.append("mother_aadhar", gmotherAadharEdit);           
+        }
+        
+        if(gmotherNameEdit && gmotherMobileEdit && gmotherAadharEdit)
+        {
+	        if(gMotherAadharPreview.html().trim() !== ''){
+	        	if(gmotherAadharUploadEdit){
+	        		formData1.append("mother_aadhar_file", gmotherAadharUploadEdit);
+	        	} 
+	        	else{
+	        		
+	        		if(gmotherAadharEdit != previous_mother_aadhar){
+	      				 Swal.fire({
+	   	    			        icon: 'warning',
+	   	    			        title: 'Upload Mother Aadhar',
+	   	    			        text: 'You Changed mother aadhar number.So,Please Upload New Mother Aadhar File.'
+	   	    			    });
+	   	    			    return;
+	      			}
+	        		
+	        		formData1.append("raw_mother_aadhar", raw_mother_file_update);
+	        	}
+	        }
+	        else{	        	
+	        	if(!gmotherAadharUploadEdit){
+	        		Swal.fire('Error', 'Please complete all Mother details including Aadhar upload.', 'error');
+	                return;
+	        	}
+	        	if(gmotherAadharUploadEdit){
+	        		formData1.append("mother_aadhar_file", gmotherAadharUploadEdit);
+	        	}
+	        }
+        }
+        else{
+        	if(gMotherAadharPreview.html().trim() === ''){
+        		if(gmotherAadharUploadEdit){
+        			Swal.fire('Error', 'Please complete all Mother details including Aadhar upload.', 'error');
+	                return;
+	        	}        		
+        		
+        	}
+        	else{
+        		if(!gmotherAadharUploadEdit){
+        			formData1.append("mother_aadhar_file", "");
+        			formData1.append("raw_mother_aadhar", "");
+        		}
+        		else{
+        			Swal.fire('Error', 'Please complete all Mother details including Aadhar upload.', 'error');
+	                return;
+        		}
+        	}
+        }
+
+    }
+	
+	
+	let aadharInputs = {
+    	    studentAadhar: $('#studentAadhar').val().trim(),
+    	    fatherAadhar: $('#fatherAadhar').val().trim(),
+    	    motherAadhar: $('#motherAadhar').val().trim(),
+    	    sfatherAadhar: $('#sfatherAadhar').val().trim(),
+    	    smotherAadhar: $('#smotherAadhar').val().trim(),
+    	    guardianAadhar: $('#guardianAadhar').val().trim(),
+    	    gfatherAadhar: $('#gfatherAadhar').val().trim(),
+    	    gmotherAadhar: $('#gmotherAadhar').val().trim()
+    	};
+
+    	// Friendly names for display
+    	let fieldLabels = {
+    	    studentAadhar: 'Student',
+    	    fatherAadhar: 'Father',
+    	    motherAadhar: 'Mother',
+    	    sfatherAadhar: 'Father',
+    	    smotherAadhar: 'Mother',
+    	    guardianAadhar: 'Guardian',
+    	    gfatherAadhar: 'Father',
+    	    gmotherAadhar: 'Mother'
+    	};
+    	
+    	// Map values to their corresponding field keys
+    	let valueMap = {};
+    	for (let key in aadharInputs) {
+    	    let val = aadharInputs[key];
+    	    if (val !== '') {
+    	        valueMap[val] = valueMap[val] ? [...valueMap[val], key] : [key];
+    	    }
+    	}
+
+    	// Find duplicates
+    	let duplicateEntries = Object.entries(valueMap).filter(([val, keys]) => keys.length > 1);
+
+    	if (duplicateEntries.length > 0) {
+    	   /*  let message = '';
+
+    	    duplicateEntries.forEach(([val, keys]) => {
+    	        let fieldList = keys.map(k => `• ${fieldLabels[k] || k}`).join('<br>');
+    	        message += `<strong>Aadhar:</strong> ${val}<br><em>Used in:</em><br>${fieldList}<br><br>`;
+    	    }); */
+
+    	    Swal.fire({
+    	        icon: 'warning',
+    	        title: 'Duplicate Aadhar Numbers Found',
+    	        //html: message
+    	    });
+
+    	    return; // Stop further processing
+    	}
+    	
+    	//Map input IDs to friendly labels
+    	let fileFieldsEdit = {
+    	    studentAadharUpload: 'Student',
+    	    fatherAadharUpload: 'Father',
+    	    motherAadharUpload: 'Mother',
+    	    sfatherAadharUpload: 'Father',
+    	    smotherAadharUpload: 'Mother',
+    	    guardianAadharUpload: 'Guardian',
+    	    gfatherAadharUpload: 'Father',
+    	    gmotherAadharUpload: 'Mother'
+    	};
+
+    	// On form submit or trigger point
+    	function checkDuplicateFileNamesEdit() {
+    		//console.log("hiiiiii-2");
+    	    let fileNameMap = {};
+
+    	    for (let id in fileFieldsEdit) {
+    	        let input = document.getElementById(id);
+    	        if (input && input.files.length > 0) {
+    	            let fileName = input.files[0].name.trim();
+    	            
+    	         // Add this debug log to check file name
+
+    	            if (fileNameMap[fileName]) {
+    	                fileNameMap[fileName].push(fileFieldsEdit[id]);
+    	            } else {
+    	                fileNameMap[fileName] = [fileFieldsEdit[id]];
+    	            }
+    	        }
+    	    }
+
+    	    // Find duplicates
+    	    let duplicates = Object.entries(fileNameMap).filter(([name, fields]) => fields.length > 1);
+				
+    	    //console.log("duplicates.length==="+duplicates.length);
+    	    if (duplicates.length > 0) {
+    	    	
+    	        /* let message = '';
+    	        duplicates.forEach(([name, fields]) => {
+    	            let usedIn = fields.map(f => `• ${f}`).join('<br>');
+    	            message += `<strong>File:</strong> ${name}<br><em>Used in:</em><br>${usedIn}<br><br>`;
+    	        }); */
+
+    	        Swal.fire({
+    	            icon: 'error',
+    	            title: 'Duplicate Aadhar Files Found',
+    	            //html: message
+    	        });
+
+    	        return false; // stop form submission or further processing
+    	    }
+
+    	    return true; // no duplicates
+    	}
+    	
+    	
+    	if (!checkDuplicateFileNamesEdit()) {
+    		
+            e.preventDefault(); // stop form submit
+            return;
+        }
+	
+	
+	for (let pair of formData1.entries()) {
+	    console.log(pair[0] + ':', pair[1]);
+	}
+	$('#pageLoader').show();
+	 // Send AJAX request
+	   $('#updateStudentdDetails').prop('disabled', true).text('Updating...');
+	      $.ajax({
+	        url: '/gcc/api/gccschool/studentInfo/updateStudent', 
+	        type: 'POST',
+	        data: formData1,
+	        contentType: false,
+	        processData: false,
+	        success: function (response) {
+	        	 $('#pageLoader').hide();
+	        	$('#updateStudentdDetails').prop('disabled', false).text('Update');
+	        	if (response.Message === 'Success') {
+	                Swal.fire({
+	                    icon: 'success',
+	                    title: 'Success',
+	                    allowOutsideClick: false, 
+	                    allowEscapeKey: false, 
+	                    allowEnterKey: false, 
+	                    showConfirmButton: true,
+	                    text: 'Student details '+response.Data+ '!'
+	                }).then((result) => {
+	                    if (result.isConfirmed) {	                    		                    	
+	                    	location.reload();
+	                    }
+	                });
+	                
+	            } 
+	        		        	
+	        	else if (response.Message === 'Error') {
+	                Swal.fire({
+	                    icon: 'error',
+	                    title: 'Error',
+	                    text: response.Data || 'An unknown error occurred.'
+	                });
+	            } else {
+	            	 let errorMessage = 'An error occurred while updating student details.';
+	            	    if (xhr.responseJSON && xhr.responseJSON.Error) {
+	            	        errorMessage = xhr.responseJSON.Error;
+	            	    }
+	            	    Swal.fire({
+	            	        icon: 'error',
+	            	        title: 'Error',
+	            	        text: errorMessage
+	            	    });
+	            	    console.error('AJAX error:', error);
+	            }
+	            
+	        },
+	        error: function () {
+	        	 $('#pageLoader').hide();
+	        	$('#updateStudentdDetails').prop('disabled', false).text('Update');
+	            Swal.fire({
+	                icon: 'error',
+	                title: 'Error',
+	                text: 'Something went wrong while saving.'
+	            });
+	        }
+	    }); 
+	
+});
+	
+	
+	
+	
+	function sentAddStudent(standard){
+		$('#AddStudentModal').modal('show');
+		//console.log("answwer=="+standard)
+		
+		$('#standard').val(standard);
+		
+		// Clear all other input fields
+	    $('#studentName').val("");
+	    $('#EmisNumber').val("").prop('readonly', false);
+	    $('#gender').prop('selectedIndex', 0);
+	    $('#dob').val("");
+	    $('#age').val("");
+	    $('#parentType').val(''); 
+	    
+	    $('#medium').val(''); 
+	    $('#section').val(''); 
+	    
+	    $('#studentAadhar').val('');
+	    
+	    //$('#studentAadharUpload').replaceWith($('#studentAadharUpload').clone());
+	    
+	    let sufileInput = $('#studentAadharUpload');
+	    let newFileInput = sufileInput.clone();
+	    newFileInput.val('');
+	    sufileInput.replaceWith(newFileInput);
+	    
+	     $('#singleParentDiv,#singleParentMotherDiv ,#guardianDiv, #parentDiv').hide().each(function () {
+	        // Reset all input, select, and textarea fields inside each div
+	        $(this).find('input, select, textarea').each(function () {
+	            if ($(this).attr('type') === 'file') {
+	                // Replace file input with its clone to clear safely
+	                //$(this).replaceWith($(this).clone());
+	                //console.log("vvvvvvv");
+	                 $(this).val(''); // Better than replacing
+	            } else {
+	                $(this).val('');
+	            }
+	        });
+	    }); 
+	     
+	     $('#parentDiv').hide();
+    	 $('#singleParentFatherDiv').hide();
+    	 $('#singleParentMotherDiv').hide();
+    	 $('#guardianDiv').hide();
+    	 $('#studentAadharPreview').hide();
+    	 
+    	 
+    	 $('#updateStudentdDetails').hide();
+    	 $('#saveStudentdDetails').show();
+	    
+		
+	    $('#AddStudentModalTitle').text('Add Student for '+standard);
+	}
+	
+	
+	function sentViewStudentList(viewstandard,globalUdise){
+		//console.log("======="+viewstandard,globalUdise);
+		
+		 $.ajax({
+		        url: '/gcc/api/gccschool/studentInfo/getStudentsClass', 
+		        type: 'GET',
+		        data: {std:viewstandard,udise:globalUdise},
+		        success: function (response) {
+		        	if (response.Message === 'Success') {
+		        		 const students = response.Data;
+		                 const $tbody = $('#StudentListDatatable tbody');
+		                 $tbody.empty(); // Clear previous rows if any
+		                 
+		              // Reinitialize or refresh DataTable if already initialized
+		                 if ($.fn.DataTable.isDataTable('#StudentListDatatable')) {
+		                     $('#StudentListDatatable').DataTable().clear().destroy();
+		                 }
+
+		                 students.forEach((student, index) => {
+		                     const row = `
+		                         <tr>
+		                             <td class="text-center">${index + 1}</td>
+		                             <td class="text-center">${student.student_name}</td>
+		                             <td class="text-center">${student.emis_no}</td>
+		                             <td >
+		                                 <button class="btn btn-sm btn-success view-student-btn" data-student-id="${student.student_id}">
+		                                 <i class="ik ik-eye"></i>
+		                                 </button>
+		                                 <button class="btn btn-sm btn-primary edit-student-btn ml-2" data-student-id="${student.student_id}">
+		                                 <i class="ik ik-edit"></i>
+		                                 </button>
+		                                 <button class="btn btn-sm btn-warning delete-student-btn ml-2" data-student-id="${student.student_id}" data-student-name="${student.student_name}">
+		                                 <i class="ik ik-trash-2"></i>
+		                                 </button>
+		                             </td>
+		                         </tr>
+		                     `;
+		                     $tbody.append(row);
+		                 });
+
+		                 
+
+		                 //$('#StudentListDatatable').DataTable();
+		                 $('#StudentListDatatable').DataTable({
+		                	 autoWidth: false, 
+		                	    columnDefs: [
+		                	        { width: "10%", targets: 0 }, // S.NO column
+		                	        { width: "30%", targets: 1 }, // Name
+		                	        { width: "20%", targets: 2 }, // EMIS Number
+		                	        { width: "40%", targets: 3 }  // Action
+		                	    ],
+		                     dom: 'Bfrtip',
+		                     buttons: [{
+		             			title: 'Data export',
+		            			extend: 'copyHtml5',
+		            			text: 'Copy',
+		            			className: 'btn btn-secondary',
+		            			id: 'copyBtn'
+		            		},
+		            		{
+		            			extend: 'excelHtml5',
+		            			text: 'Excel',
+		            			className: 'btn btn-secondary',
+		            			id: 'excelBtn',
+		            			title: viewstandard+' Students List'
+		            		},
+		            		{
+		            			extend: 'csvHtml5',
+		            			text: 'CSV',
+		            			className: 'btn btn-secondary',
+		            			id: 'csvBtn',
+		            			title: viewstandard+' Students List'
+		            		},
+		            		{
+		            			extend: 'pdfHtml5',
+		            			text: 'PDF',
+		            			className: 'btn btn-secondary',
+		            			id: 'pdfBtn',
+		            			title: viewstandard+' Students List'
+		            		},
+		            		{
+		            			extend: 'print',
+		            			text: 'Print',
+		            			className: 'btn btn-secondary',
+		            			id: 'printBtn',
+		            			title: 'School Students List',
+		            			exportOptions: {
+		            				columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
+		            			}
+		            		}]
+		                 });
+
+		                 // Show the modal after loading data
+		                 $('#StudentListModal').modal('show');
+		                 $('#StudentListModalTitle').text(viewstandard+' Students List');
+		             } 
+		        	else if (response.Message === 'Error') {
+		                Swal.fire({
+		                    icon: 'error',
+		                    title: 'Error',
+		                    text: response.Error || 'An unknown error occurred.'
+		                });
+		            }
+		        	else {
+		                 console.log("Failed to fetch student list.");
+		             }
+		                		            		            
+		        },
+		        error: function () {
+		            Swal.fire({
+		                icon: 'error',
+		                title: 'Error',
+		                text: 'Something went wrong while Retrieving.'
+		            });
+		        }
+		    });
+	}
+	
+	/* function sentEditStudentList(editstandard,globalUdise){
+		console.log("="+editstandard,globalUdise);
+		
+		 $.ajax({
+		        url: '/gcc/api/gccschool/studentInfo/getStudentsClass', 
+		        type: 'GET',
+		        data: {std:editstandard,udise:globalUdise},
+		        success: function (response) {
+		        	if (response.Message === 'Success') {
+		        		 const students = response.Data;
+		                 const $tbody = $('#EditStudentListDatatable tbody');
+		                 $tbody.empty(); // Clear previous rows if any
+		                 
+		              // Reinitialize or refresh DataTable if already initialized
+		                 if ($.fn.DataTable.isDataTable('#EditStudentListDatatable')) {
+		                     $('#EditStudentListDatatable').DataTable().clear().destroy();
+		                 }
+
+		                 students.forEach((student, index) => {
+		                     const row = `
+		                         <tr>
+		                             <td class="text-center">${index + 1}</td>
+		                             <td class="text-center">${student.student_name}</td>
+		                             <td class="text-center">${student.emis_no}</td>
+		                             <td class="text-center">
+		                                 <button class="btn btn-sm btn-warning edit-student-btn" data-student-id="${student.student_id}">
+		                                     Edit
+		                                 </button>
+		                             </td>
+		                         </tr>
+		                     `;
+		                     $tbody.append(row);
+		                 });
+
+		                 
+
+		                 //$('#StudentListDatatable').DataTable();
+		                 $('#EditStudentListDatatable').DataTable({
+		                     dom: 'Bfrtip',
+		                     buttons: [{
+		             			title: 'Data export',
+		            			extend: 'copyHtml5',
+		            			text: 'Copy',
+		            			className: 'btn btn-secondary',
+		            			id: 'copyBtn'
+		            		},
+		            		{
+		            			extend: 'excelHtml5',
+		            			text: 'Excel',
+		            			className: 'btn btn-secondary',
+		            			id: 'excelBtn',
+		            			title: viewstandard+' Standard List'
+		            		},
+		            		{
+		            			extend: 'csvHtml5',
+		            			text: 'CSV',
+		            			className: 'btn btn-secondary',
+		            			id: 'csvBtn',
+		            			title: viewstandard+' Standard List'
+		            		},
+		            		{
+		            			extend: 'pdfHtml5',
+		            			text: 'PDF',
+		            			className: 'btn btn-secondary',
+		            			id: 'pdfBtn',
+		            			title: viewstandard+' Standard List'
+		            		},
+		            		{
+		            			extend: 'print',
+		            			text: 'Print',
+		            			className: 'btn btn-secondary',
+		            			id: 'printBtn',
+		            			title: 'School Standard List',
+		            			exportOptions: {
+		            				columns: ':visible:not(.no-print)' // Exclude columns with class 'no-print' from print view
+		            			}
+		            		}]
+		                 });
+
+		                 // Show the modal after loading data
+		                 $('#EditStudentListModal').modal('show');
+		                 $('#EditStudentListModalTitle').text(editstandard+' Students List');
+		             } 
+		        	else if (response.Message === 'Error') {
+		                Swal.fire({
+		                    icon: 'error',
+		                    title: 'Error',
+		                    text: response.Error || 'An unknown error occurred.'
+		                });
+		            }
+		        	else {
+		                 console.log("Failed to fetch student list.");
+		             }
+		                		            		            
+		        },
+		        error: function () {
+		            Swal.fire({
+		                icon: 'error',
+		                title: 'Error',
+		                text: 'Something went wrong while Retrieving.'
+		            });
+		        }
+		    });
+	} */
+	
+	function sentStudentDetails(studentview){
+		
+		$('#viewstudentName').text('-');
+	    $('#viewEmisNumber').text('-');
+	    $('#viewgender').text('-');
+	    $('#viewstandard').text('-');
+	    $('#viewdob').text('-');
+	    $('#viewage').text('-');
+	    $('#viewstudentAadharNumber').text('-');
+	    $('#viewsection').text('-');
+	    $('#viewmedium').text('-');
+	    $('#viewparentType').text('-');
+	    
+	    $('#viewfatherName').text('-');
+	    $('#viewmotherName').text('-');
+	    $('#viewfatherMobile').text('-');
+	    $('#viewmotherMobile').text('-');
+	    $('#viewfatherAadhar').text('-');
+	    $('#viewmotherAadhar').text('-');
+	    $('#viewguardianName').text('-');
+		$('#viewguardianMobile').text('-');
+		$('#viewguardianAadhar').text('-');
+		
+		$('#viewfatherAadharUpload').html('<span class="text-muted">N/A</span>');
+		$('#viewmotherAadharUpload').html('<span class="text-muted">N/A</span>');
+		$('#viewguardianAadharUpload').html('<span class="text-muted">N/A</span>');
+		$('#viewstudentAadharUpload').html('<span class="text-muted">N/A</span>');
+		
+		//console.log("studentview=="+studentview);
+		 
+		 $.ajax({
+	        url: '/gcc/api/gccschool/studentInfo/getStudentsDetails', 
+	        type: 'GET',
+	        data: {studentId:studentview},
+	        success: function (response) {
+	        	//console.log(response.Data);
+	        	if (response.Message === 'Success') {
+	        		
+	        		const student = response.Data[0];
+
+	                // Populate fields
+	               	$('#viewstudentName').text(student.student_name || '-');
+				    $('#viewEmisNumber').text(student.emis_no || '-');
+				    $('#viewgender').text(student.gender || '-');
+				    $('#viewstandard').text(student.std || '-');
+				    //$('#viewdob').text(student.dob || '-');
+				    const dobFormatted = student.dob ? formatDateToDMY(student.dob) : '-';
+        			$('#viewdob').text(dobFormatted);
+				    $('#viewage').text(student.age || '-');
+				    $('#viewstudentAadharNumber').text(student.student_aadhar || '-');
+				    $('#viewsection').text(student.section || '-');				   				    
+				    $('#viewmedium').text(student.mediums || '-');
+				    
+				    $('#viewparentType').text(student.parent_type || '-');
+				    
+				    function renderFileButton(containerId, fileUrl, label) {
+				        if (fileUrl) {
+				            $(`#${containerId}`).html(
+				                `<button class="btn  btn-primary"  onclick="openDocModal('${fileUrl}')">View File</button>`
+				            );
+				        } else {
+				            $(`#${containerId}`).html('<span class="text-muted">N/A</span>');
+				        }
+				    }
+				    
+				    if(student.parent_type ==='Parent'){
+				    	
+				    	$('#viewfatherName').text(student.father_name || '-');
+					    $('#viewmotherName').text(student.mother_name || '-');
+					    $('#viewfatherMobile').text(student.father_mobile || '-');
+					    $('#viewmotherMobile').text(student.mother_mobile || '-');
+					    $('#viewfatherAadhar').text(student.father_aadhar || '-');
+					    $('#viewmotherAadhar').text(student.mother_aadhar || '-');
+					    renderFileButton('viewfatherAadharUpload', student.view_father_aadhar_file, 'Father Aadhar');
+					    renderFileButton('viewmotherAadharUpload', student.view_mother_aadhar_file, 'Mother Aadhar');
+				    }
+				    
+				    else if(student.parent_type ==='SingleParent_Father'){
+				    	
+						$('#viewfatherName').text(student.father_name || '-');
+						 $('#viewfatherMobile').text(student.father_mobile || '-');
+						 $('#viewfatherAadhar').text(student.father_aadhar || '-');
+						 renderFileButton('viewfatherAadharUpload', student.view_father_aadhar_file, 'Father Aadhar');
+				    }
+					
+				    else if(student.parent_type ==='SingleParent_Mother'){
+				    	
+						$('#viewmotherName').text(student.mother_name || '-');
+						$('#viewmotherMobile').text(student.mother_mobile || '-');
+						$('#viewmotherAadhar').text(student.mother_aadhar || '-');
+						renderFileButton('viewmotherAadharUpload', student.view_mother_aadhar_file, 'Mother Aadhar');
+				    }
+					
+				    else if(student.parent_type ==='Guardian'){
+				    	
+						$('#viewguardianName').text(student.guardian_name || '-');
+						$('#viewguardianMobile').text(student.guardian_mobile || '-');
+						$('#viewguardianAadhar').text(student.guardian_aadhar || '-');
+						renderFileButton('viewguardianAadharUpload', student.view_guardian_aadhar_file, 'Guardian Aadhar');
+						$('#viewfatherName').text(student.father_name || '-');
+					    $('#viewmotherName').text(student.mother_name || '-');
+					    $('#viewfatherMobile').text(student.father_mobile || '-');
+					    $('#viewmotherMobile').text(student.mother_mobile || '-');
+					    $('#viewfatherAadhar').text(student.father_aadhar || '-');
+					    $('#viewmotherAadhar').text(student.mother_aadhar || '-');
+					    renderFileButton('viewfatherAadharUpload', student.view_father_aadhar_file, 'Father Aadhar');
+					    renderFileButton('viewmotherAadharUpload', student.view_mother_aadhar_file, 'Mother Aadhar');
+						
+				    }
+				    
+				   /*  $('#viewfatherName').text(student.father_name || '-');
+				    $('#viewmotherName').text(student.mother_name || '-');
+				    $('#viewguardianName').text(student.guardian_name || '-');
+
+				    $('#viewfatherMobile').text(student.father_mobile || '-');
+				    $('#viewmotherMobile').text(student.mother_mobile || '-');
+				    $('#viewguardianMobile').text(student.guardian_mobile || '-');
+
+				    $('#viewfatherAadhar').text(student.father_aadhar || '-');
+				    $('#viewmotherAadhar').text(student.mother_aadhar || '-');
+				    $('#viewguardianAadhar').text(student.guardian_aadhar || '-'); */
+
+				    // Aadhar File Buttons
+				    
+/* 				    renderFileButton('viewfatherAadharUpload', student.view_father_aadhar_file, 'Father Aadhar');
+				    renderFileButton('viewmotherAadharUpload', student.view_mother_aadhar_file, 'Mother Aadhar');
+				    renderFileButton('viewguardianAadharUpload', student.view_guardian_aadhar_file, 'Guardian Aadhar'); */
+				    renderFileButton('viewstudentAadharUpload', student.view_student_aadhar_file, 'Student Aadhar');
+	               
+	                 
+
+	                $('#SpecificStudentModal').modal('show');
+	                $('#SpecificStudentModalTitle').text(student.student_name+' Student Details');
+	             } 
+	        	else if (response.Message === 'Error') {
+	                Swal.fire({
+	                    icon: 'error',
+	                    title: 'Error',
+	                    text: response.Error || 'An unknown error occurred.'
+	                });
+	            }
+	        	else {
+	                 console.log("Failed to fetch student Data.");
+	             }
+	                		            		            
+	        },
+	        error: function () {
+	            Swal.fire({
+	                icon: 'error',
+	                title: 'Error',
+	                text: 'Something went wrong while Retrieving.'
+	            });
+	        }
+	    }); 
+		
+	}
+	
+	function formatDateToDMY(dateStr) {
+	    const [year, month, day] = dateStr.split('-');
+	    return `${day}-${month}-${year}`;
+	}
+	
+function sentEditStudentDetails(studentedit){
+		
+		//console.log("studentedit=="+studentedit);
+		 
+		 $.ajax({
+	        url: '/gcc/api/gccschool/studentInfo/getStudentsDetails', 
+	        type: 'GET',
+	        data: {studentId:studentedit},
+	        success: function (response) {
+	        	//console.log(response.Data);
+	        	if (response.Message === 'Success') {
+	        		
+	        		const student = response.Data[0];
+	        		
+	        		$('#student_id').text(student.student_id);
+	        		
+	        		$('#studentName').val(student.student_name);
+	        		$('#EmisNumber').val(student.emis_no).prop('readonly', true);
+				    $('#standard').val(student.std);
+				    $('#sectionDropdown').val(student.section);
+				    $('#medium').val(student.mediums);
+				    $('#gender').val(student.gender);
+				    
+				    $('#dob').val(student.dob);
+				    $('#age').val(student.age);
+				    $('#studentAadhar').val(student.student_aadhar);
+				   
+				    $('#parentType').val(student.parent_type);
+				    
+				    $('#raw_father_file').text(student.father_aadhar_file);
+				    $('#raw_mother_file').text(student.mother_aadhar_file);
+				    $('#raw_guardian_file').text(student.guardian_aadhar_file);
+				    $('#raw_student_file').text(student.student_aadhar_file);
+				    
+				    $('#previous_father_aadhar').text(student.father_aadhar);
+				    $('#previous_mother_aadhar').text(student.mother_aadhar);
+				    $('#previous_guardian_aadhar').text(student.guardian_aadhar);
+				    $('#previous_student_aadhar').text(student.student_aadhar);
+				    
+				    $('#fatherAadharUpload, #motherAadharUpload, #sfatherAadharUpload,#smotherAadharUpload,#gfatherAadharUpload,#guardianAadharUpload,#gmotherAadharUpload, #studentAadharUpload').val('');
+				    
+				    if (student.view_student_aadhar_file) {
+				    	
+				    	$('#studentAadharPreview').show();
+				    	// Extract file name from URL
+				        const fileName = student.view_student_aadhar_file.split('/').pop();
+				    	
+				        $('#studentAadharPreview').html(`
+				            <a href="${student.view_student_aadhar_file}" target="_blank" style="color:blue;">${fileName}</a>
+				        `);
+				    } else {
+				       
+				        $('#studentAadharPreview').hide();
+				    }
+				    
+				    if(student.parent_type==='Parent'){
+				    	
+				    	 $('#parentDiv').show();
+				    	 $('#singleParentFatherDiv').hide();
+				    	 $('#singleParentMotherDiv').hide();
+				    	 $('#guardianDiv').hide();
+				    	 
+				    	 $('#fatherName').val(student.father_name);
+				    	 $('#motherName').val(student.mother_name);
+				    	 $('#fatherMobile').val(student.father_mobile);
+				    	 $('#motherMobile').val(student.mother_mobile);
+				    	 $('#fatherAadhar').val(student.father_aadhar);
+				    	 $('#motherAadhar').val(student.mother_aadhar);
+				    	 
+				    	 if (student.view_father_aadhar_file) {
+						    	
+						    	$('#FatherAadharPreview').show();
+						    	// Extract file name from URL
+						        const fileName = student.view_father_aadhar_file.split('/').pop();
+						    	
+						        $('#FatherAadharPreview').html(`
+						            <a href="${student.view_father_aadhar_file}" target="_blank" style="color:blue;">${fileName}</a>
+						        `);
+						    } else {
+						        
+						        $('#FatherAadharPreview').hide();
+						    }
+				    	 
+				    	 if (student.view_mother_aadhar_file) {
+						    	
+						    	$('#MotherAadharPreview').show();
+						    	// Extract file name from URL
+						        const fileName = student.view_mother_aadhar_file.split('/').pop();
+						    	
+						        $('#MotherAadharPreview').html(`
+						            <a href="${student.view_mother_aadhar_file}" target="_blank" style="color:blue;">${fileName}</a>
+						        `);
+						    } else {
+						        
+						        $('#MotherAadharPreview').hide();
+						    }
+				    	 
+			           
+				    }
+				    
+					if(student.parent_type==='SingleParent_Father'){
+				    	
+						$('#singleParentFatherDiv').show();
+						$('#parentDiv').hide();
+						$('#singleParentMotherDiv').hide();
+				    	$('#guardianDiv').hide();
+				    	
+				    	 $('#sfatherName').val(student.father_name);
+				    	 
+				    	 $('#sfatherMobile').val(student.father_mobile);
+				    	 
+				    	 $('#sfatherAadhar').val(student.father_aadhar);
+				    	 
+				    	 if (student.view_father_aadhar_file) {
+						    	
+						    	$('#sFatherAadharPreview').show();
+						    	// Extract file name from URL
+						        const fileName = student.view_father_aadhar_file.split('/').pop();
+						    	
+						        $('#sFatherAadharPreview').html(`
+						            <a href="${student.view_father_aadhar_file}" target="_blank" style="color:blue;">${fileName}</a>
+						        `);
+						    } else {
+						        
+						        $('#sFatherAadharPreview').hide();
+						    }
+				    	
+				    }
+
+				    if(student.parent_type==='SingleParent_Mother'){
+				    	
+				    	$('#singleParentMotherDiv').show();
+				    	$('#guardianDiv').hide();
+						$('#singleParentFatherDiv').hide();
+						$('#parentDiv').hide();
+						
+						
+				    	 $('#smotherName').val(student.mother_name);
+				    	 
+				    	 $('#smotherMobile').val(student.mother_mobile);
+				    	 
+				    	 $('#smotherAadhar').val(student.mother_aadhar);
+				    	 
+				    	 
+				    	 if (student.view_mother_aadhar_file) {
+						    	
+						    	$('#sMotherAadharPreview').show();
+						    	// Extract file name from URL
+						        const fileName = student.view_mother_aadhar_file.split('/').pop();
+						    	
+						        $('#sMotherAadharPreview').html(`
+						            <a href="${student.view_mother_aadhar_file}" target="_blank" style="color:blue;">${fileName}</a>
+						        `);
+						    } else {
+						        
+						        $('#sMotherAadharPreview').hide();
+						    }
+				    	 
+				    }
+				    
+					if(student.parent_type==='Guardian'){
+						
+						 $('#guardianDiv').show();
+						 $('#singleParentFatherDiv').hide();
+				    	 $('#singleParentMotherDiv').hide();
+				    	 $('#parentDiv').hide();
+				    	 
+				    	 
+				    	 $('#gfatherName').val(student.father_name);
+				    	 $('#gmotherName').val(student.mother_name);
+				    	 $('#gfatherMobile').val(student.father_mobile);
+				    	 $('#gmotherMobile').val(student.mother_mobile);
+				    	 $('#gfatherAadhar').val(student.father_aadhar);
+				    	 $('#gmotherAadhar').val(student.mother_aadhar);
+				    	 $('#guardianName').val(student.guardian_name);
+				    	 $('#guardianMobile').val(student.guardian_mobile);
+				    	 $('#guardianAadhar').val(student.guardian_aadhar);
+				    	 
+				    	 if (student.view_father_aadhar_file) {
+						    	
+						    	$('#gFatherAadharPreview').show();
+						    	// Extract file name from URL
+						        const fileName = student.view_father_aadhar_file.split('/').pop();
+						    	
+						        $('#gFatherAadharPreview').html(`
+						            <a href="${student.view_father_aadhar_file}" target="_blank" style="color:blue;">${fileName}</a>
+						        `);
+						    } else {
+						        
+						        $('#gFatherAadharPreview').hide();
+						    }
+				    	 
+				    	 if (student.view_mother_aadhar_file) {
+						    	
+						    	$('#gMotherAadharPreview').show();
+						    	// Extract file name from URL
+						        const fileName = student.view_mother_aadhar_file.split('/').pop();
+						    	
+						        $('#gMotherAadharPreview').html(`
+						            <a href="${student.view_mother_aadhar_file}" target="_blank" style="color:blue;">${fileName}</a>
+						        `);
+						    } else {
+						        
+						        $('#gMotherAadharPreview').hide();
+						    }
+				    	 
+				    	 if (student.view_guardian_aadhar_file) {
+						    	
+						    	$('#GuardianAadharPreview').show();
+						    	// Extract file name from URL
+						        const fileName = student.view_guardian_aadhar_file.split('/').pop();
+						    	
+						        $('#GuardianAadharPreview').html(`
+						            <a href="${student.view_guardian_aadhar_file}" target="_blank" style="color:blue;">${fileName}</a>
+						        `);
+						    } else {
+						        
+						        $('#GuardianAadharPreview').hide();
+						    }
+				    	 
+				    }
+	        		
+	        		 
+	        		$('#saveStudentdDetails').hide();
+	        		$('#updateStudentdDetails').show();
+	               
+	        		$('#AddStudentModal').css('z-index', '1055'); 
+	                $('#AddStudentModal').modal('show');
+	                $('#AddStudentModalTitle').text(student.student_name+' - Edit Details');
+	             } 
+	        	else if (response.Message === 'Error') {
+	                Swal.fire({
+	                    icon: 'error',
+	                    title: 'Error',
+	                    text: response.Error || 'An unknown error occurred.'
+	                });
+	            }
+	        	else {
+	                 console.log("Failed to fetch student Data.");
+	             }
+	                		            		            
+	        },
+	        error: function () {
+	            Swal.fire({
+	                icon: 'error',
+	                title: 'Error',
+	                text: 'Something went wrong while Retrieving.'
+	            });
+	        }
+	    }); 
+		
+	}
+	
+function sentDeleteStudentDetails(studentdelete){
+	
+	//console.log("studentdelete_id="+studentdelete);
+	//console.log("userId="+userId);
+	$('.delete-student-btn').prop('disabled', true);
+	$('#pageLoader').show();
+ 	$.ajax({
+        url: '/gcc/api/gccschool/studentInfo/deleteStudent', 
+        type: 'POST',
+        data: {
+        	student_id:studentdelete,
+        	user_id:userId,
+        	action_type:'DELETE'
+        },
+        success: function (response) {
+        	$('#pageLoader').hide();
+        	$('.delete-student-btn').prop('disabled', false);
+        	if (response.Message === 'Success') {
+                Swal.fire({
+                    icon: 'success',
+                    title: 'Success',
+                    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
+                    showConfirmButton: true, // Ensure the confirm button is visible
+                    text: 'Student details '+response.Data+' !'
+                }).then((result) => {
+                    if (result.isConfirmed) {
+                    		                    	
+                    	location.reload();
+                    }
+                });
+                
+            } 
+        	
+        	else if (response.Message === 'Error') {
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Error',
+                    text: response.Data || 'An unknown error occurred.'
+                });
+            } else {
+            	 let errorMessage = 'An error occurred while Deleting student details.';
+            	    if (xhr.responseJSON && xhr.responseJSON.Error) {
+            	        errorMessage = xhr.responseJSON.Error;
+            	    }
+            	    Swal.fire({
+            	        icon: 'error',
+            	        title: 'Error',
+            	        text: errorMessage
+            	    });
+            	    console.error('AJAX error:', error);
+            }
+            
+        },
+        error: function () {
+        	$('#pageLoader').hide();
+        	$('.delete-student-btn').prop('disabled', false);
+            Swal.fire({
+                icon: 'error',
+                title: 'Error',
+                text: 'Something went wrong while saving.'
+            });
+        }
+    }); 
+	
+}
+	
+	
+	
+	/* $('#dob').on('change', function () {
+        const dobValue = $(this).val(); // format: yyyy-mm-dd
+        if (dobValue) {
+            const today = new Date();
+            const dob = new Date(dobValue);
+            let age = today.getFullYear() - dob.getFullYear();
+            const m = today.getMonth() - dob.getMonth();
+
+            if (m < 0 || (m === 0 && today.getDate() < dob.getDate())) {
+                age--;
+            }
+
+            if (age >= 0) {
+                $('#age').val(age);
+            } else {
+                $('#age').val('');
+                Swal.fire({
+                    icon: 'warning',
+                    title: 'Invalid Date',
+                    text: 'Date of birth cannot be in the future.'
+                });
+                $('#age').val('');
+                $('#dob').val('');
+            }
+        } else {
+            $('#age').val('');
+        }
+    }); */
+    
+    
+    // Set max date to today minus 2 years
+    const today = new Date();
+    const twoYearsAgo = new Date(today.getFullYear() - 2, today.getMonth(), today.getDate());
+    const maxDate = twoYearsAgo.toISOString().split('T')[0];
+    $('#dob').attr('max', maxDate);
+
+    $('#dob').on('change', function () {
+        const dobValue = $(this).val(); // format: yyyy-mm-dd
+        if (dobValue) {
+            const today = new Date();
+            const dob = new Date(dobValue);
+            let age = today.getFullYear() - dob.getFullYear();
+            const m = today.getMonth() - dob.getMonth();
+
+            if (m < 0 || (m === 0 && today.getDate() < dob.getDate())) {
+                age--;
+            }
+
+            if (age >= 0) {
+                $('#age').val(age);
+            } else {
+                $('#age').val('');
+                Swal.fire({
+                    icon: 'warning',
+                    title: 'Invalid Date',
+                    text: 'Date of birth cannot be in the future.'
+                });
+                $('#age').val('');
+                $('#dob').val('');
+            }
+        } else {
+            $('#age').val('');
+        }
+    });
+	
+	
+
+
+		
+	
+	
+	document.getElementById("studentBackBtn").addEventListener("click", function () {
+        location.reload();
+    });	
+		
+		
+	
+	</script>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/school/toilets.html b/src/main/resources/templates/modules/school/toilets.html
index 9ef09cd..311fbfc 100644
--- a/src/main/resources/templates/modules/school/toilets.html
+++ b/src/main/resources/templates/modules/school/toilets.html
@@ -40,39 +40,87 @@
 			gap: 20px;
 			margin-top: 10px;
 		}
-	</style>
+		 .card1 {
+  padding: 0px;
+  margin-top: -58px;
+  margin-left: -230px;
+}
+
+
+
+/* ✅ Responsive Fix for Mobile Screens */
+@media (max-width: 768px) {
+  .card1 {
+    margin-top: 0 !important;
+   
+    padding: 15px;
+  }
+
+  .container {
+ 
+    padding-left: 10px;
+    padding-right: 10px;
+  }
+}
+ @media (max-width: 768px) {
+  #toiletDataContainer table {
+    display: block;
+    overflow-x: auto;
+    white-space: nowrap;
+  }
+}	
+
+</style>
 </head>
+<style>
+#toiletModal .modal-body {
+        max-height: 80vh;  
+        overflow-y: auto;  
+    }
+</style>
 
 <body>
-	<div class="wrapper">
-		<header th:replace="~{fragments/modules/base/header :: header}"></header>
-		<div class="page-wrap">
-			<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
-			<div class="card">
-				<div class="main-content" style="background-color: white;">
-					<div class="container">
-						<div class="col-md-12">
-							<div style="padding: 0px;margin-top:-58px;margin-left: -233px;">
-								<div class="card-header">
-									<b>Toilets</b>
-								</div>
+
+		<div class="container mt-4">
+				<header th:replace="~{fragments/modules/base/header :: header}"></header>
+				<div th:replace="~{fragments/modules/base/menu :: menu}"></div>
+	
+			<div class="card p-3">
+				<div class="card-header">
+					<b>Toilets</b>
+				</div>
 								<br>
 								<!-- View Table -->
 								<div id="toiletDataContainer" style="display: none;">
 									<table class="table table-bordered">
 										<tr>
-											<th>No of Toilet Blocks</th>
-											<td id="td_blocks"></td>
+											<!-- <th>No of Toilet Blocks</th>
+											<td id="td_blocks"></td> -->
 										
 											<th>Male Toilets (Urinals)</th>
 											<td id="td_urinals"></td>
+											
+											<th>Female Toilets (Urinals)</th>
+											<td id="td_female_urinals"></td>											
+											
 										</tr>
 										<tr>
-											<th>Male Toilets (W.C)</th>
+											<th>Male Toilets (seaters)</th>
 											<td id="td_wc_male"></td>
 										
-											<th>Female Toilets (W.C)</th>
+											<th>Female Toilets (seaters)</th>
 											<td id="td_wc_female"></td>
+											
+											
+										</tr>
+										<tr>
+											<th>Staff Toilets (Male)</th>
+											<td id="td_staff_male"></td>
+										
+											<th>Staff Toilets (Female)</th>
+											<td id="td_staff_female"></td>
+											
+											
 										</tr>
 										<tr>
 											<th>Differently Abled Toilets</th>
@@ -86,36 +134,54 @@
 									<button class="btn btn-primary" id="editToiletBtn">Update</button>
 									</div>
 								</div>
-
-								<!-- Entry Form -->
-								<form id="toiletForm" novalidate>
+	
+			<form id="toiletForm" novalidate>
 									<input type="hidden" name="school_id">
 									<input type="hidden" id="toilet_id" name="toilet_id" />
 
 									<div class="row p-3">
-										<div class="col-md-6 form-group">
+										<!-- <div class="col-md-6 form-group">
 											<label>No of Toilet Blocks *</label>
 											<input type="text" class="form-control" name="total_toiletBlocks"
 												id="total_toiletBlocks" required>
-										</div>
+										</div> -->
 										<div class="col-md-6 form-group">
 											<label>Total Male Toilets (Urinals) *</label>
 											<input type="text" class="form-control" name="total_male_urinals"
 												id="total_male_urinals" required>
 										</div>
-									</div>
-
-									<div class="row p-3">
 										<div class="col-md-6 form-group">
-											<label>Total Male Toilets (W.C) *</label>
+											<label>Total Female Toilets (Urinals) *</label>
+											<input type="text" class="form-control" name="total_female_urinals"
+												id="total_female_urinals" required>
+										</div>
+										<div class="col-md-6 form-group">
+											<label>Total Male Toilets (seaters) *</label>
 											<input type="text" class="form-control" name="total_wc_male"
 												id="total_wc_male" required>
 										</div>
 										<div class="col-md-6 form-group">
-											<label>Total Female Toilets (W.C) *</label>
+											<label>Total Female Toilets (seaters) *</label>
 											<input type="text" class="form-control" name="total_wc_female"
 												id="total_wc_female" required>
 										</div>
+									</div>
+									
+									<div class="row p-3">
+										<div class="col-md-6 form-group">
+											<label>Total Staff Toilets (Male)*</label>
+											<input type="text" class="form-control" name="staff_male_toilets"
+												id="staff_male_toilets" required>
+										</div>
+										<div class="col-md-6 form-group">
+											<label>Total Staff Toilets (Female)*</label>
+											<input type="text" class="form-control" name="staff_female_toilets"
+												id="staff_female_toilets" required>
+										</div>
+									</div>
+
+									<div class="row p-3">
+										
 										<div class="col-md-6 form-group">
 											<label>Incinerator for Napkins Disposal *</label>
 											<div class="radio-group">
@@ -137,13 +203,11 @@
 											Reset</button>
 									</div>
 								</form>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
+		
+	</div>
 		</div>
-
+		
+		
 		<!-- Modal -->
 		<div class="modal fade" id="toiletModal" tabindex="-1" aria-labelledby="toiletModalLabel" aria-hidden="true">
 			<div class="modal-dialog">
@@ -158,14 +222,20 @@
 							<input type="hidden" id="modal_toilet_id" />
 							<input type="hidden" id="modal_school_id" />
 
-							<div class="mb-2"><label>No of Toilet Blocks *</label><input type="number" id="modal_blocks"
-									class="form-control" required /></div>
+							<!-- <div class="mb-2"><label>No of Toilet Blocks *</label><input type="number" id="modal_blocks"
+									class="form-control" required /></div> -->
 							<div class="mb-2"><label>Male Toilets (Urinals) *</label><input type="number"
 									id="modal_urinals" class="form-control" required /></div>
-							<div class="mb-2"><label>Male Toilets (W.C) *</label><input type="number" id="modal_wc_male"
+							<div class="mb-2"><label>Female Toilets (Urinals) *</label><input type="number"
+									id="modal_female_urinals" class="form-control" required /></div>
+							<div class="mb-2"><label>Male Toilets (seaters) *</label><input type="number" id="modal_wc_male"
 									class="form-control" required /></div>
-							<div class="mb-2"><label>Female Toilets (W.C) *</label><input type="number"
+							<div class="mb-2"><label>Female Toilets (seaters) *</label><input type="number"
 									id="modal_wc_female" class="form-control" required /></div>
+							<div class="mb-2"><label> Total Staff Toilets (Male) *</label><input type="number"
+									id="modal_staff_male" class="form-control" required /></div>
+							<div class="mb-2"><label> Total Staff Toilets (Female) *</label><input type="number"
+									id="modal_staff_female" class="form-control" required /></div>
 							<div class="mb-2"><label>Differently Abled Toilets *</label><input type="number"
 									id="modal_disabled" class="form-control" required /></div>
 							<div class="mb-2">
@@ -186,6 +256,7 @@
 		<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
 		<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
 		<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+			<script th:replace="~{fragments/modules/base/script :: script}"></script>
 
 <script>
   $(document).ready(function () {
@@ -231,7 +302,15 @@
         
       });*/
     // ✅ Enforce only numeric input
-    ['total_toiletBlocks', 'total_male_urinals', 'total_wc_male', 'total_wc_female', 'total_diffAbled_toilet']
+    ['total_male_urinals', 'total_wc_male', 'total_wc_female', 'total_diffAbled_toilet','total_female_urinals','staff_male_toilets','staff_female_toilets']
+      .forEach(id => {
+        document.getElementById(id).addEventListener('input', function () {
+          this.value = this.value.replace(/[^0-9]/g, '');
+          if (parseInt(this.value) < 0) this.value = '';
+        });
+      });
+      
+      [ 'modal_urinals', 'modal_wc_male', 'modal_wc_female', 'modal_disabled','modal_female_urinals','modal_staff_male','modal_staff_female']
       .forEach(id => {
         document.getElementById(id).addEventListener('input', function () {
           this.value = this.value.replace(/[^0-9]/g, '');
@@ -239,6 +318,7 @@
         });
       });
 
+
     // ✅ Function to reload table data after update
     function reloadToiletTable() {
       $.get('/gcc/api/gccschool/schoolproperty/checkToiletDetails', { school_id: schoolId }, function (res) {
@@ -246,13 +326,17 @@
           const d = res[0].Data[0];
 
           // Update table with fresh values
-          $('#td_blocks').text(d.total_toiletBlocks);
+          //$('#td_blocks').text(d.total_toiletBlocks);
           $('#td_urinals').text(d.total_male_urinals);
           $('#td_wc_male').text(d.total_wc_male);
           $('#td_wc_female').text(d.total_wc_female);
           $('#td_disabled').text(d.total_diffAbled_toilet);
+          $('#td_female_urinals').text(d.total_female_urinals);
+          $('#td_staff_male').text(d.staff_male_toilet);
+          $('#td_staff_female').text(d.staff_female_toilet);
           $('#td_napkins').text(d.is_napkins === true || d.is_napkins === "true" ? 'Yes' : 'No');
 
+          
           $('#toiletDataContainer').show();
           $('#editToiletBtn').data('toiletData', d);
         }
@@ -267,11 +351,14 @@
         $('#toiletForm').hide();
         $('#toiletDataContainer').show();
 
-        $('#td_blocks').text(d.total_toiletBlocks);
+        //$('#td_blocks').text(d.total_toiletBlocks);
         $('#td_urinals').text(d.total_male_urinals);
         $('#td_wc_male').text(d.total_wc_male);
         $('#td_wc_female').text(d.total_wc_female);
         $('#td_disabled').text(d.total_diffAbled_toilet);
+        $('#td_female_urinals').text(d.total_female_urinals);
+        $('#td_staff_male').text(d.staff_male_toilet);
+        $('#td_staff_female').text(d.staff_female_toilet);
         $('#td_napkins').text(d.is_napkins === true ? 'Yes' : 'No');
 
         $('#editToiletBtn').data('toiletData', d);
@@ -284,12 +371,16 @@
     // ✅ Save new toilet form (first time entry)
     $('#toiletForm').submit(function (e) {
       e.preventDefault();
-      const blocks = parseInt($('#total_toiletBlocks').val()) || 0;
+      //const blocks = parseInt($('#total_toiletBlocks').val()) || 0;
       const urinals = parseInt($('#total_male_urinals').val()) || 0;
       const wc_male = parseInt($('#total_wc_male').val()) || 0;
       const wc_female = parseInt($('#total_wc_female').val()) || 0;
       const diff_abled = parseInt($('#total_diffAbled_toilet').val()) || 0;
       const isNapkins = $('input[name="is_napkins"]:checked').val();
+      
+      const feurinals = parseInt($('#total_female_urinals').val()) || 0;
+      const staff_male_toilets = parseInt($('#staff_male_toilets').val()) || 0;
+      const staff_female_toilets = parseInt($('#staff_female_toilets').val()) || 0;
     /*  if (blocks === 0) {
     	  $('#total_male_urinals').val(0);
     	  $('#total_wc_male').val(0);
@@ -297,7 +388,7 @@
     	  $('#total_diffAbled_toilet').val(0);
     	}*/
 
-      if ($('#total_toiletBlocks').val().trim() === '') {
+      /* if ($('#total_toiletBlocks').val().trim() === '') {
           return Swal.fire({
               icon: 'warning',
               title: 'Validation Error',
@@ -307,7 +398,7 @@
               allowEnterKey: false,
               showConfirmButton: true
           });
-      }
+      } */
       if ($('#total_male_urinals').val().trim() === '') {
     	    return Swal.fire({
     	        icon: 'warning',
@@ -319,6 +410,18 @@
     	        showConfirmButton: true
     	    });
     	}
+      
+      if ($('#total_female_urinals').val().trim() === '') {
+  	    return Swal.fire({
+  	        icon: 'warning',
+  	        title: 'Validation Error',
+  	        text: 'Enter number of Female Urinals (0 or more).',
+  	        allowOutsideClick: false,
+  	        allowEscapeKey: false,
+  	        allowEnterKey: false,
+  	        showConfirmButton: true
+  	    });
+  	}
 
       if ($('#total_wc_male').val().trim() === '') {
     	    return Swal.fire({
@@ -343,6 +446,30 @@
     	        showConfirmButton: true
     	    });
     	}
+    	
+    	if ($('#staff_male_toilets').val().trim() === '') {
+    	    return Swal.fire({
+    	        icon: 'warning',
+    	        title: 'Validation Error',
+    	        text: 'Enter number of Staff Toilets(Male) (0 or more).',
+    	        allowOutsideClick: false,
+    	        allowEscapeKey: false,
+    	        allowEnterKey: false,
+    	        showConfirmButton: true
+    	    });
+    	}
+    	
+    	if ($('#staff_female_toilets').val().trim() === '') {
+    	    return Swal.fire({
+    	        icon: 'warning',
+    	        title: 'Validation Error',
+    	        text: 'Enter number of Staff Toilets(Female) (0 or more).',
+    	        allowOutsideClick: false,
+    	        allowEscapeKey: false,
+    	        allowEnterKey: false,
+    	        showConfirmButton: true
+    	    });
+    	}
     	   if (typeof isNapkins === 'undefined') {
        	    return Swal.fire({
        	        icon: 'warning',
@@ -386,28 +513,30 @@
 
       const formData = new FormData(this);
       
-      $.ajax({
+       $.ajax({
         type: 'POST',
         url: '/gcc/api/gccschool/schoolproperty/saveToilets',
         data: formData,
         processData: false,
         contentType: false,
-        success: res => {
-         // Swal.fire('Saved', res, 'success').then(() => {
-        	 Swal.fire({
-  title: 'Saved',
-  text: res,
-  icon: 'success',
-  allowOutsideClick: false,
-  allowEscapeKey: false,
-  allowEnterKey: false,
-  showConfirmButton: true
-}).then(() => {
-        	  location.reload();
-           // $('#toiletForm').hide();
-           // reloadToiletTable(); // refresh table
-          });
-        },
+        success: function (response) {
+        	  Swal.fire({
+        	    icon: response.includes("already") ? "info" : "success",
+        	    title: response.includes("already") ? "Info" : "Data Saved!",
+        	    text: response,
+        	    confirmButtonColor: "#3085d6",
+        	    allowOutsideClick: false,
+        	    allowEscapeKey: false,
+        	    allowEnterKey: false,
+        	    showConfirmButton: true
+        	  }).then(() => {
+        	  
+        	      $("#toiletForm")[0].reset(); // Optional: reset form if saved
+        	      location.reload(); // Reload only if new data inserted
+        	    
+        	  });
+        	},
+
         error: xhr =>Swal.fire({
         	  title: 'Error',
         	  text: xhr.responseText || 'Unknown error',
@@ -417,8 +546,9 @@
         	  allowEnterKey: false,
         	  showConfirmButton: true
         	})
- //Swal.fire('Error', xhr.responseText || 'Unknown error', 'error')
-      });
+ 
+      }); 
+      
     });
 
 	let originalModalData = {};
@@ -428,22 +558,27 @@
 	
 
 	  $('#modal_toilet_id').val(d.toilet_id);
-	  $('#modal_blocks').val(d.total_toiletBlocks);
+	  //$('#modal_blocks').val(d.total_toiletBlocks);
 	  $('#modal_urinals').val(d.total_male_urinals);
 	  $('#modal_wc_male').val(d.total_wc_male);
 	  $('#modal_wc_female').val(d.total_wc_female);
 	  $('#modal_disabled').val(d.total_diffAbled_toilet);
+	  $('#modal_female_urinals').val(d.total_female_urinals);
+	  $('#modal_staff_male').val(d.staff_male_toilet);
+	  $('#modal_staff_female').val(d.staff_female_toilet);
 	  $(`input[name="modal_napkins"][value="${d.is_napkins}"]`).prop('checked', true);
 
 	  // ✅ Store original values
 	  originalModalData = {
-	    total_toiletBlocks: d.total_toiletBlocks.toString(),
-	    total_male_urinals: d.total_male_urinals.toString(),
-	    total_wc_male: d.total_wc_male.toString(),
-	    total_wc_female: d.total_wc_female.toString(),
-	    total_diffAbled_toilet: d.total_diffAbled_toilet.toString(),
-	    is_napkins: d.is_napkins.toString()
-	  };
+  total_male_urinals: d.total_male_urinals != null ? d.total_male_urinals.toString() : d.total_male_urinals,
+  total_wc_male: d.total_wc_male != null ? d.total_wc_male.toString() : d.total_wc_male,
+  total_wc_female: d.total_wc_female != null ? d.total_wc_female.toString() : d.total_wc_female,
+  total_diffAbled_toilet: d.total_diffAbled_toilet != null ? d.total_diffAbled_toilet.toString() : d.total_diffAbled_toilet,
+  is_napkins: d.is_napkins != null ? d.is_napkins.toString() : d.is_napkins,
+  total_female_urinals: d.total_female_urinals != null ? d.total_female_urinals.toString() : d.total_female_urinals,
+  staff_male_toilets: d.staff_male_toilet != null ? d.staff_male_toilet.toString() : d.staff_male_toilet,
+  staff_female_toilets: d.staff_female_toilet != null ? d.staff_female_toilet.toString() : d.staff_female_toilet,
+};
 
 	  const modal = new bootstrap.Modal(document.getElementById('toiletModal'));
 	  modal.show();
@@ -451,11 +586,14 @@
 
 	$('#toiletUpdateForm').submit(function (e) {
 	  e.preventDefault();
-	  const updateBlocks = parseInt($('#modal_blocks').val()) || 0;
+	  //const updateBlocks = parseInt($('#modal_blocks').val()) || 0;
 	  const updateUrinals = parseInt($('#modal_urinals').val()) || 0;
 	  const updateWCMale = parseInt($('#modal_wc_male').val()) || 0;
 	  const updateWCFemale = parseInt($('#modal_wc_female').val()) || 0;
 	  const updateDisabled = parseInt($('#modal_disabled').val()) || 0;
+	  const updateFemaleUrinals = parseInt($('#modal_female_urinals').val()) || 0;
+	  const updateStafftoiletMale = parseInt($('#modal_staff_male').val()) || 0;
+	  const updateStafftoiletFemale = parseInt($('#modal_staff_female').val()) || 0;
 	/*  if (!updateBlocks ) {
           return Swal.fire({
               icon: 'warning',
@@ -484,12 +622,15 @@
 	  }*/
 
 	  const currentData = {
-	    total_toiletBlocks: $('#modal_blocks').val(),
+	    //total_toiletBlocks: $('#modal_blocks').val(),
 	    total_male_urinals: $('#modal_urinals').val(),
 	    total_wc_male: $('#modal_wc_male').val(),
 	    total_wc_female: $('#modal_wc_female').val(),
 	    total_diffAbled_toilet: $('#modal_disabled').val(),
-	    is_napkins: $('input[name="modal_napkins"]:checked').val()
+	    is_napkins: $('input[name="modal_napkins"]:checked').val(),
+	    total_female_urinals:$('#modal_female_urinals').val(),
+	    staff_male_toilets:$('#modal_staff_male').val(),
+	    staff_female_toilets:$('#modal_staff_female').val()
 	  };
 
 	  // ✅ Check if any value has changed
diff --git a/src/main/resources/templates/modules/vendors/EventList.html b/src/main/resources/templates/modules/vendors/EventList.html
new file mode 100644
index 0000000..05844b0
--- /dev/null
+++ b/src/main/resources/templates/modules/vendors/EventList.html
@@ -0,0 +1,649 @@
+<!DOCTYPE html>
+
+<html xmlns:th="http://www.thymeleaf.org">
+<head th:replace="~{fragments/modules/base/head :: head}"></head>
+<style>
+.required{
+	color: red;
+}
+/* Mobile screens - targeting devices with a max width of 767px */
+@media (max-width: 767px) 
+{
+	#requestlistform label{
+		margin-top: 10px;
+	} 
+}
+
+    #viewModal .modal-body {
+        max-height: 70vh;  /* Limit the height to 70% of the viewport */
+        overflow-y: auto;  /* Enable vertical scrolling */
+    }
+    
+    .custom-doc-btn {
+  height: 20px;
+  width: 80px;
+  font-size: 9px;
+  font-weight:bold;
+  text-align: center;
+  padding: 0px;
+  border:1px solid grey;
+}
+
+.col-md-3{
+padding-bottom: 10px; 
+}
+
+.comment {
+        margin-bottom: 20px;
+    }
+
+    .comment p {
+        margin: 0;
+    }
+
+    hr {
+        border: 1px solid #ccc;
+    }
+
+    .comment {
+        padding: 10px 0;
+    }
+
+    .comment .text-muted {
+        font-size: 0.9em;
+        color: #6c757d;
+    }
+
+    .comment hr {
+        border-top: 1px solid #ccc;
+    }
+</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="far fa-calendar-plus bg-blue"></i>
+									<div class="d-inline">
+										<h5>Event List</h5>
+										<span>Vending Committe</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">Vending Committe</li>
+										<li class="breadcrumb-item active" aria-current="page">Event List</li>
+									</ol>
+								</nav>
+							</div>
+						</div>
+					</div>
+					
+					<div class="row">
+					
+						
+						<div class="col-md-12" >
+						    <div class="card">
+						        <div class="card-block">
+						        
+						        <div class="form-group col-sm-12">
+							        <label for="dropdownevent">Select Event
+							        <span class="text-danger">*</span></label>
+							        <select id="dropdownevent" class="form-control">							          
+							        </select>
+							    </div>	
+						        
+						        
+						        <div class="page-header-title" >
+									<h5 style="margin: 0;font-weight: bold;">Vendors Event List</h5><hr>
+							   </div> 
+						        
+						            <div>
+						                <table id="RequestListDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
+						                    <thead class="thead-dark">
+						                        <tr role="row">
+						                            <th class="text-center">S.No</th>                                                  
+						                            <th class="text-center">Request No</th>
+						                            <th class="text-center">Name</th>
+						                            <th class="text-center">Mobile</th>
+						                            <th class="text-center">Address</th>
+						                            <th class="text-center">Postal Code</th>
+						                            <th class="text-center">Status</th>       
+						                            <th class="text-center">Remarks</th>                                                                                                
+						                            <th class="text-center no-sort" width="%2">Action</th> 
+						                        </tr>
+						                    </thead>
+						                    <tbody>
+						                        
+						                    </tbody>
+						                    <tfoot class="thead-dark">
+						                        <tr>
+						                            <th class="text-center">S.No</th>                                                  
+						                            <th class="text-center">Request No</th>
+						                            <th class="text-center">Name</th>
+						                            <th class="text-center">Mobile</th>
+						                            <th class="text-center">Address</th>
+						                            <th class="text-center">Postal Code</th> 
+						                            <th class="text-center">Status</th>
+						                            <th class="text-center">Remarks</th>
+						                            <th class="text-center no-sort" width="%2">Action</th>                            
+						                        </tr>
+						                    </tfoot>
+						                </table>
+						            </div>
+						        </div>
+						    </div>
+						</div>
+
+
+
+
+
+						
+                      </div>
+                        
+                        
+                     </div>
+                </div>
+                
+                
+                <!-- Modal -->
+				<div class="modal fade" id="viewModal" tabindex="-1" aria-labelledby="viewModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
+				  <div class="modal-dialog modal-lg">
+				    <div class="modal-content">
+				      <div class="modal-header">
+				        <h5 class="modal-title" id="viewModalLabel">Request Details</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" id="modalBodyContent">
+				        <!-- Dynamic content loads here -->
+				      </div>
+				      <div class="modal-footer">
+				        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+				      </div>
+				    </div>
+				  </div>
+				</div>
+
+
+				<!-- Image Modal -->
+                <div class="modal fade" id="docModal" tabindex="-1" aria-hidden="true">
+				  <div class="modal-dialog modal-dialog-scrollable modal-lg">
+				    <div class="modal-content border-0">
+				      <div class="modal-body p-0 text-center" style="background-color: #f8f9fa;">
+				        <div id="docContainer" style="max-height: 90vh; overflow: auto;"></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>
+               
+                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
+				</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://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.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">
+        
+     // GLOBAL scope — must be outside any other function
+    	  function openDocModal(fileUrl) {
+    	      const container = document.getElementById('docContainer');
+    	      const ext = fileUrl.split('.').pop().toLowerCase();
+
+    	      if (ext === 'pdf') {
+    	          container.innerHTML = `<iframe src="${fileUrl}" style="width:100%; height:90vh;" frameborder="0"></iframe>`;
+    	      } else {
+    	          container.innerHTML = `<img src="${fileUrl}" class="img-fluid" style="max-height:90vh; max-width:100%;" onerror="this.src='/default.jpg'">`;
+    	      }
+
+    	      $('#docModal').modal('show');
+    	  }
+        
+        $(document).ready(function() {
+
+        	var table = $('#RequestListDatatable').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',               
+                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: false,
+                select: false,
+                processing: false
+            
+
+            });
+        	
+        	 // Trigger on page load
+
+            fetchEventDropdown();        
+            
+         // Bind change event after dropdown is populated
+            $('#dropdownevent').on('change', function () {
+                const selectedOption = $(this).find('option:selected').text();
+                const selectedEventReqId = $(this).val(); // Get the value (event_req_id)
+
+                if (!selectedEventReqId) {
+                    Swal.fire({
+                        icon: 'warning',
+                        title: 'Event Required',
+                        text: 'Please select a valid event.',
+                    });
+                    return;
+                }
+
+                // Call the AJAX with selected event_req_id
+                fetchVendingCommitteeList(selectedEventReqId);
+                
+            });
+         
+         
+            function fetchVendingCommitteeList(event_req_id) {
+            	$('#pageLoader').show();
+                $.ajax({
+                    url: '/gcc/api/streetvendor/vendingCommiteeDetails',
+                    data: { event_req_id: event_req_id },
+                    method: 'GET',
+                    contentType: 'application/json',
+                    success: function (data) {
+                    	$('#pageLoader').hide();
+                        let tableContainer = $('#RequestListDatatable');
+
+                        // Destroy any existing DataTable instance
+                        if ($.fn.DataTable.isDataTable(tableContainer)) {
+                            tableContainer.DataTable().destroy();
+                        }
+
+                        // Check for empty list
+                        if (!data || data.length === 0) {
+                            tableContainer.find('tbody').html(`
+                                <tr>
+                                    <td colspan="7" class="text-center text-danger">No Data Available</td>
+                                </tr>
+                            `);
+                            return;
+                        }
+
+                        // Initialize DataTable
+                        tableContainer.DataTable({
+                            destroy: true,
+                            searching: true,
+                            autoWidth: false,
+                            paging: true,
+                            info: true,
+                            data: data,
+                            columns: [
+                                {
+                                    data: null,
+                                    render: (data, type, row, meta) => meta.row + 1,
+                                    className: 'text-center'
+                                },
+                                { data: 'request_no', defaultContent: '-', className: 'text-center' },
+                                { data: 'person_name', defaultContent: '-', className: 'text-center' },
+                                { data: 'mobile_no', defaultContent: '-', className: 'text-center' },
+                                { data: 'address', defaultContent: '-', className: 'text-center' },
+                                { data: 'pincode', defaultContent: '-', className: 'text-center' },
+                                {
+                                    data: 'status',
+                                    defaultContent: '-',
+                                    className: 'text-center',
+                                    createdCell: function (td, cellData, rowData, row, col) {
+                                        if (cellData === 'Approved') {
+                                            $(td).css('color', 'green').css('font-weight', 'bold');
+                                        } else if (cellData === 'Rejected') {
+                                            $(td).css('color', 'red').css('font-weight', 'bold');
+                                        }
+                                    }
+                                },
+                                { data: 'remarks', defaultContent: '-', className: 'text-center' },
+                                {
+                                    data: 'request_no',
+                                    render: function (data, type, row) {
+                                        return `<button class="btn btn-primary btn-sm btn-view" data-id="${data}">View</button>`;
+                                    },
+                                    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: false
+                        });
+                        
+                        
+                     // Bind view buttons
+                        tableContainer.on('click', '.btn-view', function () {
+                            let id = $(this).data('id');                      
+                            $.ajax({
+                                url: `/gcc/api/streetvendor/vendorDetailsByReqId?requestId=${id}`,
+                                method: 'GET',
+                                success: function (detailData) {
+                                    if (!detailData || detailData.length === 0) {
+                                        $('#modalBodyContent').html("<p>No data found for this request.</p>");
+                                        $('#viewModal').modal('show');
+                                        return;
+                                    }
+
+                                    const details = detailData[0];
+                                    const diffAbledDisplay = details.diff_abled ? (details.diff_abled ? 'Yes' : 'No') : '-';
+                                    const pmLoanDisplay = details.pm_svanidhi_loan ? (details.pm_svanidhi_loan ? 'Yes' : 'No') : '-';
+                                    const bankAccDisplay = details.bank_acc_status ? (details.bank_acc_status === '1' ? 'Yes' : 'No') : '-';
+                                    const idCardDisplay= details.vendor_id_card ? (details.vendor_id_card ==='1' ? 'Yes' : 'No') : '-';
+                                    const bankPassbookDisplay = details.bank_acc_status === '1' && details.bank_passbook
+                                    ? `<img src="${details.bank_passbook}" alt="Bank Passbook" class="img-fluid" style="max-width: 150px;" onerror="this.src='/default.jpg'">`
+                                    : '-';
+                                    
+                                    const aadharFrontBtn = details.aadhar_front_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.aadhar_front_photo}')">View</button>` : '-';
+                                    const rationCardBtn = details.ration_card_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.ration_card_photo}')">View</button>` : '-';
+                                    const aadharBackBtn = details.aadhar_back_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.aadhar_back_photo}')">View</button>` : '-';
+                                    const bankPassbookBtn = details.bank_acc_status === '1' && details.bank_passbook
+                                        ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.bank_passbook}')">View</button>`
+                                        : '-';
+                                        
+                                    const spacePhotoBtn= details.vendor_space_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.vendor_space_photo}')">View</button>` : '-';
+                                    
+                                    const content = `
+                                        <div class="container-fluid">
+                                            <!-- Personal Details -->
+                                            <div class="card mb-3">
+                                                <div class="card-header bg-primary text-white">Personal Details</div>
+                                                <div class="card-body row">
+                                                <div class="col-md-3"><strong>Name:</strong></div>
+                                                <div class="col-md-3">${details.name || '-'}</div>
+                                                <div class="col-md-3"><strong>Father/Husband Name:</strong></div>
+                                                <div class="col-md-3">${details.f_h_name || '-'}</div>
+
+                                                <div class="col-md-3"><strong>Mobile:</strong></div>
+                                                <div class="col-md-3">${details.mob_no || '-'}</div>
+
+                                                <div class="col-md-3"><strong>Community Category:</strong></div>
+                                                <div class="col-md-3">${details.category_name || '-'}</div>
+
+                                                <div class="col-md-3"><strong>DOB:</strong></div>
+                                                <div class="col-md-3">${details.dob || '-'}</div>
+
+                                                <div class="col-md-3"><strong>Address:</strong></div>
+                                                <div class="col-md-3">${details.residental_address || '-'}</div>
+
+                                                <div class="col-md-3"><strong>Gender:</strong></div>
+                                                <div class="col-md-3">${details.gender || '-'}</div>
+
+                                                <div class="col-md-3"><strong>Pincode:</strong></div>
+                                                <div class="col-md-3">${details.present_pincode || '-'}</div>
+
+                                                <div class="col-md-3"><strong>Differently Abled:</strong></div>
+                                                <div class="col-md-3">${diffAbledDisplay || '-'}</div>
+
+                                                <div class="col-md-3"><strong>Aadhaar front Image:</strong></div>
+                                                <div class="col-md-3">${aadharFrontBtn}</div>
+
+                                                <div class="col-md-3"><strong>Ration card Image:</strong></div>
+                                                <div class="col-md-3">${rationCardBtn}</div>
+
+                                                <div class="col-md-3"><strong>Aadhaar back Image:</strong></div>
+                                                <div class="col-md-3">${aadharBackBtn}</div>
+                                                </div>
+                                            </div>
+
+                                            <!-- Business Details -->
+                                            <div class="card mb-3">
+                                                <div class="card-header bg-success text-white">Business Details</div>
+                                                <div class="card-body row">
+                                                <div class="col-md-3"><strong>Type of Business:</strong></div>
+                                                <div class="col-md-3">${details.vending_category_name || '-'}</div>
+
+                                                <div class="col-md-3"><strong>Zone:</strong></div>
+                                                <div class="col-md-3">${details.zone || '-'}</div>
+
+                                                <div class="col-md-3"><strong>Business Space (sq.ft):</strong></div>
+                                                <div class="col-md-3">${details.vending_space || '-'}</div>
+
+                                                <div class="col-md-3"><strong>Ward:</strong></div>
+                                                <div class="col-md-3">${details.ward || '-'}</div>
+
+                                                <div class="col-md-3"><strong>Address:</strong></div>
+                                                <div class="col-md-3">${details.business_address || '-'}</div>
+
+                                                <div class="col-md-3"><strong>Pincode:</strong></div>
+                                                <div class="col-md-3">${details.vending_pincode || '-'}</div>
+
+                                                <div class="col-md-3"><strong>PM SVANidhi Loan Availed:</strong></div>
+                                                <div class="col-md-3">${pmLoanDisplay || '-'}</div>
+
+                                                <div class="col-md-3"><strong>Do you Have Bank Account?:</strong></div>
+                                                <div class="col-md-3">${bankAccDisplay || '-'}</div>
+
+                                                <div class="col-md-3"><strong>Bank Passbook Image:</strong></div>
+                                                <div class="col-md-3">${bankPassbookBtn}</div>
+
+                                                </div>
+                                            </div>
+                                            
+                                            
+                                            <!-- Inspection Details -->
+                                            <div class="card mb-3">
+                                                <div class="card-header bg-warning text-white">Inspection Details</div>
+                                                <div class="card-body row">
+                                                <div class="col-md-3"><strong>Vendor Type:</strong></div>
+                                                <div class="col-md-3">${details.vendor_type || '-'}</div>
+
+                                                <div class="col-md-3"><strong>Vendor ID Card:</strong></div>
+                                                <div class="col-md-3">${idCardDisplay}</div>
+
+                                                <div class="col-md-3"><strong>Vending Nature:</strong></div>
+                                                <div class="col-md-3">${details.vending_nature || '-'}</div>
+
+                                                <div class="col-md-3"><strong>Vending Time:</strong></div>
+                                                <div class="col-md-3">${details.vending_time || '-'}</div>
+
+                                                <div class="col-md-3"><strong>Transaction Mode:</strong></div>
+                                                <div class="col-md-3">${details.transaction_mode || '-'}</div>
+
+                                                <div class="col-md-3"><strong>Swanidi Loan Amount:</strong></div>
+                                                <div class="col-md-3">${details.swanidi_loan_amount || '-'}</div>
+
+                                                <div class="col-md-3"><strong>Vendor Space Image:</strong></div>
+                                                <div class="col-md-3">${spacePhotoBtn || '-'}</div>
+                                               
+
+                                                </div>
+                                            </div>
+
+                                            <!-- Request History -->
+                                            <div class="card mb-3">
+                                                <div class="card-header bg-info text-white">Request History</div>
+                                                <div class="card-body">
+                                                	<div class="comment mb-4">
+                                                		<div class="row">
+                                                    		<div class="col-4 text-center">
+                                                        		<p class="text-muted"><strong>${details.AE_Cdate || 'N/A'}</strong></p>
+                                                    		</div>
+                                                    		<div class="col-8">
+    		                                                    <p><strong>AE Officer ${details.AE_Status || 'N/A'}</strong></p>
+    		                                                    <p><strong>Remarks: </strong>${details.AE_Remarks || ''}</p>                                                
+                                                   			 </div>
+                                                		</div>
+                                            		</div>
+                                            		
+                                            	<div class="comment mb-4">
+                                            		<div class="row">
+                                                		<div class="col-4 text-center">
+                                                    		<p class="text-muted"><strong>${details.AEE_Inspection_date || 'N/A'}</strong></p>
+                                                		</div>
+                                                		<div class="col-8">
+    	                                                    <p><strong>AEE Officer ${details.AEE_status || 'N/A'}</strong></p>
+    	                                                    <p><strong>Remarks: </strong>${details.AEE_remarks || ''}</p>                                                
+                                               			 </div>
+                                            		</div>
+                                        		</div>
+                                        		
+                                        		<div class="comment mb-4">
+    	                                    		<div class="row">
+    	                                        		<div class="col-4 text-center">
+    	                                            		<p class="text-muted"><strong>${details.Zone_Inspection_date || 'N/A'}</strong></p>
+    	                                        		</div>
+    	                                        		<div class="col-8">
+    	                                                    <p><strong>Zone Officer ${details.Zone_status || 'N/A'}</strong></p>
+    	                                                    <p><strong>Remarks: </strong>${details.Zone_remarks || ''}</p>                                                
+    	                                       			 </div>
+    	                                    		</div>
+                                    			</div>
+                                            		
+                                                </div>
+                                            </div>
+                                        </div>
+                                    `;                                                           
+                                    
+                                    $('#modalBodyContent').html(content);
+                                    $('#viewModalLabel').text(`Vendor Details - ${id}`);
+                                    $('#viewModal').modal('show');
+                                },
+                                error: function (xhr) {
+                                    console.error("Error fetching detail:", xhr.responseText);
+                                    alert("Failed to fetch vendor details.");
+                                }
+                            });
+                        });
+                       
+                    },
+
+                    error: function (xhr, status, error) {
+                    	$('#pageLoader').hide();
+                        console.error("Error fetching data:", error);
+                        alert("Failed to load vendor list.");
+                    }
+                });
+            }
+         
+         
+        });
+        
+     // Call this function on page load
+        function fetchEventDropdown() {
+            $.ajax({
+                url: '/gcc/api/vending/committedropdown',
+                type: 'GET',
+                dataType: 'json',
+                success: function (data) {
+                    let eventDropdown = $('#dropdownevent');
+                    eventDropdown.empty();
+                    eventDropdown.append('<option value="" selected disabled>Select an Event</option>');
+
+                    data.forEach(function (event) {
+                         // Optional: filter active & not deleted
+                            eventDropdown.append(
+                                $('<option></option>')
+                                    .val(event.event_req_id)
+                                    .text(`${event.event_name} - ${event.event_date}`)
+                            );
+                        
+                    });
+                },
+                error: function (xhr, status, error) {
+                    console.error('Error fetching event dropdown:', error);
+                    Swal.fire('Error', 'Unable to load events', 'error');
+                }
+            });
+        }
+        
+
+        </script>
+    </body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/vendors/RequestList.html b/src/main/resources/templates/modules/vendors/RequestList.html
new file mode 100644
index 0000000..c8e1abe
--- /dev/null
+++ b/src/main/resources/templates/modules/vendors/RequestList.html
@@ -0,0 +1,806 @@
+<!DOCTYPE html>
+
+<html xmlns:th="http://www.thymeleaf.org">
+<head th:replace="~{fragments/modules/base/head :: head}"></head>
+<style>
+.required{
+	color: red;
+}
+/* Mobile screens - targeting devices with a max width of 767px */
+@media (max-width: 767px) 
+{
+	#requestlistform label{
+		margin-top: 10px;
+	} 
+}
+
+    #viewModal .modal-body {
+        max-height: 70vh;  /* Limit the height to 70% of the viewport */
+        overflow-y: auto;  /* Enable vertical scrolling */
+    }
+    
+    .custom-doc-btn {
+  height: 20px;
+  width: 80px;
+  font-size: 9px;
+  font-weight:bold;
+  text-align: center;
+  padding: 0px;
+  border:1px solid grey;
+}
+
+.col-md-3{
+padding-bottom: 10px; 
+}
+
+.comment {
+        margin-bottom: 20px;
+    }
+
+    .comment p {
+        margin: 0;
+    }
+
+    hr {
+        border: 1px solid #ccc;
+    }
+
+    .comment {
+        padding: 10px 0;
+    }
+
+    .comment .text-muted {
+        font-size: 0.9em;
+        color: #6c757d;
+    }
+
+    .comment hr {
+        border-top: 1px solid #ccc;
+    }
+</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="far fa-calendar-plus bg-blue"></i>
+									<div class="d-inline">
+										<h5>Request List</h5>
+										<span>Vending Committe</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">Vending Committe</li>
+										<li class="breadcrumb-item active" aria-current="page">Request List</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-block">
+						        
+							    <div class="form-group col-sm-12">
+							        <label for="dropdownevent">Select Event
+							        <span class="text-danger">*</span></label>
+							        <select id="dropdownevent" class="form-control">							          
+							        </select>
+							    </div>	
+						        
+						        <div class="page-header-title" >
+									<h5 style="margin: 0;font-weight: bold;">Vendors Request List</h5><hr>
+							   </div> 
+						        
+						            <div>
+						                <table id="RequestListDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
+						                    <thead class="thead-dark">
+						                        <tr role="row">
+						                            <th class="text-center">S.No</th>                                                  
+						                            <th class="text-center">Request No</th>
+						                            <th class="text-center">Name</th>
+						                            <th class="text-center">Mobile</th>
+						                            <th class="text-center">Address</th>
+						                            <th class="text-center">View Details</th>
+						                            <th class="text-center">Status</th>       
+						                            <th class="text-center">Remarks</th>                                                                                                
+						                            <th class="text-center no-sort" width="%2">Action</th> 
+						                        </tr>
+						                    </thead>
+						                    
+						                    <tbody>
+		
+											</tbody>
+						                    
+						                    
+
+						                    <tfoot class="thead-dark">
+						                        <tr>
+						                            <th class="text-center">S.No</th>                                                  
+						                            <th class="text-center">Request No</th>
+						                            <th class="text-center">Name</th>
+						                            <th class="text-center">Mobile</th>
+						                            <th class="text-center">Address</th>
+						                            <th class="text-center">View Details</th> 
+						                            <th class="text-center">Status</th>
+						                            <th class="text-center">Remarks</th>
+						                            <th class="text-center no-sort" width="%2">Action</th>                            
+						                        </tr>
+						                    </tfoot>
+						                </table>
+						            </div>
+						        </div>
+						    </div>
+						</div>
+
+
+
+
+
+						
+                      </div>
+                        
+                        
+                     </div>
+                </div>
+                
+                <!-- Modal -->
+				<!-- Modal -->
+				<div class="modal fade" id="viewModal" tabindex="-1" aria-labelledby="viewModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
+				  <div class="modal-dialog modal-lg">
+				    <div class="modal-content">
+				      <div class="modal-header">
+				        <h5 class="modal-title" id="viewModalLabel">Request Details</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" id="modalBodyContent">
+				        <!-- Dynamic content loads here -->
+				      </div>
+				      <div class="modal-footer">
+				        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+				      </div>
+				    </div>
+				  </div>
+				</div>
+
+
+				<!-- Image Modal -->
+                <div class="modal fade" id="docModal" tabindex="-1" aria-hidden="true">
+				  <div class="modal-dialog modal-dialog-scrollable modal-lg">
+				    <div class="modal-content border-0">
+				      <div class="modal-body p-0 text-center" style="background-color: #f8f9fa;">
+				        <div id="docContainer" style="max-height: 90vh; overflow: auto;"></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>
+               
+                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
+				</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://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.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">
+        
+     // GLOBAL scope — must be outside any other function
+  	  function openDocModal(fileUrl) {
+  	      const container = document.getElementById('docContainer');
+  	      const ext = fileUrl.split('.').pop().toLowerCase();
+
+  	      if (ext === 'pdf') {
+  	          container.innerHTML = `<iframe src="${fileUrl}" style="width:100%; height:90vh;" frameborder="0"></iframe>`;
+  	      } else {
+  	          container.innerHTML = `<img src="${fileUrl}" class="img-fluid" style="max-height:90vh; max-width:100%;" onerror="this.src='/default.jpg'">`;
+  	      }
+
+  	      $('#docModal').modal('show');
+  	  }
+        
+        $(document).ready(function() {
+        	
+        	 
+
+        	var table = $('#RequestListDatatable').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',               
+                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: false,
+                select: false,
+                processing: false
+            
+
+            });
+
+            // Trigger on page load
+
+            fetchEventDropdown();        
+            
+         // Bind change event after dropdown is populated
+            $('#dropdownevent').on('change', function () {        
+                const selectedOption = $(this).find('option:selected').text();
+                
+                // Assuming the format is: "Event Name - yyyy-mm-dd"
+                const eventDateRaw = selectedOption.split(' - ')[1];
+
+                if (!eventDateRaw) {
+                    console.error("No date found in selected option.");
+                    return;
+                }
+
+                const dateParts = eventDateRaw.split('-'); // yyyy-mm-dd
+                if (dateParts.length !== 3) {
+                    console.error("Date format is incorrect.");
+                    return;
+                }
+
+                const formattedDate = `${dateParts[2]}-${dateParts[1]}-${dateParts[0]}`; // dd-mm-yyyy
+
+                // Call the AJAX with formatted date
+                fetchVendingCommitteeList(formattedDate);
+             
+            });
+       
+        
+        
+        function fetchVendingCommitteeList(eventdate) {
+        	$('#pageLoader').show();
+            $.ajax({
+                url: '/gcc/api/streetvendor/vendingCommiteeList',
+                data: { date: eventdate },
+                method: 'GET',
+                contentType: 'application/json',
+                success: function (data) {
+                	$('#pageLoader').hide();
+                    let tableContainer = $('#RequestListDatatable');
+
+                    // Destroy any existing DataTable instance
+                    if ($.fn.DataTable.isDataTable(tableContainer)) {
+                        tableContainer.DataTable().destroy();
+                    }
+
+                    // Check for empty list
+                    if (!data || data.length === 0) {
+                        tableContainer.find('tbody').html(`
+                            <tr>
+                                <td colspan="9" class="text-center text-danger">No Data Available</td>
+                            </tr>
+                        `);
+                        return;
+                    }
+
+                    // Initialize DataTable
+                    tableContainer.DataTable({
+                        destroy: true,
+                        searching: true,
+                        autoWidth: true,
+                        paging: true,
+                        info: true,
+                        data: data,
+                        columns: [
+                            {
+                                data: null,
+                                render: (data, type, row, meta) => meta.row + 1,
+                                className: 'text-center'
+                            },
+                            { data: 'vendor_req_id', defaultContent: '-', className: 'text-center' },
+                            { data: 'name', defaultContent: '-', className: 'text-center' },
+                            { data: 'mob_no', defaultContent: '-', className: 'text-center' },
+                            { data: 'business_address', defaultContent: '-', className: 'text-center' },
+                            {
+                                data: 'vendor_req_id',
+                                render: function (data, type, row) {
+                                    return `<button class="btn btn-primary btn-sm btn-view" data-id="${data}">View</button>`;
+                                },
+                                className: 'text-center'
+                            },
+                            {
+                                data: 'status',
+                                render: function (data) {
+                                    return `
+                                        <select class="form-select">
+                                            <option value="" ${!data ? 'selected' : ''}>Select Status</option>
+                                            <option value="Approved" ${data === 'Approved' ? 'selected' : ''}>Approved</option>
+                                            <option value="Rejected" ${data === 'Rejected' ? 'selected' : ''}>Rejected</option>
+                                        </select>
+                                    `;
+                                },
+                                className: 'text-center'
+                            },
+                            {
+                                data: 'remarks',
+                                render: function (data) {
+                                    return `<input type="text" class="form-control" placeholder=" Enter Remarks" value="${data || ''}">`;
+                                },
+                                className: 'text-center'
+                            },
+                            {
+                                data: 'vending_pincode',
+                                render: () => `<button class="btn btn-success btn-sm">Submit</button>`,
+                                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: false
+                    });
+
+                    // Bind view buttons
+                    tableContainer.on('click', '.btn-view', function () {
+                        let id = $(this).data('id');                      
+                        $.ajax({
+                            url: `/gcc/api/streetvendor/vendorDetailsByReqId?requestId=${id}`,
+                            method: 'GET',
+                            success: function (detailData) {
+                                if (!detailData || detailData.length === 0) {
+                                    $('#modalBodyContent').html("<p>No data found for this request.</p>");
+                                    $('#viewModal').modal('show');
+                                    return;
+                                }
+
+                                const details = detailData[0];
+                                const diffAbledDisplay = details.diff_abled ? (details.diff_abled ? 'Yes' : 'No') : '-';
+                                const pmLoanDisplay = details.pm_svanidhi_loan ? (details.pm_svanidhi_loan ? 'Yes' : 'No') : '-';
+                                const bankAccDisplay = details.bank_acc_status ? (details.bank_acc_status === '1' ? 'Yes' : 'No') : '-';
+                                const idCardDisplay= details.vendor_id_card ? (details.vendor_id_card ==='1' ? 'Yes' : 'No') : '-';
+                                const bankPassbookDisplay = details.bank_acc_status === '1' && details.bank_passbook
+                                ? `<img src="${details.bank_passbook}" alt="Bank Passbook" class="img-fluid" style="max-width: 150px;" onerror="this.src='/default.jpg'">`
+                                : '-';
+                                
+                                const aadharFrontBtn = details.aadhar_front_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.aadhar_front_photo}')">View</button>` : '-';
+                                const rationCardBtn = details.ration_card_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.ration_card_photo}')">View</button>` : '-';
+                                const aadharBackBtn = details.aadhar_back_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.aadhar_back_photo}')">View</button>` : '-';
+                                const bankPassbookBtn = details.bank_acc_status === '1' && details.bank_passbook
+                                    ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.bank_passbook}')">View</button>`
+                                    : '-';
+                                    
+                                const spacePhotoBtn= details.vendor_space_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.vendor_space_photo}')">View</button>` : '-';
+                                
+                                const content = `
+                                    <div class="container-fluid">
+                                        <!-- Personal Details -->
+                                        <div class="card mb-3">
+                                            <div class="card-header bg-primary text-white">Personal Details</div>
+                                            <div class="card-body row">
+                                            <div class="col-md-3"><strong>Name:</strong></div>
+                                            <div class="col-md-3">${details.name || '-'}</div>
+                                            <div class="col-md-3"><strong>Father/Husband Name:</strong></div>
+                                            <div class="col-md-3">${details.f_h_name || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Mobile:</strong></div>
+                                            <div class="col-md-3">${details.mob_no || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Community Category:</strong></div>
+                                            <div class="col-md-3">${details.category_name || '-'}</div>
+
+                                            <div class="col-md-3"><strong>DOB:</strong></div>
+                                            <div class="col-md-3">${details.dob || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Address:</strong></div>
+                                            <div class="col-md-3">${details.residental_address || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Gender:</strong></div>
+                                            <div class="col-md-3">${details.gender || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Pincode:</strong></div>
+                                            <div class="col-md-3">${details.present_pincode || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Differently Abled:</strong></div>
+                                            <div class="col-md-3">${diffAbledDisplay || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Aadhaar front Image:</strong></div>
+                                            <div class="col-md-3">${aadharFrontBtn}</div>
+
+                                            <div class="col-md-3"><strong>Ration card Image:</strong></div>
+                                            <div class="col-md-3">${rationCardBtn}</div>
+
+                                            <div class="col-md-3"><strong>Aadhaar back Image:</strong></div>
+                                            <div class="col-md-3">${aadharBackBtn}</div>
+                                            </div>
+                                        </div>
+
+                                        <!-- Business Details -->
+                                        <div class="card mb-3">
+                                            <div class="card-header bg-success text-white">Business Details</div>
+                                            <div class="card-body row">
+                                            <div class="col-md-3"><strong>Type of Business:</strong></div>
+                                            <div class="col-md-3">${details.vending_category_name || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Zone:</strong></div>
+                                            <div class="col-md-3">${details.zone || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Business Space (sq.ft):</strong></div>
+                                            <div class="col-md-3">${details.vending_space || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Ward:</strong></div>
+                                            <div class="col-md-3">${details.ward || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Address:</strong></div>
+                                            <div class="col-md-3">${details.business_address || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Pincode:</strong></div>
+                                            <div class="col-md-3">${details.vending_pincode || '-'}</div>
+
+                                            <div class="col-md-3"><strong>PM SVANidhi Loan Availed:</strong></div>
+                                            <div class="col-md-3">${pmLoanDisplay || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Do you Have Bank Account?:</strong></div>
+                                            <div class="col-md-3">${bankAccDisplay || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Bank Passbook Image:</strong></div>
+                                            <div class="col-md-3">${bankPassbookBtn}</div>
+
+                                            </div>
+                                        </div>
+                                        
+                                        <!-- Inspection Details -->
+                                        <div class="card mb-3">
+                                            <div class="card-header bg-warning text-white">Inspection Details</div>
+                                            <div class="card-body row">
+                                            <div class="col-md-3"><strong>Vendor Type:</strong></div>
+                                            <div class="col-md-3">${details.vendor_type || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Vendor ID Card:</strong></div>
+                                            <div class="col-md-3">${idCardDisplay}</div>
+
+                                            <div class="col-md-3"><strong>Vending Nature:</strong></div>
+                                            <div class="col-md-3">${details.vending_nature || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Vending Time:</strong></div>
+                                            <div class="col-md-3">${details.vending_time || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Transaction Mode:</strong></div>
+                                            <div class="col-md-3">${details.transaction_mode || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Swanidi Loan Amount:</strong></div>
+                                            <div class="col-md-3">${details.swanidi_loan_amount || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Vendor Space Image:</strong></div>
+                                            <div class="col-md-3">${spacePhotoBtn || '-'}</div>
+                                           
+
+                                            </div>
+                                        </div>
+
+                                        <!-- Request History -->
+                                        <div class="card mb-3">
+                                            <div class="card-header bg-info text-white">Request History</div>
+                                            <div class="card-body">
+                                            	<div class="comment mb-4">
+                                            		<div class="row">
+                                                		<div class="col-4 text-center">
+                                                    		<p class="text-muted"><strong>${details.AE_Cdate || 'N/A'}</strong></p>
+                                                		</div>
+                                                		<div class="col-8">
+		                                                    <p><strong>AE Officer ${details.AE_Status || 'N/A'}</strong></p>
+		                                                    <p><strong>Remarks: </strong>${details.AE_Remarks || ''}</p>                                                
+                                               			 </div>
+                                            		</div>
+                                        		</div>
+                                        		
+                                        	<div class="comment mb-4">
+                                        		<div class="row">
+                                            		<div class="col-4 text-center">
+                                                		<p class="text-muted"><strong>${details.AEE_Inspection_date || 'N/A'}</strong></p>
+                                            		</div>
+                                            		<div class="col-8">
+	                                                    <p><strong>AEE Officer ${details.AEE_status || 'N/A'}</strong></p>
+	                                                    <p><strong>Remarks: </strong>${details.AEE_remarks || ''}</p>                                                
+                                           			 </div>
+                                        		</div>
+                                    		</div>
+                                    		
+                                    		<div class="comment mb-4">
+	                                    		<div class="row">
+	                                        		<div class="col-4 text-center">
+	                                            		<p class="text-muted"><strong>${details.Zone_Inspection_date || 'N/A'}</strong></p>
+	                                        		</div>
+	                                        		<div class="col-8">
+	                                                    <p><strong>Zone Officer ${details.Zone_status || 'N/A'}</strong></p>
+	                                                    <p><strong>Remarks: </strong>${details.Zone_remarks || ''}</p>                                                
+	                                       			 </div>
+	                                    		</div>
+                                			</div>
+                                        		
+                                            </div>
+                                        </div>
+                                    </div>
+                                `;                                                           
+                                
+                                $('#modalBodyContent').html(content);
+                                $('#viewModalLabel').text(`Request Details - ${id}`);
+                                $('#viewModal').modal('show');
+                            },
+                            error: function (xhr) {
+                                console.error("Error fetching detail:", xhr.responseText);
+                                alert("Failed to fetch vendor details.");
+                            }
+                        });
+                    });
+                    
+                    
+                    $('#RequestListDatatable tbody').on('click', '.btn-success', function () {
+                    	
+                    	$('.btn-success').prop('disabled', true).text('Submitting...');
+                    	
+                    	
+                        const $row = $(this).closest('tr'); // get the clicked row
+
+                        const table1 = $('#RequestListDatatable').DataTable();
+                        const rowData = table1.row($row).data(); // fetch DataTables row data (e.g., vendor_req_id, name, etc.)
+
+                        // Now get values from select and input elements inside the row
+                        const status = $row.find('select').val();
+                        const remarks = $row.find('input').val();
+                        const eventReqId = $('#dropdownevent').val();
+                        
+                     // Event dropdown check
+                        if (!eventReqId) {
+                            Swal.fire({
+                                icon: 'warning',
+                                title: 'Event Required',
+                                text: 'Please select an event before submitting.',
+                            });
+                            $('.btn-success').prop('disabled', false).text('Submit');
+                            return;
+                        }
+                        
+
+                     //  Status must be selected
+                        if (!status) {
+                            Swal.fire({
+                                icon: 'warning',
+                                title: 'Status Required',
+                                text: 'Please select a status before submitting.',
+                            });
+                            $('.btn-success').prop('disabled', false).text('Submit');
+                            return;
+                        }
+
+                        // Remarks required if status is 'Rejected'
+                        if (status === 'Rejected' && remarks === '') {
+                            Swal.fire({
+                                icon: 'warning',
+                                title: 'Remarks Required',
+                                text: 'Please enter remarks when status is Rejected.',
+                            });
+                            $('.btn-success').prop('disabled', false).text('Submit');
+                            return;
+                        }
+                        
+                        
+                        // Construct the data object to send
+                        const payload = {
+                            vendor_req_id: rowData.vendor_req_id,
+                            name: rowData.name,
+                            mob_no: rowData.mob_no,
+                            business_address: rowData.business_address,
+                            vending_pincode: rowData.vending_pincode,
+                            status: status,
+                            remarks: remarks,
+                            event_req_id: eventReqId
+                        };
+                        
+                        console.log("payload = " + JSON.stringify(payload, null, 2));
+
+                        $('#pageLoader').show();
+                        // 📨 AJAX call
+                         $.ajax({
+                            url: '/gcc/api/streetvendor/savedetailsforvendor', // change this to your actual API endpoint
+                            method: 'POST',
+                            contentType: 'application/json',
+                            data: JSON.stringify(payload),
+                            success: function (response) {
+                            	 $('#pageLoader').hide();
+                            	 $('.btn-success').prop('disabled', false).text('Submit');
+                            	 if (response.status === "success") {
+                                     //Swal.fire('Success', 'Data submitted successfully!', 'success');
+                                     
+                                     Swal.fire({
+                 	                    icon: 'success',
+                 	                    title: 'Success',
+                 	                    text: response.message,
+                 	                    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
+                 	                    showConfirmButton: true, // Ensure the confirm button is visible
+                 	                }).then((result) => {
+                 	                    if (result.isConfirmed) {
+                 	                    	console.log("ok button");                	                                                        	
+                 	                    	/* const table2 = $('#RequestListDatatable').DataTable();
+                 	                        
+                 	                    // ✅ Use $row instead of undefined "row"
+                 	                       table2.row($row).remove();
+
+                 	                       // Reorder S.No column
+                 	                       table2.rows().every(function (index) {
+                 	                           const row = this.node();
+                 	                           $(row).find('td:first-child').text(index + 1); // Update S.No
+                 	                       });
+
+                 	                       // Redraw the table
+                 	                       table2.draw(false); */
+                 	                       
+                 	                      const selectedOption1 = $('#dropdownevent option:selected').text().trim();
+                 	                      const eventDateRaw1 = selectedOption1.split(' - ')[1];
+                 	                      const dateParts1 = eventDateRaw1.split('-'); // yyyy-mm-dd
+                 	                      const formattedDate1 = `${dateParts1[2]}-${dateParts1[1]}-${dateParts1[0]}`;
+                 	                       
+                 	                      fetchVendingCommitteeList(formattedDate1);
+                 	                	    
+                 	                    }
+                 	                });
+                                     
+                                 } 
+                            	 else if(response.status === "Error"){
+                            		 
+                            		 Swal.fire({
+                  	                    icon: 'error',
+                  	                    title: 'Error',
+                  	                    text: response.message,
+                  	                });
+                            	 }
+                            	 
+                            	 else {                                	 
+                                     Swal.fire('Error', 'Failed to submit data.', 'error');
+                                 }
+                            },
+                            error: function () {
+                            	 $('#pageLoader').hide();
+                            	 $('.btn-success').prop('disabled', false).text('Submit');
+                                Swal.fire('Error', 'Something went wrong while submitting.', 'error');
+                            }
+                        }); 
+                        
+                    });
+                },
+
+                error: function (xhr, status, error) {
+                	$('#pageLoader').hide();
+                    console.error("Error fetching data:", error);
+                    alert("Failed to load vendor list.");
+                }
+            });
+        }
+        
+        
+        
+        });
+        
+     // Call this function on page load
+        function fetchEventDropdown() {
+            $.ajax({
+                url: '/gcc/api/vending/dropdown-Event',
+                type: 'GET',
+                dataType: 'json',
+                success: function (data) {
+                    let eventDropdown = $('#dropdownevent');
+                    eventDropdown.empty();
+                    eventDropdown.append('<option value="" selected disabled>Select an Event</option>');
+
+                    data.forEach(function (event) {
+                        if (event.isactive && !event.isdelete) {  // Optional: filter active & not deleted
+                            eventDropdown.append(
+                                $('<option></option>')
+                                    .val(event.req_id)
+                                    .text(`${event.event_name} - ${event.event_date}`)
+                            );
+                        }
+                    });
+                },
+                error: function (xhr, status, error) {
+                    console.error('Error fetching event dropdown:', error);
+                    Swal.fire('Error', 'Unable to load events', 'error');
+                }
+            });
+        }
+
+        </script>
+    </body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/vendors/addevent.html b/src/main/resources/templates/modules/vendors/addevent.html
new file mode 100644
index 0000000..c07e203
--- /dev/null
+++ b/src/main/resources/templates/modules/vendors/addevent.html
@@ -0,0 +1,219 @@
+<!DOCTYPE html>
+
+<html xmlns:th="http://www.thymeleaf.org">
+<head th:replace="~{fragments/modules/base/head :: head}"></head>
+<style>
+.required{
+	color: red;
+}
+/* Mobile screens - targeting devices with a max width of 767px */
+@media (max-width: 767px) 
+{
+	#addeventform label{
+		margin-top: 10px;
+	} 
+}
+</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="far fa-calendar-plus bg-blue"></i>
+									<div class="d-inline">
+										<h5>Create Event</h5>
+										<span>Vending Committe</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">Vending Committe</li>
+										<li class="breadcrumb-item active" aria-current="page">Create Event</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" style="margin-top: 0px;">
+								<div class="card-header justify-content-between align-items-center">
+									<h3><b>Add Vending Committe Event</b></h3>
+								</div>
+								<div class="card-body">
+								
+									 <form id="addeventform">
+					                    <div class="form-group">
+					                    	<div class="row">
+					                    		<div class="col-sm-12 col-md-6">
+							                        <label class="form-label" for="name">Event Name<span
+													class="text-danger">*</span></label> <input type="text"
+													class="form-control" value="vending committee event"
+													id="eventname"  required readonly="readonly">
+					                    		</div>
+					                    	
+					                            <div class="col-sm-12 col-md-6">
+							                        <label class="form-label" for="dateofbirth">Select Date<span
+													class="text-danger">*</span></label> <input type="DATE"
+													class="form-control" id="eventdate" onclick="this.showPicker()" required>
+					                    		</div>
+					                    
+					                    
+								           <!-- Attachment -->
+											<div class="col-sm-12">
+												<label for="fileInput">Attachment:<span class="required">*</span></label>
+					                     	    <input type="file" class="form-control" id="fileInput">			
+					                     	    <small id="fileError" class="text-danger" style="display: none;">Only JPEG, JPG, or PDF files are allowed.</small>
+					                     	    
+											</div>
+
+
+					                    	</div>
+					                    </div>
+
+
+					                    <div class="form-group text-center">
+					                        <button type="submit" class="btn btn-primary " id="createdBtn">Create Event</button>
+					                        <button type="reset" class="btn btn-secondary ml-2" onclick="resetForm()">Reset</button>
+					                    </div>
+					                </form>
+
+								
+								</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>
+               
+                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
+				</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://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.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">
+  
+
+
+        
+        function resetForm() {
+            document.getElementById('addeventform').reset(); // Built-in reset functionality
+        }
+        
+        //disabled the past dates
+        document.addEventListener("DOMContentLoaded", function () {
+            var today = new Date().toISOString().split('T')[0];
+            document.getElementById("eventdate").setAttribute("min", today);
+        });
+      
+        
+
+        $(document).ready(function () {
+            $('#addeventform').on('submit', function (e) {
+                e.preventDefault();
+
+                var eventName = $('#eventname').val().trim();
+                var eventDate = $('#eventdate').val();
+                var file = $('#fileInput')[0].files[0];
+
+                if (!eventName || !eventDate || !file) {
+                    Swal.fire('Error', 'All fields are required.', 'error');
+                    return;
+                }
+
+                var formData = new FormData();
+                
+                formData.append("eventName", eventName);
+                formData.append("eventDate", eventDate);
+                formData.append("file", file);
+                console.log("formData",formData);
+
+                $.ajax({
+                    url: '/gcc/api/vending/save',
+                    type: 'POST',
+                    data: formData,
+                    processData: false,
+                    contentType: false,
+                    success: function (res) {
+                    	console.log("res",res);
+                        Swal.fire('Success', res, 'success');
+                        $('#addeventform')[0].reset();
+                    },
+                    error: function (xhr) {
+                        Swal.fire('Error', xhr.responseText, 'error');
+                    }
+                });
+            });
+        });
+
+    
+
+ 
+    ///////new function for saving method//////
+
+	document.getElementById('fileInput').addEventListener('change', function (event) {
+	    var fileInput = event.target;
+	    var filePath = fileInput.value;
+	    var allowedExtensions = /(\.jpeg|\.jpg|\.pdf)$/i;
+	
+	    if (!allowedExtensions.exec(filePath)) {
+	        document.getElementById('fileError').style.display = 'block'; // Show error message
+	        fileInput.value = ''; // Clear the input
+	    } else {
+	        document.getElementById('fileError').style.display = 'none'; // Hide error message
+	    }
+	});
+
+
+
+		
+        </script>
+    </body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/vendors/streetVendorRequestForm.html b/src/main/resources/templates/modules/vendors/streetVendorRequestForm.html
new file mode 100644
index 0000000..6afe82d
--- /dev/null
+++ b/src/main/resources/templates/modules/vendors/streetVendorRequestForm.html
@@ -0,0 +1,1196 @@
+<!DOCTYPE html>
+<html lang="en"  xmlns:th="http://www.thymeleaf.org">
+<head th:replace="~{fragments/modules/base/head :: head}"></head>
+<style>
+    .required{
+        color: red;
+    }
+    #modalBody h4 {
+        font-weight: bold;
+        margin-top: 15px;
+        margin-bottom: 10px;
+    }
+
+    #modalBody p {
+        margin: 5px 0;
+    }
+
+    #modalBody hr {
+        margin: 15px 0;
+    }
+    .comment {
+        margin-bottom: 20px;
+    }
+
+    .comment p {
+        margin: 0;
+    }
+
+    hr {
+        border: 1px solid #ccc;
+        margin-top: 20px;
+        margin-bottom: 20px;
+    }
+    
+    h5 {
+      
+       font-size: bold;
+    }
+    
+    /* Limit the height of the dropdown menu and make it scrollable */
+.dropdown-menu {
+  max-height: 200px; /* Adjust this value as needed */
+  overflow-y: auto;
+}
+    
+
+    .col-4 {
+        font-weight: bold;
+        text-align: right;
+    }
+
+    .col-8 {
+        padding-left: 20px;
+    }
+
+    .comment {
+        padding: 10px 0;
+    }
+
+    .comment .text-muted {
+        font-size: 0.9em;
+        color: #6c757d;
+    }
+
+    .comment hr {
+        border-top: 1px solid #ccc;
+    }
+
+    .comment .btn-link {
+        font-size: 0.9em;
+        text-decoration: underline;
+        color: #007bff;
+    }
+    /* Make the modal body scrollable */
+    #detailsModal .modal-body {
+        max-height: 70vh;  /* Limit the height to 70% of the viewport */
+        overflow-y: auto;  /* Enable vertical scrolling */
+    }
+	
+	.card-box {
+		border-radius: 20px;
+       	box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
+    }
+    
+        #followupCard {
+    transition: transform 0.2s ease; /* Smooth scaling transition */
+    cursor: pointer; /* Default cursor change */
+}
+
+#followupCard:hover {
+    transform: scale(1.05); /* Slightly scale up on hover */
+    cursor: pointer; /* Change cursor to hand symbol */
+}
+
+.card-block {
+    padding: 20px;
+}
+
+.form-label {
+    margin-bottom: 0.5rem;
+}
+
+input.form-control {
+    padding: 10px;
+}
+.form-select {
+    padding: 10px;
+    height: 40px;
+}
+
+#employeeCard label{
+padding-top: 2%;
+}
+
+.form-section h5 {
+      background-color: #0d6efd;
+      color: white;
+      padding: 10px;
+      border-radius: 5px;
+      margin-bottom: 20px;
+    }
+    .upload-box {
+      border: 2px dashed #999;
+      padding: 20px;
+      text-align: center;
+      color: #666;
+      border-radius: 8px;
+      background-color: #f8f9fa;
+      cursor: pointer;
+    }
+
+		/*css for map in step2*/
+		#googleMap {
+			height: 300px;
+			width: 100%;
+			position: relative;
+			overflow: hidden;
+			max-width: 100%;
+		}
+		
+		#pac-input {
+		    position: absolute;
+		    top: 10px;
+		    left: 50%;
+		    transform: translateX(-50%);
+		    width: 300px;
+		    z-index: 5;
+		    padding: 10px;
+		    border: 1px solid #ccc;
+		    background-color: white;
+		    border-radius: 4px;
+		  }
+
+		#search-container {
+			position: absolute;
+			top: 10px;
+			left: 50%;
+			transform: translateX(-50%);
+			z-index: 1000;
+			width: 500px;
+			box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.3);
+			background-color: white;
+			border-radius: 4px;
+			padding: 0;
+			/* Removed extra padding to match the input width */
+		}
+
+		#search-box {
+			width: 100%;
+			/* Ensures the input takes up the entire width of the container */
+			padding: 5px;
+			font-size: 16px;
+			border: 1px solid #ccc;
+			border-radius: 4px;
+			/* Rounded corners matching the container */
+			box-sizing: border-box;
+			/* Makes sure padding is considered in width */
+		}
+
+		#suggestions {
+			border: 1px solid #ccc;
+			border-radius: 4px;
+			max-height: 200px;
+			overflow-y: auto;
+			margin-top: 5px;
+			background-color: white;
+			display: none;
+			width: 100%;
+			/* Matches the width of the container and input */
+			box-sizing: border-box;
+			/* Ensures the width includes borders and padding */
+		}
+
+		#suggestions ul {
+			list-style: none;
+			padding: 0;
+			margin: 0;
+		}
+
+		#suggestions ul li {
+			padding: 5px;
+			cursor: pointer;
+		}
+
+		#suggestions ul li:hover {
+			background-color: #f0f0f0;
+		}
+</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>Street Vendor Entries</h5>
+                                    </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">Street Vendor Entries</li>
+                                        
+                                    </ol>
+                                </nav>
+                            </div>
+                        </div>
+                    </div>
+                        
+					<div class="container my-4">
+  
+				    <div class="card p-4 shadow"><span th:text="${LoginUserId}" style="display:none;" id="userIdSpan"></span>
+					<form id="vendorForm" enctype="multipart/form-data" >
+				      <!-- Business Details -->
+				      <div class="section-header">
+				    
+				      <h5>Business Details | வியாபார விவரங்கள்</h5></div>
+				      		<div id="mapContainer" style="position: relative; height: 500px;">
+							  	<input id="pac-input" class="controls" type="text" placeholder="Search location">
+							  	<div id="googleMap" style="height: 90%; width: 100%;"></div>
+							</div>
+							<div id="search-container">
+								<!-- <input type="text" id="search-box" placeholder="Search for a location..."> -->
+								<div id="suggestions"></div>
+							</div>
+							 <div class="row mb-3">
+							 
+							 <div class="col-md-6">
+									<!-- <label for="latitude_field">Latitide</label>
+									<input type="text" class="form-control" id="latitude_field"> -->
+									<label for="latitude_field">Latitude</label>
+									<input type="text" class="form-control" id="latitude_field" name="latitude_field"  readonly >
+								</div>
+							   <div class="col-md-6">
+									<!-- <label for="longitude_field">Longtitude</label>
+									<input type="text" class="form-control" id="longitude_field" name="longtitude"> -->
+									<label for="longitude_field">Longitude</label>
+									<input type="text" class="form-control" id="longitude_field" name="longitude_field"  readonly >
+								</div>
+								
+							</div>
+				
+
+					      <div class="row mb-3">
+					      
+					      
+					        <!-- <div class="col-md-6" >
+					          <label for="zone" class="form-label">Zone - மண்டலம் <span class="required">*</span></label>
+					          <select id="zone" name="zone" class="form-control" required >
+								  <option value="">-- Select Zone --</option>
+								  <th:block th:each="zone : ${zones}">
+								    <option th:value="${zone.id}" th:text="${zone.zone_name}"></option>
+								  </th:block>
+								</select>
+								
+								
+					        </div>
+					        
+					        
+					        
+					        <div class="col-md-6">
+					          <label for="ward" class="form-label">Ward - வார்டு <span class="required">*</span></label>
+					          <select id="ward" name="ward" class="form-control" required>
+							    <option value="">-- Select Ward --</option>
+							  </select>
+					        </div> -->
+					        
+					        <div class="col-md-6">
+									<!-- <label for="latitude_field">Latitide</label>
+									<input type="text" class="form-control" id="latitude_field"> -->
+									<label for="zone">Zone</label>
+					        
+					        <input type="text" class="form-control" id="zone" name="zone"  readonly>
+					        </div>
+					        
+					        <div class="col-md-6">
+						        <label for="ward">Ward</label>
+								<input type="text" class="form-control" id="ward" name="ward" readonly>
+					        </div>
+					        
+					      </div>
+					      <div class="mb-3">
+					        <label class="form-label">Landmark (maximum 255 characters)</label>
+					        <textarea class="form-control" id="landmark" name="landmark" maxlength="255"></textarea>
+					      </div>
+					      <div class="row mb-3">
+					        <div class="col-md-6">
+					          <label class="form-label">District | மாவட்டம்</label>
+					          <input type="text" class="form-control" id="vendor_district" name="vendor_district" oninput="this.value = this.value.replace(/[^a-zA-Z\s]/g, '')" >
+					        </div>
+					        <div class="col-md-6">
+					          <label class="form-label">Pincode | அஞ்சல் குறியீடு</label>
+					          <input type="text" class="form-control" id="vendor_pincode" name="vendor_pincode" oninput="validatePincode(this)" >
+					         		 
+					        </div>
+					      </div>
+					
+					      <div class="row mb-3">
+					      
+					      <div class="col-md-6">
+								<label for="businesstype" class="form-label">Type of Business | வியாபார வகை <span class="text-danger">*</span>
+								</label> 
+									<select id="businesstype" name="businesstype" class="form-control"  required>
+								  <option value="">-- Select Business Type --</option>
+								  <th:block th:each="vendingCategory : ${vendingCategories}">
+								    <option th:value="${vendingCategory.id}" th:text="${vendingCategory.vending_category_name}"></option>
+								  </th:block>
+								</select>
+								
+							</div>
+					        
+					          
+					        <div class="col-md-6">
+					          <label class="form-label">Business Space (Sq ft)| வியாபார இடம் </label>
+					          <input type="text" class="form-control" id="business_space" name="business_space">
+					        </div>
+					      </div>
+					
+					      <div class="row mb-3">
+					        <div class="col-md-6">
+					          <label class="form-label">Did you get SVANIDHI loan? | ஸ்வநிதி கடன் வாங்கினீங்களா? </label><br>
+					          <input type="radio" name="svanidhi" value="Yes" > Yes
+					          <input type="radio" name="svanidhi" value="No" class="ms-3"> No
+					        </div>
+					        <div class="col-md-6">
+					          <label class="form-label">Do you have a Bank Account? | வங்கி கணக்கு உள்ளதா? </label><br>
+					          <input type="radio" name="bank_account" value="Yes" > Yes
+					          <input type="radio" name="bank_account" value="No" class="ms-3"> No
+					        </div>
+					        
+					        
+					        <div class="col-md-6" id="bank_passbook_container" style="display:none;">
+							    <label for="bank_passbook" class="form-label">Upload Bank Passbook (jpg/jpeg/pdf)
+							   </label>
+							    <input type="file" class="form-control" id="bank_passbook" name="bank_passbook" accept=".jpg,.jpeg,.pdf,application/pdf" >
+							</div>
+												        
+					      </div>
+					
+					      <!-- Personal Details -->
+					      <div class="section-header">
+					      <h5>தனிப்பட்ட விவரங்கள் | Personal Details</h5>
+					      </div>
+					      
+					      <div class="row mb-3">
+					      <div class="col-md-6">
+					          <label class="form-label">Profile Image (jpg/jpeg/pdf)</label>
+					          <input type="file" class="form-control" id="profileimage"
+														accept=".jpg,.jpeg,.pdf,application/pdf" name="profileimage" >
+					        </div>
+					        </div>
+					      <div class="row mb-3">
+					        <div class="col-md-6">
+					          <label class="form-label"> Name | பெயர் <span class="required">*</span></label>
+					          <input type="text" class="form-control" id="name" name="name" oninput="this.value = this.value.replace(/[^a-zA-Z\s]/g, '')" required>
+					        </div>
+					        <div class="col-md-6">
+					          <label class="form-label">Father's / Husband's Name | தந்தை/கணவர் பெயர் </label>
+					          <input type="text" class="form-control" id="father_name" name="father_name" oninput="this.value = this.value.replace(/[^a-zA-Z\s]/g, '')" >
+					        </div>
+					      </div>
+					
+					      <div class="row mb-3">
+					        <div class="col-md-6">
+					          <label class="form-label">Mobile Number | மொபைல் எண் <span class="required">*</span></label>
+					          <input type="text" class="form-control" id="mobile_no" name="mobile_no" oninput="validatePhoneNumber(this)" required>
+					        </div>
+					        <div class="col-md-6">
+					          <label class="form-label">Gender | பாலினம் </label><br>
+					          <input type="radio" name="gender" value="Male" > Male
+					          <input type="radio" name="gender" value="Female" class="ms-3"> Female
+					          <input type="radio" name="gender" value="Transgender" class="ms-3">Transgender
+					        </div>
+					      </div>
+					
+					      
+					      <div class="row mb-3">
+					        <div class="col-md-6">
+					          <label class="form-label">Date of Birth | பிறந்த தேதி </label>
+					          <input type="date" id="dob" class="form-control" name="dob" >
+					        </div>
+					        <div class="col-md-6">
+					          <label class="form-label">Community Category | சமூக வகை </label>
+					          <select class="form-control" id="community" name="community" >
+								    <option value="">-- Select Community --</option>
+								    <th:block th:each="com : ${communities}">
+								        <option th:value="${com.id}" th:text="${com.category_name}"></option>
+								    </th:block>
+								</select>
+					        </div>
+					      </div>
+					
+					      <div class="row mb-3">
+					        <div class="col-md-6">
+					          <label class="form-label">Differently Abled | இயலாமை உள்ளவரா? </label><br>
+					          <input type="radio" name="differently_abled" value="Yes" > Yes
+					          <input type="radio" name="differently_abled" value="No" class="ms-3"> No
+					        </div>
+					        
+					        
+					        
+					        <div class="col-md-6">
+					          <label class="form-label">Street Vendor’s educational status  | தெருவணிகரின் கல்வித்தகுதி </label>
+					          <select class="form-control"  id="education" name="education" >
+							    <option value="">-- Select Education Status--</option>
+							    <th:block th:each="edu : ${educationList}">
+							        <option th:value="${edu.id}" th:text="${edu.education}"></option>
+							    </th:block>
+							</select>
+					        </div>
+					      </div>
+					
+					
+					      <div class="row mb-3">
+					        <div class="col-md-6">
+					          <label for="maritalstatus" class="form-label"> Marital Status | திருமண நிலை </label>
+					          <select class="form-control" id="maritalStatus" name="maritalStatus" >
+							    <option value="">-- Select Marital Status --</option>
+							    <th:block th:each="status : ${maritalStatuses}">
+							        <option th:value="${status.id}" th:text="${status.marital_status}"></option>
+							    </th:block>
+							</select>
+					        </div>
+					        <div class="col-md-6">
+					          <label for="familymembers" class="form-label">Number of Family Members | குடும்ப உறுப்பினர்கள் எண்ணிக்கை </label>
+					          <input type="number" class="form-control" name="familymembers" id="familymembers">
+					        </div>
+					      </div>
+					
+					      <div class="mb-3">
+					        <label class="form-label">Are any of your family member involved in street vending | உங்கள் குடும்ப உறுப்பினர் வியாபாரத்தில் உள்ளவரா? </label><br>
+					        <input type="radio" name="fam_vendor" value="Yes" > Yes
+					        <input type="radio" name="fam_vendor" value="No" class="ms-3"> No
+					      </div>
+					
+					      <!-- Address -->
+					      <div class="section-header">
+					      <h5>Residential Address | வீட்டு முகவரி </h5>
+					      </div>
+					      <div class="row mb-3">
+					        <div class="col-md-6">
+					          <label class="form-label">Door No | கதவு எண் </label>
+					          <input type="text" class="form-control" name="doorno" id="doorno" >
+					        </div>
+					        <div class="col-md-6">
+					          <label class="form-label">Street Name | தெரு பெயர் </label>
+					          <input type="text" class="form-control" name="streetname" id="streetname" >
+					        </div>
+					      </div>
+					      <div class="row mb-3">
+					        <div class="col-md-6">
+					          <label class="form-label">Area Name | பகுதி பெயர் </label>
+					          <input type="text" class="form-control" name="areaname" id="areaname" >
+					        </div>
+					        <div class="col-md-6">
+					          <label class="form-label">District | மாவட்டம் </label>
+					          <input type="text" class="form-control" name="district" id="district" oninput="this.value = this.value.replace(/[^a-zA-Z\s]/g, '')" >
+					        </div>
+					      </div>
+					      
+					      <div class="row mb-3">
+					      <div class="col-md-6">
+					        <label class="form-label">Pincode | அஞ்சல் குறியீடு </label>
+					        <input type="text" class="form-control" name="pincode" id="pincode" oninput="validatePincode(this)" >
+					      </div>
+					      
+					      
+					      <div class="col-md-6">
+							  <label class="form-label">Aadhaar Number | ஆதார் எண் </label>
+							  <input type="text" class="form-control" id="aadhar_number" name="aadhar_number" maxlength="12" oninput="validateAadhar(this)" >
+							</div>
+					      
+					      </div>
+					
+					      <!-- Document Uploads -->
+					     <div class="section-header">
+					     <h5>ஆவணங்கள் | Document Uploads</h5>
+					     </div>
+					      <div class="row mb-3">
+					        <div class="col-md-6">
+					          <label class="form-label">Aadhaar Front Image | ஆதார் முன்னணி படத்தை பதிவேற்றவும் (jpg/jpeg/pdf)</label>
+					          <input type="file" class="form-control" id="aadharfrontimage"
+														accept=".jpg,.jpeg,.pdf,application/pdf" name="aadharfrontimage" >
+					        </div>
+					        <div class="col-md-6">
+					          <label class="form-label">Aadhaar Back Image | ஆதார் பின்னணி படத்தை பதிவேற்றவும் (jpg/jpeg/pdf)</label>
+					          <input type="file" class="form-control" id="aadharbackimage"
+															accept=".jpg,.jpeg,.pdf,application/pdf" name="aadharbackimage" >
+					        </div>
+					      </div>
+					      <div class="row mb-3">
+					      <div class="col-md-6">
+					        <label class="form-label">Take Ration Card Front Image | ரேஷன் கார்டு முன்னணி படத்தை பதிவேற்றவும் (jpg/jpeg/pdf)</label>
+					        <input type="file" class="form-control" id="ration_card_photo"
+															accept=".jpg,.jpeg,.pdf,application/pdf" name="ration_card_photo" >
+					      </div>
+					 </div>
+				      <!-- Submit -->
+				      <div class="text-center mt-4">
+								<button type="submit" class="btn btn-success" name="submitBtn" id="submitBtn">Submit</button>
+								
+						</div>
+						</form>
+				    </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>
+							
+            <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
+        </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>
+    <!-- Bootstrap 5 JS -->
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
+    <script sync defer
+		src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCi7N6uW5MZaSkd50Kzw7ax2GkMN1vjE-E&callback=myMap&libraries=places">
+		</script>
+    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+
+	<script>
+
+	//Script For Map
+
+	function myMap() {
+		const defaultCenter = { lat: 13.0827, lng: 80.2707 };
+		const map = new google.maps.Map(document.getElementById("googleMap"), {
+			center: defaultCenter,
+			zoom: 14
+		});
+
+		let marker = null;
+		let streetsList = []; // ✅ Define globally inside myMap
+		const infowindow = new google.maps.InfoWindow();
+
+		// 🔍 Initialize the SearchBox
+		const input = document.getElementById('pac-input');
+		const searchBox = new google.maps.places.SearchBox(input);
+		//map.controls[google.maps.ControlPosition.TOP_LEFT].push(input);
+
+		map.addListener('bounds_changed', function () {
+			searchBox.setBounds(map.getBounds());
+		});
+
+		searchBox.addListener('places_changed', function () {
+			const places = searchBox.getPlaces();
+			if (places.length === 0) return;
+
+			if (marker) marker.setMap(null);
+			const place = places[0];
+			if (!place.geometry) return;
+
+			marker = new google.maps.Marker({
+				map: map,
+				position: place.geometry.location
+			});
+
+			const lat = place.geometry.location.lat().toFixed(6);
+			const lng = place.geometry.location.lng().toFixed(6);
+			document.getElementById("latitude_field").value = lat;
+			document.getElementById("longitude_field").value = lng;
+
+			map.setCenter(place.geometry.location);
+			map.setZoom(15);
+
+			infowindow.setContent(`Latitude: ${lat}<br>Longitude: ${lng}`);
+			infowindow.open(map, marker);
+
+			fetchStreets(lat, lng);
+		});
+
+		map.addListener("click", function (event) {
+			const clickedLatLng = event.latLng;
+			if (marker) marker.setMap(null);
+
+			marker = new google.maps.Marker({
+				position: clickedLatLng,
+				map: map
+			});
+
+			const lat = clickedLatLng.lat().toFixed(6);
+			const lng = clickedLatLng.lng().toFixed(6);
+
+			document.getElementById("latitude_field").value = lat;
+			document.getElementById("longitude_field").value = lng;
+
+			infowindow.setContent(`Latitude: ${lat}<br>Longitude: ${lng}`);
+			infowindow.open(map, marker);
+
+			fetchStreets(lat, lng);
+		});
+
+		// ✅ Move fetchStreets here inside myMap, and use local streetsList
+		/* function fetchStreets(lat, lng) {
+			const encodedGeometry = encodeURIComponent(JSON.stringify({ y: lat, x: lng }));
+			const streetURL = `https://gisgcc.chennaicorporation.gov.in/server/rest/services/GCCDepts/EDPMobile2025/FeatureServer/0/query?` +
+				`where=&objectIds=&time=&geometry=${encodedGeometry}` +
+				`&geometryType=esriGeometryPoint&inSR=4326&defaultSR=4326&spatialRel=esriSpatialRelIntersects&distance=25` +
+				`&units=esriSRUnit_Meter&relationParam=&outFields=region%2Cnew_zone%2C+new_ward%2Croad_id%2C+road_name%2Cgis_id%2Ctype` +
+				`&returnGeometry=false&maxAllowableOffset=&geometryPrecision=&outSR=&havingClause=&gdbVersion=&historicMoment=` +
+				`&returnDistinctValues=false&returnIdsOnly=false&returnCountOnly=false&returnExtentOnly=false&orderByFields=` +
+				`&groupByFieldsForStatistics=&outStatistics=&returnZ=false&returnM=false&multipatchOption=xyFootprint&resultOffset=` +
+				`&resultRecordCount=&returnTrueCurves=false&returnExceededLimitFeatures=false&quantizationParameters=&returnCentroid=false` +
+				`&timeReferenceUnknownClient=false&maxRecordCountFactor=&sqlFormat=none&resultType=&featureEncoding=esriDefault` +
+				`&datumTransformation=&f=geojson`;
+
+			const streetSelect = document.getElementById("streetName");
+			streetSelect.innerHTML = "";
+
+			const defaultOption = document.createElement("option");
+			defaultOption.value = "";
+			defaultOption.text = "-- Select Street --";
+			streetSelect.appendChild(defaultOption);
+
+			document.getElementById("streetId").value = "";
+			document.getElementById("landmark").value = "";
+			
+			// Timeout mechanism: 1 seconds
+			const timeout = new Promise((_, reject) =>
+				setTimeout(() => reject(new Error("Request timed out")), 1000)
+			);
+
+			// Actual fetch
+			const fetchRequest = fetch(streetURL).then(res => res.json());
+
+			Promise.race([fetchRequest, timeout])
+				.then(data => {
+					const features = data.features;
+					if (!features || features.length === 0) {
+						Swal.fire({
+							icon: 'warning',
+							title: 'No Street Found',
+							text: 'Please select the nearby street.',
+						});
+						return;
+					}
+
+					streetsList = features.map(f => f.properties); //Save for use in dropdown
+					streetsList.forEach((props, index) => {
+						const option = document.createElement("option");
+						option.value = index;
+						option.text = props.road_name;
+						streetSelect.appendChild(option);
+					});
+				})
+				.catch(err => {
+					console.error("Error fetching street:", err);
+					Swal.fire("Failed to load street data", '', 'error');
+				});
+		} */
+
+		/* document.getElementById("streetName").addEventListener("change", function () {
+			const selectedIndex = this.value;
+			if (selectedIndex !== "") {
+				const selectedStreet = streetsList[selectedIndex];
+
+				document.getElementById("streetId").value = selectedStreet.road_id;
+				document.getElementById("landmark").value = selectedStreet.type;
+				// document.getElementById("zone").value = selectedStreet.new_zone;
+				// document.getElementById("ward").value = selectedStreet.new_ward;
+
+				console.log("Selected street:", selectedStreet);
+			} else {
+				document.getElementById("streetId").value = "";
+				document.getElementById("landmark").value = "";
+				// document.getElementById("zone").value = "";
+				// document.getElementById("ward").value = "";
+			}
+		}); */
+		
+		
+		function fetchStreets(lat, lng) {
+			const encodedGeometry = encodeURIComponent(JSON.stringify({ y: lat, x: lng }));
+		    //const url = `https://gisgcc.chennaicorporation.gov.in/server/rest/services/GCCDepts/EDPMobile2025/
+		    //FeatureServer/2/query?where=&objectIds=&time=&geometry={encodedGeometry}&geometryType=esriGeometryPoint&inSR=4326&defaultSR=4326&spatialRel=esriSpatialRelIntersects&distance=1&units=esriSRUnit_Meter&outFields=zone,ward&returnGeometry=false&f=geojson`;
+		    
+			const url=`https://gisgcc.chennaicorporation.gov.in/server/rest/services/GCCDepts/EDPMobile2025/FeatureServer/2/query?` +
+				`where=&objectIds=&time=&geometry=${encodedGeometry}` + 
+				`&geometryType=esriGeometryPoint&inSR=4326&defaultSR=4326&spatialRel=esriSpatialRelIntersects&distance=1` +
+				`&units=esriSRUnit_Meter&relationParam=&outFields=zone,ward` +
+				`&returnGeometry=false&maxAllowableOffset=&geometryPrecision=&outSR=&havingClause=&gdbVersion=&historicMoment=` +
+				`&returnDistinctValues=false&returnIdsOnly=false&returnCountOnly=false&returnExtentOnly=false&orderByFields=` +
+				`&groupByFieldsForStatistics=&outStatistics=&returnZ=false&returnM=false&multipatchOption=xyFootprint&resultOffset=` +
+				`&resultRecordCount=&returnTrueCurves=false&returnExceededLimitFeatures=false&quantizationParameters=&returnCentroid=false` +
+				`&timeReferenceUnknownClient=false&maxRecordCountFactor=&sqlFormat=none&resultType=&featureEncoding=esriDefault` +
+				`&datumTransformation=&f=geojson`;
+		    fetch(url)
+		        .then(response => {
+		            if (!response.ok) {
+		                throw new Error(`HTTP error! Status: ${response.status}`);
+		            }
+		            return response.json();
+		        })
+		        .then(data => {
+		        	
+		        	console.log("GIS API Response:", data);
+
+		            const features = data.features;
+		            if (features.length > 0) {
+		                const props = features[0].properties;
+		                const zone = props.zone;
+		                const ward = props.ward;
+
+		                console.log("Zone:", zone, "Ward:", ward);
+		                // 👉 You can update form fields or DOM elements here
+		                document.getElementById("zone").value = zone;
+		                document.getElementById("ward").value = ward;
+		            } else {
+		                console.warn("No zone/ward found for this location.");
+		                document.getElementById("zone").value = '';
+		                document.getElementById("ward").value = '';
+		            }
+		        })
+		        .catch(error => {
+		            console.error("Error fetching zone/ward:", error);
+		        });
+		}
+	}
+			/* function fetchSuggestions(query) {
+				// ArcGIS API URL to fetch suggestions based on the input query
+				const arcgisSuggestionUrl = `https://gisgcc.chennaicorporation.gov.in/server/rest/services/Hosted/Road_API/FeatureServer/0/query?where=UPPER(road_name)%20LIKE%20'%25${query.toUpperCase()}%25'&outFields=road_name,zone,ward,road_id&returnGeometry=true&f=geojson`;
+
+				fetch(arcgisSuggestionUrl)
+					.then(response => response.json())
+					.then(data => {
+						var suggestions = document.getElementById('suggestions');
+						suggestions.innerHTML = '';
+
+						if (data.features && data.features.length > 0) {
+							suggestions.style.display = 'block';
+							var ul = document.createElement('ul');
+							data.features.forEach(function (result) {
+								var lat = result.geometry.coordinates[1];
+								var lng = result.geometry.coordinates[0];
+								var roadName = result.properties.road_name || 'Unknown Road';
+								 var zone = result.properties.zone || 'Unknown Zone';
+								var ward = result.properties.ward || 'Unknown Ward'; 
+								var roadId = result.properties.road_id || 'Unknown Road ID'
+
+								// Creating the suggestion item with road name, zone, and ward
+								var li = document.createElement('li');
+								li.textContent = `${roadName} - Zone: ${zone}, Ward: ${ward}`;
+								li.dataset.latlng = JSON.stringify([lat, lng]);
+								li.dataset.roadName = roadName;
+								li.dataset.roadId = roadId;
+									li.dataset.zone = zone;
+									li.dataset.ward = ward; 
+								ul.appendChild(li);
+							});
+							suggestions.appendChild(ul);
+						} else {
+							suggestions.style.display = 'none';
+						}
+					})
+					.catch(error => console.error('Error fetching suggestions:', error));
+			} */
+
+			/* function fetchLocationInfoByMap(lat, lng, marker) {
+				const arcgisUrl = `https://gisgcc.chennaicorporation.gov.in/server/rest/services/Hosted/Road_API/FeatureServer/0/query?where=&objectIds=&time=&geometry=%7B%22y%22%3A${lat}%2C%22x%22%3A${lng}%7D&geometryType=esriGeometryEnvelope&inSR=4326&defaultSR=4326&spatialRel=esriSpatialRelIntersects&distance=25&units=esriSRUnit_Meter&relationParam=&outFields=zone%2Cward%2Croad_id%2Croad_name&returnGeometry=false&maxAllowableOffset=&geometryPrecision=&outSR=&havingClause=&gdbVersion=&historicMoment=&returnDistinctValues=false&returnIdsOnly=false&returnCountOnly=false&returnExtentOnly=false&orderByFields=&groupByFieldsForStatistics=&outStatistics=&returnZ=false&returnM=false&multipatchOption=xyFootprint&resultOffset=&resultRecordCount=&returnTrueCurves=false&returnCentroid=false&timeReferenceUnknownClient=false&maxRecordCountFactor=&sqlFormat=none&resultType=&datumTransformation=&lodType=geohash&lod=&lodSR=&f=geojson`;
+
+				fetch(arcgisUrl)
+					.then(response => response.json())
+					.then(data => {
+						console.log(data);
+						let info;
+						if (data.features && data.features.length > 0) {
+							const properties = data.features[0].properties;
+							const roadName = properties.road_name || 'N/A';
+							 	const zone = properties.zone || 'N/A';
+								const ward = properties.ward || 'N/A'; 
+							const roadId = properties.road_id || 'N/A';
+
+							info = `Road Name: ${roadName}<br>Zone: ${zone}<br>Ward: ${ward}<br>Latitude: ${lat}<br>Longitude: ${lng}`;
+							document.getElementById("street").value = roadName;
+							document.getElementById("latitude_field").value = lat;
+							document.getElementById("longitude_field").value = lng;
+							//document.getElementById("street_id").value = roadId;
+							document.getElementById("streetId").value = roadId;
+							document.getElementById("landmark").value = roadName;
+							marker.bindTooltip(info, {permanent: false, direction: 'top'}).openTooltip();
+						} else {
+							document.getElementById("street").value = "No road data found for this location";
+							document.getElementById("latitude_field").value = "No latitude data found for this location";
+							document.getElementById("longitude_field").value = "No latitude data found for this location";
+							//document.getElementById("street_id").value = "No street id data found for this location";
+							document.getElementById("streetId").value = "No street id data found for this location";
+							document.getElementById("landmark").value = "No landmark data found for this location";
+							info = `No road data found for this location`
+							marker.bindTooltip(info, {permanent: false, direction: 'top'}).openTooltip();
+						}
+					})
+					.catch(error => {
+						console.error('Error fetching road data:', error);
+						marker.bindTooltip(`Error fetching road data.<br>Latitude: ${lat}<br>Longitude: ${lng}`, {permanent: false, direction: 'top'}).openTooltip();
+					});
+			} */
+
+			/* function fetchLocationInfoBySuggestions(lat, lng, marker) {
+				const arcgisUrl = `https://gisgcc.chennaicorporation.gov.in/server/rest/services/Hosted/Road_API/FeatureServer/0/query?where=&objectIds=&time=&geometry=%7B%22y%22%3A${lat}%2C%22x%22%3A${lng}%7D&geometryType=esriGeometryEnvelope&inSR=4326&defaultSR=4326&spatialRel=esriSpatialRelIntersects&distance=25&units=esriSRUnit_Meter&relationParam=&outFields=zone%2Cward%2Croad_id%2Croad_name&returnGeometry=false&maxAllowableOffset=&geometryPrecision=&outSR=&havingClause=&gdbVersion=&historicMoment=&returnDistinctValues=false&returnIdsOnly=false&returnCountOnly=false&returnExtentOnly=false&orderByFields=&groupByFieldsForStatistics=&outStatistics=&returnZ=false&returnM=false&multipatchOption=xyFootprint&resultOffset=&resultRecordCount=&returnTrueCurves=false&returnCentroid=false&timeReferenceUnknownClient=false&maxRecordCountFactor=&sqlFormat=none&resultType=&datumTransformation=&lodType=geohash&lod=&lodSR=&f=geojson`;
+
+				fetch(arcgisUrl)
+					.then(response => response.json())
+					.then(data => {
+						console.log(data);
+						let info;
+						if (data.features && data.features.length > 0) {
+							const properties = data.features[0].properties;
+							const roadName = properties.road_name || 'N/A';
+									const zone = properties.zone || 'N/A';
+									const ward = properties.ward || 'N/A'; 
+							const roadId = properties.road_id || 'N/A';
+
+							info = `Road Name: ${roadName}<br>Zone: ${zone}<br>Ward: ${ward}<br>Latitude: ${lat}<br>Longitude: ${lng}`;
+							document.getElementById("street").value = roadName;
+							document.getElementById("latitude_field").value = lat;
+							document.getElementById("longitude_field").value = lng;
+							//document.getElementById("street_id").value = roadId;
+							document.getElementById("streetId").value = roadId;
+							document.getElementById("landmark").value = roadName;
+							marker.bindTooltip(info, {permanent: false, direction: 'top'}).openTooltip();
+						} else {
+							document.getElementById("street").value = suggestedRoadName;
+							document.getElementById("latitude_field").value = lat;
+							document.getElementById("longitude_field").value = lng;
+							//document.getElementById("street_id").value = suggestedRoadId;
+							document.getElementById("streetId").value = suggestedRoadId;
+							document.getElementById("landmark").value = suggestedRoadName;
+							info = `Road Name: ${suggestedRoadName}<br>Zone: ${suggestedZone}<br>Ward: ${suggestedWard}<br>Latitude: ${lat}<br>Longitude: ${lng}`
+							marker.bindTooltip(info, {permanent: false, direction: 'top'}).openTooltip();
+						}
+					})
+					.catch(error => {
+						console.error('Error fetching road data:', error);
+						marker.bindTooltip(`Error fetching road data.<br>Latitude: ${lat}<br>Longitude: ${lng}`, {permanent: false, direction: 'top'}).openTooltip();
+					});
+			} */
+			
+			
+			
+			
+			
+			
+			$(document).ready(function () {
+			    
+			    /* $('#zone').on('change', function () {
+			        var zoneId = $(this).val();
+			        $('#ward').html('<option value="">-- Loading Wards --</option>');
+
+			        if (zoneId) {
+			            $.ajax({
+			                url: '/gcc/api/streetvendor/wards-by-zone',
+			                type: 'GET',
+			                data: { zoneId: zoneId },
+			                success: function (data) {
+			                    $('#ward').empty().append('<option value="">-- Select Ward --</option>');
+			                    $.each(data, function (i, ward) {
+			                        $('#ward').append(`<option value="${ward.id}">${ward.ward_name}</option>`);
+			                    });
+			                },
+			                error: function () {
+			                    $('#ward').html('<option value="">-- Error Loading Wards --</option>');
+			                }
+			            });
+			        } else {
+			            $('#ward').html('<option value="">-- Select Ward --</option>');
+			        }
+			    }); */
+
+			    // Show&hide bank passbook input
+			    $("input[name='bank_account']").change(function () {
+			        if ($(this).val() === "Yes") {
+			            $("#bank_passbook_container").show();
+			        } else {
+			            $("#bank_passbook_container").hide();
+			            $("#bank_passbook").val("");
+			        }
+			    });
+
+			    // Form submit
+			    $('#vendorForm').submit(function (e) {
+			        e.preventDefault();
+
+			        let formData = new FormData(this);
+			        $('#submitBtn').prop('disabled', true).text('Saving...');
+
+			        // Map booleans
+			        /* formData.set("pm_svanidhi_loan", $("input[name='svanidhi']:checked").val() === "Yes");			        			        			        
+			        formData.set("bank_acc_status", $("input[name='bank_account']:checked").val() === "Yes");
+			        formData.set("diff_abled", $("input[name='differently_abled']:checked").val() === "Yes");
+			        formData.set("are_any_fam_mem_invol_str", $("input[name='fam_vendor']:checked").val() === "Yes"); */
+			        
+			        
+			     
+
+			        // Mobile validation + check
+			        const mobileNumber = $('#mobile_no').val();
+			        if (!/^\d{10}$/.test(mobileNumber)) {
+			            Swal.fire("Invalid Mobile Number", "Enter a valid 10-digit number.", "error");
+			            $('#submitBtn').prop('disabled', false).text('Submit');
+			            return;
+			        }
+			        
+			       
+			        $('#pageLoader').show();
+			        $.ajax({
+			            url: '/gcc/api/streetvendor/check-mobile',
+			            type: 'GET',
+			            data: { mobilenumber: mobileNumber },
+			            success: function (exists) {
+			            	$('#pageLoader').hide();
+			                if (exists) {
+			                    Swal.fire('Mobile Exists', 'This mobile number is already registered.', 'warning');
+			                    $('#submitBtn').prop('disabled', false).text('Submit');
+			                    return;
+			                } else {
+			                	$('#pageLoader').show();
+			                	function setIfPresent(formData, key, value) {
+			                        if (value !== undefined && value !== null && value !== "") {
+			                            formData.set(key, value);
+			                        }
+			                    }
+			                	
+			                	function setFileIfPresent(formData, key, fileInput) {
+			                	    if (fileInput && fileInput.files && fileInput.files.length > 0) {
+			                	        formData.set(key, fileInput.files[0]);
+			                	    }
+			                	}
+			                	
+			                	let userId = document.getElementById('userIdSpan').textContent;
+			                	
+			                	// pm_svanidhi_loan
+			                	let svanidhiVal = $("input[name='svanidhi']:checked").val();
+			                	setIfPresent(formData, "pm_svanidhi_loan", svanidhiVal === undefined ? "" : svanidhiVal === "Yes");
+			                	//formData.set("pm_svanidhi_loan", svanidhiVal === undefined ? "" : svanidhiVal === "Yes");
+
+			                	// bank_acc_status
+			                	let bankVal = $("input[name='bank_account']:checked").val();
+			                	setIfPresent(formData, "bank_acc_status",bankVal === undefined ? "" : bankVal === "Yes");
+
+			                	// diff_abled
+			                	let diffVal = $("input[name='differently_abled']:checked").val();
+			                	setIfPresent(formData, "diff_abled", diffVal === undefined ? "" : diffVal === "Yes");
+
+			                	// are_any_fam_mem_invol_str
+			                	let famVal = $("input[name='fam_vendor']:checked").val();
+			                	setIfPresent(formData, "are_any_fam_mem_invol_str", famVal === undefined ? "" : famVal === "Yes");
+
+
+						        // File check if bank status is Yes
+						        const isBankYes = $("input[name='bank_account']:checked").val() === "Yes";
+						        //setIfPresent(formData, "bank_acc_status", isBankYes === undefined ? "" : isBankYes === "Yes");
+						        const bankPassbook = $('#bank_passbook')[0]?.files[0];
+						        if (isBankYes && !bankPassbook) {
+						            Swal.fire('Missing Bank Passbook', 'Bank passbook is required because Bank Account Status is Yes.', 'warning');
+						            $('#submitBtn').prop('disabled', false).text('Submit');
+						            return;
+						        }
+						        if (isBankYes) setFileIfPresent(formData, "bank_passbook", $('#bank_passbook')[0].files[0]);
+
+						        // Lat/Lng
+						        const latitude = $('#latitude_field').val().trim();
+						        const longitude = $('#longitude_field').val().trim();
+						        
+								/*ormData.set("latitude", latitude);
+						        formData.set("longitude", longitude); */
+						        
+						        setIfPresent(formData, "latitude", latitude);
+						        setIfPresent(formData, "longitude", longitude);
+						        
+						        const landmarkval = $('#landmark').val().trim();
+						        setIfPresent(formData, "landmark", landmarkval);
+						        
+						        const zone = $('#zone').val().trim();
+						        const ward = $('#ward').val().trim();
+						        
+						        //formData.set("zone", zone);
+						        //formData.set("ward", ward);
+						        
+						        setIfPresent(formData, "zone", zone);
+						        setIfPresent(formData, "ward", ward);
+
+						        // Pincode validation
+						        const vendingPincode = $('#vendor_pincode').val().trim();
+						        if (vendingPincode !=="" && !/^\d{6}$/.test(vendingPincode)) {
+						        	$('#pageLoader').hide();
+						            Swal.fire("Invalid vending place pincode", "Pincode must be 6 digits.", "error");
+						            $('#submitBtn').prop('disabled', false).text('Submit');
+						            return;
+						        }
+						        setIfPresent(formData, "vending_pincode", vendingPincode);
+
+						        const presentPincode = $('#pincode').val().trim();
+						        if (presentPincode !=="" && !/^\d{6}$/.test(presentPincode)) {
+						        	$('#pageLoader').hide();
+						            Swal.fire("Invalid Present place Pincode", "Pincode must be 6 digits.", "error");
+						            $('#submitBtn').prop('disabled', false).text('Submit');
+						            return;
+						        }						        
+						        setIfPresent(formData, "present_pincode", presentPincode);
+
+						        // Aadhaar validation
+						        const aadharNo = $('#aadhar_number').val().trim();
+						        if (aadharNo !=="" && !/^\d{12}$/.test(aadharNo)) {
+						        	$('#pageLoader').hide();
+						            Swal.fire("Invalid Aadhaar Number", "Aadhaar number must be 12 digits.", "error");
+						            $('#submitBtn').prop('disabled', false).text('Submit');
+						            return;
+						        }
+						       
+						        setIfPresent(formData, "aadharNo", aadharNo);
+			                				                    
+			                    setIfPresent(formData, "mobile_number", mobileNumber);
+
+			                    // Set other fields
+			                    setIfPresent(formData, "vending_district", $('#vendor_district').val());
+								setIfPresent(formData, "vending_category", $('#businesstype').val());
+								setIfPresent(formData, "vending_space", $('#business_space').val());
+			                    
+			                   
+			                    
+			                    setIfPresent(formData, "name", $('#name').val());
+			                    setIfPresent(formData, "f_h_name", $('#father_name').val());
+			                    setIfPresent(formData, "dob", $('#dob').val());
+			                    			                   
+						        
+						        let genderVal = $("input[name='gender']:checked").val();
+						        setIfPresent(formData, "gender", genderVal);
+						        
+			                	setIfPresent(formData, "social_category", $('#community').val());
+			                	setIfPresent(formData, "education_status", $('#education').val());
+			                	setIfPresent(formData, "marital_status", $('#maritalStatus').val());
+			                	setIfPresent(formData, "no_of_fam_mem", $('#familymembers').val());
+
+			                	setIfPresent(formData, "door_no", $('#doorno').val());
+			                	setIfPresent(formData, "streetname", $('#streetname').val());
+			                	setIfPresent(formData, "areaname", $('#areaname').val());
+			                	setIfPresent(formData, "present_district", $('#district').val());
+			                	
+			                	 //formData.set("street_vendor_photo", $('#profileimage')[0].files[0]);
+			                	setFileIfPresent(formData, "street_vendor_photo", $('#profileimage')[0]);
+								setFileIfPresent(formData, "ration_card_photo", $('#ration_card_photo')[0]);
+								setFileIfPresent(formData, "aadhar_front_photo", $('#aadharfrontimage')[0]);
+								setFileIfPresent(formData, "aadhar_back_photo", $('#aadharbackimage')[0]);
+
+			                    formData.set("userId", userId);
+
+			                    for (let pair of formData.entries()) {
+			                        console.log(pair[0] + ':', pair[1]);
+			                    }
+
+			                    // Final submit
+			                      $.ajax({
+			                        url: '/gcc/api/streetvendor/saveDetails',
+			                        type: 'POST',
+			                        data: formData,
+			                        enctype: 'multipart/form-data',
+			                        processData: false,
+			                        contentType: false,
+			                        success: function (response) {
+			                        	$('#pageLoader').hide();
+			                            if (response.status) {
+			                            	Swal.fire({
+						                        icon: 'success',
+						                        title: 'Details are Saved Successfully',
+						                        html: 'Reference ID: <b>' + response.vendor_req_id + '</b>'
+						                    });
+			                                $('#vendorForm')[0].reset();
+			                            } else {
+			                            	$('#pageLoader').hide();
+			                            	 Swal.fire({
+			 			                        icon: 'error',
+			 			                        title: 'Save Failed',
+			 			                        text: response.description || 'Something went wrong!'
+			 			                    });
+			                            }
+			                            $('#submitBtn').prop('disabled', false).text('Submit');
+			                        },
+			                        error: function () {
+			                        	$('#pageLoader').hide();
+			                        	Swal.fire({
+						                    icon: 'error',
+						                    title: 'Submission Error',
+						                    text: 'Something went wrong while submitting the form.'
+						                });
+			                            $('#submitBtn').prop('disabled', false).text('Submit');
+			                        }
+			                    }); 
+			                    
+			                }
+			            },
+			            error: function () {
+                        	$('#pageLoader').hide();
+                        	Swal.fire({
+			                    icon: 'error',
+			                    title: 'Submission Error',
+			                    text: 'Something went wrong while Checking duplicate.'
+			                });
+                            $('#submitBtn').prop('disabled', false).text('Submit');
+                        }
+			           
+			        });
+			    });
+			});
+
+			// Validation helpers
+			function validatePhoneNumber(input) {
+			    input.value = input.value.replace(/[^0-9]/g, '').slice(0, 10);
+			}
+
+			function validatePincode(input) {
+			    input.value = input.value.replace(/[^0-9]/g, '').slice(0, 6);
+			    //const errorDiv = document.getElementById('pincode_error');
+			    //errorDiv.style.display = (input.value.length > 0 && input.value.length < 6) ? 'block' : 'none';
+			}
+
+			function validateAadhar(input) {
+			    input.value = input.value.replace(/[^0-9]/g, '').slice(0, 12);
+			}
+
+			// DOB max date
+			document.addEventListener("DOMContentLoaded", function () {
+			    const dobInput = document.getElementById("dob");
+			    const today = new Date().toISOString().split("T")[0];
+			    dobInput.setAttribute("max", today);
+			    dobInput.addEventListener("focus", function () {
+			        if (typeof dobInput.showPicker === "function") {
+			            dobInput.showPicker();
+			        }
+			    });
+			});
+			
+	
+	</script>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/vendors/streetVendorRequestList.html b/src/main/resources/templates/modules/vendors/streetVendorRequestList.html
new file mode 100644
index 0000000..175472e
--- /dev/null
+++ b/src/main/resources/templates/modules/vendors/streetVendorRequestList.html
@@ -0,0 +1,1520 @@
+<!DOCTYPE html>
+
+<html xmlns:th="http://www.thymeleaf.org">
+<head th:replace="~{fragments/modules/base/head :: head}"></head>
+<style>
+.required{
+	color: red;
+}
+/* Mobile screens - targeting devices with a max width of 767px */
+@media (max-width: 767px) 
+{
+	#requestlistform label{
+		margin-top: 10px;
+	} 
+}
+
+    #viewModal .modal-body {
+        max-height: 70vh;  /* Limit the height to 70% of the viewport */
+        overflow-y: auto;  /* Enable vertical scrolling */
+    }
+    
+    .custom-doc-btn {
+  height: 20px;
+  width: 80px;
+  font-size: 9px;
+  font-weight:bold;
+  text-align: center;
+  padding: 0px;
+  border:1px solid grey;
+}
+
+.col-md-3{
+padding-bottom: 10px; 
+}
+
+.comment {
+        margin-bottom: 20px;
+    }
+
+    .comment p {
+        margin: 0;
+    }
+
+    hr {
+        border: 1px solid #ccc;
+    }
+
+    .comment {
+        padding: 10px 0;
+    }
+
+    .comment .text-muted {
+        font-size: 0.9em;
+        color: #6c757d;
+    }
+
+    .comment hr {
+        border-top: 1px solid #ccc;
+    }
+    
+        #EditModal .modal-body {
+        max-height: 80vh;  
+        overflow-y: auto;  
+    }
+    
+    
+    card-block {
+    padding: 20px;
+}
+
+.form-label {
+    margin-bottom: 0.5rem;
+}
+
+input.form-control {
+    padding: 10px;
+}
+.form-select {
+    padding: 10px;
+    height: 40px;
+}
+
+/*css for map in step2*/
+		#googleMap {
+			height: 300px;
+			width: 100%;
+			position: relative;
+			overflow: hidden;
+			max-width: 100%;
+		}
+		
+		#pac-input {
+		    position: absolute;
+		    top: 10px;
+		    left: 50%;
+		    transform: translateX(-50%);
+		    width: 300px;
+		    z-index: 5;
+		    padding: 10px;
+		    border: 1px solid #ccc;
+		    background-color: white;
+		    border-radius: 4px;
+		  }
+
+		#search-container {
+			position: absolute;
+			top: 10px;
+			left: 50%;
+			transform: translateX(-50%);
+			z-index: 1000;
+			width: 500px;
+			box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.3);
+			background-color: white;
+			border-radius: 4px;
+			padding: 0;
+			/* Removed extra padding to match the input width */
+		}
+
+		#search-box {
+			width: 100%;
+			/* Ensures the input takes up the entire width of the container */
+			padding: 5px;
+			font-size: 16px;
+			border: 1px solid #ccc;
+			border-radius: 4px;
+			/* Rounded corners matching the container */
+			box-sizing: border-box;
+			/* Makes sure padding is considered in width */
+		}
+
+		#suggestions {
+			border: 1px solid #ccc;
+			border-radius: 4px;
+			max-height: 200px;
+			overflow-y: auto;
+			margin-top: 5px;
+			background-color: white;
+			display: none;
+			width: 100%;
+			/* Matches the width of the container and input */
+			box-sizing: border-box;
+			/* Ensures the width includes borders and padding */
+		}
+		.pac-container {
+    z-index: 2000 !important; /* higher than modal's z-index */
+}
+
+		#suggestions ul {
+			list-style: none;
+			padding: 0;
+			margin: 0;
+		}
+
+		#suggestions ul li {
+			padding: 5px;
+			cursor: pointer;
+		}
+
+		#suggestions ul li:hover {
+			background-color: #f0f0f0;
+		}
+</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>Street Vendor Req List</h5>
+										<span>Vending Committe</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">Vending Committe</li>
+										<li class="breadcrumb-item active" aria-current="page">Street Vendor Req List</li>
+									</ol>
+								</nav>
+							</div>
+						</div>
+					</div>
+					
+					<div class="row">
+					
+						
+						<div class="col-md-12" >
+						    <div class="card">
+						        <div class="card-block">
+						        
+						        <!-- <div class="form-group col-sm-12">
+							        <label for="dropdownevent">Select Event
+							        <span class="text-danger">*</span></label>
+							        <select id="dropdownevent" class="form-control">							          
+							        </select>
+							    </div>	 -->
+						        
+						        
+						        <div class="page-header-title" >
+									<h5 style="margin: 0;font-weight: bold;">Request List (Web)- Created by Login ID: <span th:text="${LoginUserId}" id="userIdSpan"></span></h5><hr>
+							   </div> 
+						        
+						            <div>
+						                <table id="RequestListDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid">
+						                    <thead class="thead-dark">
+						                        <tr role="row">
+						                            <th class="text-center">S.No</th>                                                  
+						                            <th class="text-center">Request No</th>
+						                            <th class="text-center">Name</th>
+						                            <th class="text-center">Mobile</th>
+						                            <th class="text-center">Address</th>
+						                            <th class="text-center">Postal Code</th>                                                                                               
+						                            <th class="text-center no-sort">Action</th> 
+						                        </tr>
+						                    </thead>
+						                    <tbody>
+						                        
+						                    </tbody>
+						                    <tfoot class="thead-dark">
+						                        <tr>
+						                            <th class="text-center">S.No</th>                                                  
+						                            <th class="text-center">Request No</th>
+						                            <th class="text-center">Name</th>
+						                            <th class="text-center">Mobile</th>
+						                            <th class="text-center">Address</th>
+						                            <th class="text-center">Postal Code</th> 
+						                            <th class="text-center no-sort">Action</th>                            
+						                        </tr>
+						                    </tfoot>
+						                </table>
+						            </div>
+						        </div>
+						    </div>
+						</div>
+
+
+
+
+
+						
+                      </div>
+                        
+                        
+                     </div>
+                </div>
+                
+                
+                <!-- Modal -->
+				<div class="modal fade" id="viewModal" tabindex="-1" aria-labelledby="viewModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
+				  <div class="modal-dialog modal-lg">
+				    <div class="modal-content">
+				      <div class="modal-header">
+				        <h5 class="modal-title" id="viewModalLabel">Request Details</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" id="modalBodyContent">
+				        <!-- Dynamic content loads here -->
+				      </div>
+				      <div class="modal-footer">
+				        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+				      </div>
+				    </div>
+				  </div>
+				</div>
+
+
+				<!-- Image Modal -->
+                <div class="modal fade" id="docModal" tabindex="-1" aria-hidden="true">
+				  <div class="modal-dialog modal-dialog-scrollable modal-lg">
+				    <div class="modal-content border-0">
+				      <div class="modal-body p-0 text-center" style="background-color: #f8f9fa;">
+				        <div id="docContainer" style="max-height: 90vh; overflow: auto;"></div>
+				      </div>
+				    </div>
+				  </div>
+				</div>
+				
+				
+				<!-- Edit Modal -->
+				<div class="modal fade" id="EditModal" tabindex="-1" aria-labelledby="EditModalLabel" aria-hidden="true">
+	    			<div class="modal-dialog modal-xl">
+	        			<div class="modal-content">
+	            			<div class="modal-header">
+	                			<h5 class="modal-title"><span id="vendor_req_id"></span> - Edit Details</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">
+	                			<!-- <span th:text="${LoginUserId}" style="display:none;" id="userIdSpan"></span> -->
+	                			
+	                			 <div id="raw_bank_passbook" style="display: none;"></div>
+							     <div id="raw_street_vendor_photo" style="display: none;"></div>
+							     <div id="raw_aadhar_front_photo" style="display: none;"></div>
+							     <div id="raw_aadhar_back_photo" style="display: none;"></div>
+							     <div id="raw_ration_card_photo" style="display: none;"></div>
+	                			
+	                			<form id="vendorForm" enctype="multipart/form-data" >
+	                			<div class="section-header">				    
+				      				<h5>Business Details | வியாபார விவரங்கள்</h5>
+				      			</div>
+				      			
+				      			<div id="mapContainer" style="position: relative; height: 500px;">
+								  	<input id="pac-input" class="controls" type="text" placeholder="Search location">
+								  	<div id="googleMap" style="height: 90%; width: 100%;"></div>
+								</div>
+								<div id="search-container">
+									<!-- <input type="text" id="search-box" placeholder="Search for a location..."> -->
+									<div id="suggestions"></div>
+								</div>
+								
+								<div class="row mb-3">
+								
+									<div class="col-md-6">									
+										<label for="latitude_field">Latitude</label>
+										<input type="text" class="form-control" id="latitude_field" name="latitude_field"  readonly >
+									</div>
+							   		<div class="col-md-6">									
+										<label for="longitude_field">Longitude</label>
+										<input type="text" class="form-control" id="longitude_field" name="longitude_field"  readonly >
+									</div>
+								
+								</div>
+								
+								<div class="row mb-3">
+									<div class="col-md-6">									
+										<label for="zone">Zone</label>					        
+						        		<input type="text" class="form-control" id="zone" name="zone"  readonly>
+					        		</div>
+					        
+							        <div class="col-md-6">
+								        <label for="ward">Ward</label>
+										<input type="text" class="form-control" id="ward" name="ward" readonly>
+							        </div>
+								</div>
+								
+								<div class="mb-3">
+					        <label class="form-label">Landmark (maximum 255 characters)</label>
+					        <textarea class="form-control" id="landmark" name="landmark" maxlength="255"></textarea>
+					      </div>
+					      <div class="row mb-3">
+					        <div class="col-md-6">
+					          <label class="form-label">District | மாவட்டம்</label>
+					          <input type="text" class="form-control" id="vendor_district" name="vendor_district" oninput="this.value = this.value.replace(/[^a-zA-Z\s]/g, '')" >
+					        </div>
+					        <div class="col-md-6">
+					          <label class="form-label">Pincode | அஞ்சல் குறியீடு</label>
+					          <input type="text" class="form-control" id="vendor_pincode" name="vendor_pincode" oninput="validatePincode(this)" >
+					         		 
+					        </div>
+					      </div>
+					
+					      <div class="row mb-3">
+					      
+					      <div class="col-md-6">
+								<label for="businesstype" class="form-label">Type of Business | வியாபார வகை <span class="text-danger">*</span>
+								</label> 
+									<select id="businesstype" name="businesstype" class="form-control"  required>
+								  <option value="">-- Select Business Type --</option>
+								  <th:block th:each="vendingCategory : ${vendingCategories}">
+								    <option th:value="${vendingCategory.id}" th:text="${vendingCategory.vending_category_name}"></option>
+								  </th:block>
+								</select>
+								
+							</div>
+					        
+					          
+					        <div class="col-md-6">
+					          <label class="form-label">Business Space (Sq ft)| வியாபார இடம் </label>
+					          <input type="text" class="form-control" id="business_space" name="business_space">
+					        </div>
+					      </div>
+					
+					      <div class="row mb-3">
+					        <div class="col-md-6">
+					          <label class="form-label">Did you get SVANIDHI loan? | ஸ்வநிதி கடன் வாங்கினீங்களா? </label><br>
+					          <input type="radio" name="svanidhi" value="Yes" > Yes
+					          <input type="radio" name="svanidhi" value="No" class="ms-3"> No
+					        </div>
+					        <div class="col-md-6">
+					          <label class="form-label">Do you have a Bank Account? | வங்கி கணக்கு உள்ளதா? </label><br>
+					          <input type="radio" name="bank_account" value="Yes" > Yes
+					          <input type="radio" name="bank_account" value="No" class="ms-3"> No
+					        </div>
+					        
+					        
+					        <div class="col-md-6" id="bank_passbook_container" style="display:none;">
+							    <label for="bank_passbook" class="form-label">Upload Bank Passbook (jpg/jpeg/pdf)
+							   </label>
+							    <input type="file" class="form-control" id="bank_passbook" name="bank_passbook" accept=".jpg,.jpeg,.pdf,application/pdf" >
+							     <div id="bank_passbookpreview" class="mt-2" style="display: none;"></div>
+							</div>
+												        
+					      </div>
+					
+					      <!-- Personal Details -->
+					      <div class="section-header">
+					      <h5>தனிப்பட்ட விவரங்கள் | Personal Details</h5>
+					      </div>
+					      
+					      <div class="row mb-3">
+					      <div class="col-md-6">
+					          <label class="form-label">Profile Image (jpg/jpeg/pdf)</label>
+					          <input type="file" class="form-control" id="profileimage"
+														accept=".jpg,.jpeg,.pdf,application/pdf" name="profileimage" >
+							 <div id="profilepreview" class="mt-2" style="display: none;"></div>
+					        </div>
+					        </div>
+					      <div class="row mb-3">
+					        <div class="col-md-6">
+					          <label class="form-label"> Name | பெயர் <span class="required">*</span></label>
+					          <input type="text" class="form-control" id="name" name="name" oninput="this.value = this.value.replace(/[^a-zA-Z\s]/g, '')" required>
+					        </div>
+					        <div class="col-md-6">
+					          <label class="form-label">Father's / Husband's Name | தந்தை/கணவர் பெயர் </label>
+					          <input type="text" class="form-control" id="father_name" name="father_name" oninput="this.value = this.value.replace(/[^a-zA-Z\s]/g, '')" >
+					        </div>
+					      </div>
+					
+					      <div class="row mb-3">
+					        <div class="col-md-6">
+					          <label class="form-label">Mobile Number | மொபைல் எண் <span class="required">*</span></label>
+					          <input type="text" class="form-control" id="mobile_no" name="mobile_no" oninput="validatePhoneNumber(this)" required readonly="readonly">
+					        </div>
+					        <div class="col-md-6">
+					          <label class="form-label">Gender | பாலினம் </label><br>
+					          <input type="radio" name="gender" value="Male" > Male
+					          <input type="radio" name="gender" value="Female" class="ms-3"> Female
+					          <input type="radio" name="gender" value="Transgender" class="ms-3">Transgender
+					        </div>
+					      </div>
+					
+					      
+					      <div class="row mb-3">
+					        <div class="col-md-6">
+					          <label class="form-label">Date of Birth | பிறந்த தேதி </label>
+					          <input type="date" id="dob" class="form-control" name="dob" >
+					        </div>
+					        <div class="col-md-6">
+					          <label class="form-label">Community Category | சமூக வகை </label>
+					          <select class="form-control" id="community" name="community" >
+								    <option value="">-- Select Community --</option>
+								    <th:block th:each="com : ${communities}">
+								        <option th:value="${com.id}" th:text="${com.category_name}"></option>
+								    </th:block>
+								</select>
+					        </div>
+					      </div>
+					
+					      <div class="row mb-3">
+					        <div class="col-md-6">
+					          <label class="form-label">Differently Abled | இயலாமை உள்ளவரா? </label><br>
+					          <input type="radio" name="differently_abled" value="Yes" > Yes
+					          <input type="radio" name="differently_abled" value="No" class="ms-3"> No
+					        </div>
+					        
+					        
+					        
+					        <div class="col-md-6">
+					          <label class="form-label">Street Vendor’s educational status  | தெருவணிகரின் கல்வித்தகுதி </label>
+					          <select class="form-control"  id="education" name="education" >
+							    <option value="">-- Select Education Status--</option>
+							    <th:block th:each="edu : ${educationList}">
+							        <option th:value="${edu.id}" th:text="${edu.education}"></option>
+							    </th:block>
+							</select>
+					        </div>
+					      </div>
+					
+					
+					      <div class="row mb-3">
+					        <div class="col-md-6">
+					          <label for="maritalstatus" class="form-label"> Marital Status | திருமண நிலை </label>
+					          <select class="form-control" id="maritalStatus" name="maritalStatus" >
+							    <option value="">-- Select Marital Status --</option>
+							    <th:block th:each="status : ${maritalStatuses}">
+							        <option th:value="${status.id}" th:text="${status.marital_status}"></option>
+							    </th:block>
+							</select>
+					        </div>
+					        <div class="col-md-6">
+					          <label for="familymembers" class="form-label">Number of Family Members | குடும்ப உறுப்பினர்கள் எண்ணிக்கை </label>
+					          <input type="number" class="form-control" name="familymembers" id="familymembers">
+					        </div>
+					      </div>
+					
+					      <div class="mb-3">
+					        <label class="form-label">Are any of your family member involved in street vending | உங்கள் குடும்ப உறுப்பினர் வியாபாரத்தில் உள்ளவரா? </label><br>
+					        <input type="radio" name="fam_vendor" value="Yes" > Yes
+					        <input type="radio" name="fam_vendor" value="No" class="ms-3"> No
+					      </div>
+					
+					      <!-- Address -->
+					      <div class="section-header">
+					      <h5>Residential Address | வீட்டு முகவரி </h5>
+					      </div>
+					      <div class="row mb-3">
+					        <div class="col-md-6">
+					          <label class="form-label">Door No | கதவு எண் </label>
+					          <input type="text" class="form-control" name="doorno" id="doorno" >
+					        </div>
+					        <div class="col-md-6">
+					          <label class="form-label">Street Name | தெரு பெயர் </label>
+					          <input type="text" class="form-control" name="streetname" id="streetname" >
+					        </div>
+					      </div>
+					      <div class="row mb-3">
+					        <div class="col-md-6">
+					          <label class="form-label">Area Name | பகுதி பெயர் </label>
+					          <input type="text" class="form-control" name="areaname" id="areaname" >
+					        </div>
+					        <div class="col-md-6">
+					          <label class="form-label">District | மாவட்டம் </label>
+					          <input type="text" class="form-control" name="district" id="district" oninput="this.value = this.value.replace(/[^a-zA-Z\s]/g, '')" >
+					        </div>
+					      </div>
+					      
+					      <div class="row mb-3">
+					      <div class="col-md-6">
+					        <label class="form-label">Pincode | அஞ்சல் குறியீடு </label>
+					        <input type="text" class="form-control" name="pincode" id="pincode" oninput="validatePincode(this)" >
+					      </div>
+					      
+					      
+					      <div class="col-md-6">
+							  <label class="form-label">Aadhaar Number | ஆதார் எண் </label>
+							  <input type="text" class="form-control" id="aadhar_number" name="aadhar_number" maxlength="12" oninput="validateAadhar(this)" >
+							</div>
+					      
+					      </div>
+					
+					      <!-- Document Uploads -->
+					     <div class="section-header">
+					     <h5>ஆவணங்கள் | Document Uploads</h5>
+					     </div>
+					      <div class="row mb-3">
+					        <div class="col-md-6">
+					          <label class="form-label">Aadhaar Front Image | ஆதார் முன்னணி படத்தை பதிவேற்றவும் (jpg/jpeg/pdf)</label>
+					          <input type="file" class="form-control" id="aadharfrontimage"
+														accept=".jpg,.jpeg,.pdf,application/pdf" name="aadharfrontimage" >
+								
+							  <div id="aadharfrontimagepreview" class="mt-2" style="display: none;"></div>
+														
+					        </div>
+					        <div class="col-md-6">
+					          <label class="form-label">Aadhaar Back Image | ஆதார் பின்னணி படத்தை பதிவேற்றவும் (jpg/jpeg/pdf)</label>
+					          <input type="file" class="form-control" id="aadharbackimage"
+															accept=".jpg,.jpeg,.pdf,application/pdf" name="aadharbackimage" >
+															
+								<div id="aadharbackimagepreview" class="mt-2" style="display: none;"></div>
+					        </div>
+					      </div>
+					      <div class="row mb-3">
+					      <div class="col-md-6">
+					        <label class="form-label">Take Ration Card Front Image | ரேஷன் கார்டு முன்னணி படத்தை பதிவேற்றவும் (jpg/jpeg/pdf)</label>
+					        <input type="file" class="form-control" id="ration_card_photo"
+															accept=".jpg,.jpeg,.pdf,application/pdf" name="ration_card_photo" >
+															
+							<div id="ration_card_preview" class="mt-2" style="display: none;"></div>								
+					      </div>
+					 </div>
+				      <!-- Submit -->
+				      <div class="text-center mt-4">
+								<button type="submit" class="btn btn-primary" name="submitBtn" id="submitBtn">Update</button>
+								
+						</div>
+	                			
+	                			</form>
+
+				            </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>
+               
+                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
+				</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://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
+                  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
+        
+        <script sync defer
+		src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCi7N6uW5MZaSkd50Kzw7ax2GkMN1vjE-E&callback=myMap&libraries=places">
+		</script>
+            <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+        
+        
+        <script type="text/javascript">
+        
+    
+        function myMap(latFromDb, lngFromDb) {
+            // Use vendor lat/lng if available, else fallback
+            const defaultCenter = (latFromDb && lngFromDb) 
+                ? { lat: parseFloat(latFromDb), lng: parseFloat(lngFromDb) }
+                : { lat: 13.0827, lng: 80.2707 };
+      		const map = new google.maps.Map(document.getElementById("googleMap"), {
+      			center: defaultCenter,
+      			zoom: 14
+      		});
+
+      		let marker = null;
+      		let streetsList = []; // ✅ Define globally inside myMap
+      		const infowindow = new google.maps.InfoWindow();
+
+      		// 🔍 Initialize the SearchBox
+      		let input = document.getElementById('pac-input');
+      		let searchBox = new google.maps.places.SearchBox(input);
+      		//map.controls[google.maps.ControlPosition.TOP_LEFT].push(input);
+
+      		map.addListener('bounds_changed', function () {
+      			searchBox.setBounds(map.getBounds());
+      		});
+
+      		searchBox.addListener('places_changed', function () {
+      			const places = searchBox.getPlaces();
+      			if (places.length === 0) return;
+
+      			if (marker) marker.setMap(null);
+      			const place = places[0];
+      			if (!place.geometry) return;
+
+      			marker = new google.maps.Marker({
+      				map: map,
+      				position: place.geometry.location
+      			});
+
+      			const lat = place.geometry.location.lat().toFixed(6);
+      			const lng = place.geometry.location.lng().toFixed(6);
+      			document.getElementById("latitude_field").value = lat;
+      			document.getElementById("longitude_field").value = lng;
+
+      			map.setCenter(place.geometry.location);
+      			map.setZoom(15);
+
+      			infowindow.setContent(`Latitude: ${lat}<br>Longitude: ${lng}`);
+      			infowindow.open(map, marker);
+
+      			fetchStreets(lat, lng);
+      		});
+
+      		map.addListener("click", function (event) {
+      			const clickedLatLng = event.latLng;
+      			if (marker) marker.setMap(null);
+
+      			marker = new google.maps.Marker({
+      				position: clickedLatLng,
+      				map: map
+      			});
+
+      			const lat = clickedLatLng.lat().toFixed(6);
+      			const lng = clickedLatLng.lng().toFixed(6);
+
+      			document.getElementById("latitude_field").value = lat;
+      			document.getElementById("longitude_field").value = lng;
+
+      			infowindow.setContent(`Latitude: ${lat}<br>Longitude: ${lng}`);
+      			infowindow.open(map, marker);
+
+      			fetchStreets(lat, lng);
+      		});
+      		
+      		function fetchStreets(lat, lng) {
+      			const encodedGeometry = encodeURIComponent(JSON.stringify({ y: lat, x: lng }));
+      		    //const url = `https://gisgcc.chennaicorporation.gov.in/server/rest/services/GCCDepts/EDPMobile2025/
+      		    //FeatureServer/2/query?where=&objectIds=&time=&geometry={encodedGeometry}&geometryType=esriGeometryPoint&inSR=4326&defaultSR=4326&spatialRel=esriSpatialRelIntersects&distance=1&units=esriSRUnit_Meter&outFields=zone,ward&returnGeometry=false&f=geojson`;
+      		    
+      			const url=`https://gisgcc.chennaicorporation.gov.in/server/rest/services/GCCDepts/EDPMobile2025/FeatureServer/2/query?` +
+      				`where=&objectIds=&time=&geometry=${encodedGeometry}` + 
+      				`&geometryType=esriGeometryPoint&inSR=4326&defaultSR=4326&spatialRel=esriSpatialRelIntersects&distance=1` +
+      				`&units=esriSRUnit_Meter&relationParam=&outFields=zone,ward` +
+      				`&returnGeometry=false&maxAllowableOffset=&geometryPrecision=&outSR=&havingClause=&gdbVersion=&historicMoment=` +
+      				`&returnDistinctValues=false&returnIdsOnly=false&returnCountOnly=false&returnExtentOnly=false&orderByFields=` +
+      				`&groupByFieldsForStatistics=&outStatistics=&returnZ=false&returnM=false&multipatchOption=xyFootprint&resultOffset=` +
+      				`&resultRecordCount=&returnTrueCurves=false&returnExceededLimitFeatures=false&quantizationParameters=&returnCentroid=false` +
+      				`&timeReferenceUnknownClient=false&maxRecordCountFactor=&sqlFormat=none&resultType=&featureEncoding=esriDefault` +
+      				`&datumTransformation=&f=geojson`;
+      		    fetch(url)
+      		        .then(response => {
+      		            if (!response.ok) {
+      		                throw new Error(`HTTP error! Status: ${response.status}`);
+      		            }
+      		            return response.json();
+      		        })
+      		        .then(data => {
+      		        	
+      		        	console.log("GIS API Response:", data);
+
+      		            const features = data.features;
+      		            if (features.length > 0) {
+      		                const props = features[0].properties;
+      		                const zone = props.zone;
+      		                const ward = props.ward;
+
+      		                console.log("Zone:", zone, "Ward:", ward);
+      		                // 👉 You can update form fields or DOM elements here
+      		                document.getElementById("zone").value = zone;
+      		                document.getElementById("ward").value = ward;
+      		            } else {
+      		                console.warn("No zone/ward found for this location.");
+      		                document.getElementById("zone").value = '';
+      		                document.getElementById("ward").value = '';
+      		            }
+      		        })
+      		        .catch(error => {
+      		            console.error("Error fetching zone/ward:", error);
+      		        });
+      		}
+      	}
+    	  
+    	  // GLOBAL scope — must be outside any other function
+    	  function openDocModal(fileUrl) {
+    	      const container = document.getElementById('docContainer');
+    	      const ext = fileUrl.split('.').pop().toLowerCase();
+
+    	      if (ext === 'pdf') {
+    	          container.innerHTML = `<iframe src="${fileUrl}" style="width:100%; height:90vh;" frameborder="0"></iframe>`;
+    	      } else {
+    	          container.innerHTML = `<img src="${fileUrl}" class="img-fluid" style="max-height:90vh; max-width:100%;" onerror="No image">`;
+    	      }
+
+    	      $('#docModal').modal('show');
+    	  }
+        
+        $(document).ready(function() {
+
+        	var table = $('#RequestListDatatable').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',               
+                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: false,
+                select: false,
+                processing: false
+            
+
+            });
+        	
+        	let userId = document.getElementById('userIdSpan').textContent;
+        	         
+            fetchVendingCommitteeList(userId);
+        
+            
+            $("input[name='bank_account']").change(function () {
+		        if ($(this).val() === "Yes") {
+		            $("#bank_passbook_container").show();
+		        } else {
+		            $("#bank_passbook_container").hide();
+		            $("#bank_passbook").val("");
+		        }
+		    });
+         
+        });
+        
+     // Validation helpers
+		function validatePhoneNumber(input) {
+		    input.value = input.value.replace(/[^0-9]/g, '').slice(0, 10);
+		}
+
+		function validatePincode(input) {
+		    input.value = input.value.replace(/[^0-9]/g, '').slice(0, 6);
+		    
+		}
+
+		function validateAadhar(input) {
+		    input.value = input.value.replace(/[^0-9]/g, '').slice(0, 12);
+		}
+
+		// DOB max date
+		document.addEventListener("DOMContentLoaded", function () {
+		    const dobInput = document.getElementById("dob");
+		    const today = new Date().toISOString().split("T")[0];
+		    dobInput.setAttribute("max", today);
+		    dobInput.addEventListener("focus", function () {
+		        if (typeof dobInput.showPicker === "function") {
+		            dobInput.showPicker();
+		        }
+		    });
+		});
+        
+        function fetchVendingCommitteeList(userId) {
+        	$('#pageLoader').show();
+            $.ajax({
+                url: '/gcc/api/streetvendor/vendingDetailsWeb',
+                method: 'GET',
+                data:{cby:userId},
+                contentType: 'application/json',
+                success: function (data) {
+                	$('#pageLoader').hide();
+                    let tableContainer = $('#RequestListDatatable');
+
+                    // Destroy any existing DataTable instance
+                    if ($.fn.DataTable.isDataTable(tableContainer)) {
+                        tableContainer.DataTable().destroy();
+                    }
+
+                    // Check for empty list
+                    if (!data || data.length === 0) {
+                        tableContainer.find('tbody').html(`
+                            <tr>
+                                <td colspan="7" class="text-center text-danger">No Data Available</td>
+                            </tr>
+                        `);
+                        return;
+                    }
+
+                    // Initialize DataTable
+                    tableContainer.DataTable({
+                        destroy: true,
+                        searching: true,
+                        autoWidth: false,
+                        paging: true,
+                        info: true,
+                        data: data,
+                        columns: [
+                            {
+                                data: null,
+                                render: (data, type, row, meta) => meta.row + 1,
+                                className: 'text-center'
+                            },
+                            { data: 'vendor_req_id', defaultContent: '-', className: 'text-center' },
+                            { data: 'name', defaultContent: '-', className: 'text-center' },
+                            { data: 'mob_no', defaultContent: '-', className: 'text-center' },
+                            { data: 'present_address', defaultContent: '-', className: 'text-center' },
+                            { data: 'present_pincode', defaultContent: '-', className: 'text-center' },                               
+                            /* {
+                                data: 'vendor_req_id',
+                                render: function (data, type, row) {
+                                    return `<button class="btn btn-primary btn-sm btn-view" data-id="${data}">View</button>`;
+                                },
+                                className: 'text-center'
+                            } */
+                            {
+                                data: 'vendor_req_id',
+                                render: function (data, type, row) {
+                                    let viewBtn = `<button class="btn btn-primary btn-sm btn-view" data-id="${data}">View</button>`;
+                                    let editBtn = "";
+
+                                    // check editable flag from row
+                                    if (row.editable === true) {
+                                        editBtn = ` <button class="btn btn-success btn-sm btn-edit" data-id="${data}">Edit</button>`;
+                                    }
+
+                                    return viewBtn + editBtn; // concatenate buttons
+                                },
+                                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: false
+                    });
+                    
+                    tableContainer.on('click', '.btn-edit', function () {
+                    	//$('#EditModal').modal('show');
+                    	 let id = $(this).data('id');                      
+                        $.ajax({
+                            url: `/gcc/api/streetvendor/webVendorDetailsByReqId?requestId=${id}`,
+                            method: 'GET',
+                            success: function (response) {
+                            	DisplayInModal(response)
+                            },
+                            error: function (xhr) {
+                                console.error("Error fetching detail:", xhr.responseText);
+                                alert("Failed to fetch vendor details.");
+                            }
+                        });
+                    });
+                    
+                    
+                 // Bind view buttons
+                    tableContainer.on('click', '.btn-view', function () {
+                        let id = $(this).data('id');                      
+                        $.ajax({
+                            url: `/gcc/api/streetvendor/webVendorDetailsByReqId?requestId=${id}`,
+                            method: 'GET',
+                            success: function (detailData) {
+                                if (detailData.length === 0) {
+                                    $('#modalBodyContent').html("<p>No data found for this request.</p>");
+                                    $('#viewModal').modal('show');
+                                    return;
+                                }
+
+                                const details = detailData[0];
+                                const diffAbledDisplay = details.diff_abled === true ? 'Yes' : (details.diff_abled === false ? 'No' : '-');
+                                const pmLoanDisplay = details.pm_svanidhi_loan ? (details.pm_svanidhi_loan ? 'Yes' : 'No') : '-';
+                                const bankAccDisplay = details.bank_acc_status ? (details.bank_acc_status === '1' ? 'Yes' : 'No') : '-';
+                                const idCardDisplay= details.vendor_id_card ? (details.vendor_id_card ==='1' ? 'Yes' : 'No') : '-';
+                                const bankPassbookDisplay = details.bank_acc_status === '1' && details.view_bank_passbook
+                                ? `<img src="${details.view_bank_passbook}" alt="Bank Passbook" class="img-fluid" style="max-width: 150px;" onerror="this.src='/default.jpg'">`
+                                : '-';
+                                
+                                const aadharFrontBtn = details.view_aadhar_front_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.view_aadhar_front_photo}')">View</button>` : '-';
+                                const rationCardBtn = details.view_ration_card_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.view_ration_card_photo}')">View</button>` : '-';
+                                const aadharBackBtn = details.view_aadhar_back_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.view_aadhar_back_photo}')">View</button>` : '-';
+                                const bankPassbookBtn = details.bank_acc_status === '1' && details.view_bank_passbook
+                                    ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.view_bank_passbook}')">View</button>`
+                                    : '-';
+                                    
+                                const vendorPhotoBtn= details.view_street_vendor_photo ? `<button class="btn btn-sm btn-light custom-doc-btn" onclick="openDocModal('${details.view_street_vendor_photo}')">View</button>` : '-';
+                                
+                                const content = `
+                                    <div class="container-fluid">
+                                        <!-- Personal Details -->
+                                        <div class="card mb-3">
+                                            <div class="card-header bg-primary text-white">Personal Details</div>
+                                            <div class="card-body row">
+                                            <div class="col-md-3"><strong>Name:</strong></div>
+                                            <div class="col-md-3">${details.name || '-'}</div>
+                                            <div class="col-md-3"><strong>Father/Husband Name:</strong></div>
+                                            <div class="col-md-3">${details.f_h_name || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Mobile:</strong></div>
+                                            <div class="col-md-3">${details.mob_no || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Community Category:</strong></div>
+                                            <div class="col-md-3">${details.category_name || '-'}</div>
+
+                                            <div class="col-md-3"><strong>DOB:</strong></div>
+                                            <div class="col-md-3">${details.dob || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Address:</strong></div>
+                                            <div class="col-md-3">${details.residental_address || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Gender:</strong></div>
+                                            <div class="col-md-3">${details.gender || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Pincode:</strong></div>
+                                            <div class="col-md-3">${details.present_pincode || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Differently Abled:</strong></div>
+                                            <div class="col-md-3">${diffAbledDisplay || '-'}</div>
+                                            
+                                            <div class="col-md-3"><strong>Vendor Image:</strong></div>
+                                            <div class="col-md-3">${vendorPhotoBtn || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Aadhaar front Image:</strong></div>
+                                            <div class="col-md-3">${aadharFrontBtn}</div>
+
+                                            <div class="col-md-3"><strong>Ration card Image:</strong></div>
+                                            <div class="col-md-3">${rationCardBtn}</div>
+
+                                            <div class="col-md-3"><strong>Aadhaar back Image:</strong></div>
+                                            <div class="col-md-3">${aadharBackBtn}</div>
+                                            </div>
+                                        </div>
+
+                                        <!-- Business Details -->
+                                        <div class="card mb-3">
+                                            <div class="card-header bg-success text-white">Business Details</div>
+                                            <div class="card-body row">
+                                            <div class="col-md-3"><strong>Type of Business:</strong></div>
+                                            <div class="col-md-3">${details.vending_category_name || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Zone:</strong></div>
+                                            <div class="col-md-3">${details.zone || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Business Space (sq.ft):</strong></div>
+                                            <div class="col-md-3">${details.vending_space || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Ward:</strong></div>
+                                            <div class="col-md-3">${details.ward || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Address:</strong></div>
+                                            <div class="col-md-3">${details.business_address || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Pincode:</strong></div>
+                                            <div class="col-md-3">${details.vending_pincode || '-'}</div>
+
+                                            <div class="col-md-3"><strong>PM SVANidhi Loan Availed:</strong></div>
+                                            <div class="col-md-3">${pmLoanDisplay || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Do you Have Bank Account?:</strong></div>
+                                            <div class="col-md-3">${bankAccDisplay || '-'}</div>
+
+                                            <div class="col-md-3"><strong>Bank Passbook Image:</strong></div>
+                                            <div class="col-md-3">${bankPassbookBtn}</div>
+
+                                            </div>
+                                        </div>
+                                                                                                                  
+                                        </div>
+                                    </div>
+                                `;                                                           
+                                
+                                $('#modalBodyContent').html(content);
+                                $('#viewModalLabel').text(`Vendor Details - ${id}`);
+                                $('#viewModal').modal('show');
+                            },
+                            error: function (xhr) {
+                                console.error("Error fetching detail:", xhr.responseText);
+                                alert("Failed to fetch vendor details.");
+                            }
+                        });
+                    });
+                   
+                },
+
+                error: function (xhr, status, error) {
+                	$('#pageLoader').hide();
+                    console.error("Error fetching data:", error);
+                    alert("Failed to load vendor list.");
+                }
+            });
+        }
+        
+        
+        
+        function DisplayInModal(responseData){
+        	
+        	// clear previous search box value
+            $('#pac-input').val('');
+            
+    		
+        	$('#EditModal').modal('show');
+        	 let data = responseData[0];
+        	 
+        	 $("#latitude_field").val(data.latitude);
+        	 $("#longitude_field").val(data.longitude);
+        	 $('#EditModal').on('shown.bs.modal', function () {
+        	        myMap(data.latitude, data.longitude);
+        	    });
+        	 $("#zone").val(data.zone);
+        	 $("#ward").val(data.ward);
+        	 $("#landmark").val(data.vending_address);
+        	 $("#vendor_district").val(data.vending_district);
+        	 $("#vendor_pincode").val(data.vending_pincode);
+        	 $("#businesstype").val(data.vending_category);
+        	 $("#business_space").val(data.vending_space);
+        	 if (data.pm_svanidhi_loan == null) {
+        		    $("input[name='svanidhi']").prop("checked", false); // clear both
+        		} else {
+        		    $("input[name='svanidhi'][value='" + (data.pm_svanidhi_loan ? "Yes" : "No") + "']")
+        		        .prop("checked", true);
+        		}
+
+        	 if (data.pm_svanidhi_loan == null) {
+        		    $("input[name='svanidhi']").prop("checked", false); // clear both
+        		} else {
+        		    $("input[name='svanidhi'][value='" + (data.pm_svanidhi_loan ? "Yes" : "No") + "']")
+        		        .prop("checked", true);
+        		}
+        	 
+        	 if (data.bank_acc_status === "1") {
+        		    $("input[name='bank_account'][value='Yes']").prop("checked", true);
+        		    $("#bank_passbook_container").show();
+        		} else if (data.bank_acc_status === "0") {
+        		    $("input[name='bank_account'][value='No']").prop("checked", true);
+        		    $("#bank_passbook_container").hide();
+        		} else {
+        		    // null → clear selection
+        		    $("input[name='bank_account']").prop("checked", false);
+        		    $("#bank_passbook_container").hide();
+        		}
+        	 
+        	 $("#name").val(data.name);
+        	 $("#father_name").val(data.f_h_name);
+        	 $("#mobile_no").val(data.mob_no);
+        	 if (data.gender == null) {
+        		    $("input[name='gender']").prop("checked", false); // clear all
+        		} else {
+        		    $("input[name='gender'][value='" + data.gender + "']").prop("checked", true);
+        		}
+        	 
+        	 $("#dob").val(data.dob);
+        	 $("#community").val(data.social_category);
+        	 if (data.diff_abled == null) {
+      		    $("input[name='differently_abled']").prop("checked", false); // clear both
+      		} else {
+      		    $("input[name='differently_abled'][value='" + (data.diff_abled ? "Yes" : "No") + "']")
+      		        .prop("checked", true);
+      		}
+        	 $("#education").val(data.education_status);
+        	 $("#maritalStatus").val(data.marital_status);
+        	 $("#familymembers").val(data.no_of_fam_mem);
+        	 
+        	 if (data.are_any_fam_mem_invol_str_ven == null) {
+       		    $("input[name='fam_vendor']").prop("checked", false); // clear both
+       		} else {
+       		    $("input[name='fam_vendor'][value='" + (data.are_any_fam_mem_invol_str_ven ? "Yes" : "No") + "']")
+       		        .prop("checked", true);
+       		}
+        	 
+        	 if (data.present_address) {
+       		    let parts = data.present_address.split(",").map(p => p.trim());
+
+       		    $("#doorno").val(parts[0] || "");
+       		    $("#streetname").val(parts[1] || "");
+       		    $("#areaname").val(parts[2] || "");
+       		} else {
+       		    $("#doorno").val("");
+       		    $("#streetname").val("");
+       		    $("#areaname").val("");
+       		}
+        	 
+        	 $("#district").val(data.present_district); 
+        	 $("#pincode").val(data.present_pincode); 
+        	 $("#aadhar_number").val(data.aadhar_no); 
+        	 $("#vendor_req_id").text(data.vendor_req_id);
+        	 
+        	 if (data.view_bank_passbook) {
+			    	
+			    	$('#bank_passbookpreview').show();
+			    	
+			        const fileName = data.view_bank_passbook.split('/').pop();
+			    	
+			        $('#bank_passbookpreview').html(`
+			            <a href="${data.view_bank_passbook}" target="_blank" style="color:blue;">${fileName}</a>
+			        `);
+			  } else {
+			        
+			        $('#bank_passbookpreview').hide();
+			  }
+        	 
+        	 if (data.view_street_vendor_photo) {
+			    	
+			    	$('#profilepreview').show();
+			    	// Extract file name from URL
+			        const fileName = data.view_street_vendor_photo.split('/').pop();
+			    	
+			        $('#profilepreview').html(`
+			            <a href="${data.view_street_vendor_photo}" target="_blank" style="color:blue;">${fileName}</a>
+			        `);
+			  } else {
+			        
+			        $('#profilepreview').hide();
+			  }
+        	 
+        	 if (data.view_aadhar_front_photo) {
+			    	
+			    	$('#aadharfrontimagepreview').show();
+			    	// Extract file name from URL
+			        const fileName = data.view_aadhar_front_photo.split('/').pop();
+			    	
+			        $('#aadharfrontimagepreview').html(`
+			            <a href="${data.view_aadhar_front_photo}" target="_blank" style="color:blue;">${fileName}</a>
+			        `);
+			  } else {
+			        
+			        $('#aadharfrontimagepreview').hide();
+			  }
+        	 
+        	 if (data.view_aadhar_back_photo) {
+			    	
+			    	$('#aadharbackimagepreview').show();
+			    	// Extract file name from URL
+			        const fileName = data.view_aadhar_back_photo.split('/').pop();
+			    	
+			        $('#aadharbackimagepreview').html(`
+			            <a href="${data.view_aadhar_back_photo}" target="_blank" style="color:blue;">${fileName}</a>
+			        `);
+			  } else {
+			        
+			        $('#aadharbackimagepreview').hide();
+			  }
+        	 
+        	 if (data.view_ration_card_photo) {
+			    	
+			    	$('#ration_card_preview').show();
+			    	// Extract file name from URL
+			        const fileName = data.view_ration_card_photo.split('/').pop();
+			    	
+			        $('#ration_card_preview').html(`
+			            <a href="${data.view_ration_card_photo}" target="_blank" style="color:blue;">${fileName}</a>
+			        `);
+			  } else {
+			        
+			        $('#ration_card_preview').hide();
+			  }
+        	 
+        	 
+        	 $('#raw_bank_passbook').text(data.bank_passbook);
+        	 $('#raw_street_vendor_photo').text(data.street_vendor_photo);
+        	 $('#raw_aadhar_front_photo').text(data.aadhar_front_photo);
+        	 $('#raw_aadhar_back_photo').text(data.aadhar_back_photo);
+        	 $('#raw_ration_card_photo').text(data.ration_card_photo);
+        	 	 
+        }
+     
+        
+     // Form submit
+	    $('#vendorForm').submit(function (e) {
+	    	console.log("hiiii");
+	    	
+	    	e.preventDefault();
+	    	
+	    	let formData = new FormData(this);
+	        $('#submitBtn').prop('disabled', true).text('Updating...');
+	        
+	        $('#pageLoader').show();
+	        
+	        
+	        let bankpassbook_Preview= $('#bank_passbookpreview');
+	        let profile_Preview = $('#profilepreview');
+	        let aadharfront_Preview= $('#aadharfrontimagepreview');
+	        let aadharback_Preview = $('#aadharbackimagepreview');
+	        let rationcard_Preview = $('#ration_card_preview');
+	        
+	        let raw_bank_passbook = $('#raw_bank_passbook').text();	        
+	        let raw_street_vendor_photo= $('#raw_street_vendor_photo').text();
+	        let raw_aadhar_front_photo= $('#raw_aadhar_front_photo').text();
+	        let raw_aadhar_back_photo = $('#raw_aadhar_back_photo').text();
+	        let raw_ration_card_photo = $('#raw_ration_card_photo').text();
+	        
+	        console.log("==========raw_bank_passbook========"+raw_bank_passbook);
+	        console.log("==========raw_street_vendor_photo========"+raw_street_vendor_photo);
+	        console.log("==========raw_aadhar_front_photo========"+raw_aadhar_front_photo);
+	        console.log("==========raw_aadhar_back_photo========"+raw_aadhar_back_photo);
+	        console.log("==========raw_ration_card_photo========"+raw_ration_card_photo);
+	        
+	        function setIfPresent(formData, key, value) {
+                if (value !== undefined && value !== null && value !== "") {
+                    formData.set(key, value);
+                }
+            }
+        	
+        	function setFileIfPresent(formData, key, fileInput) {
+        	    if (fileInput && fileInput.files && fileInput.files.length > 0) {
+        	        formData.set(key, fileInput.files[0]);
+        	    }
+        	}
+        	
+        	let userId = document.getElementById('userIdSpan').textContent;
+        	
+        	// pm_svanidhi_loan
+        	let svanidhiVal = $("input[name='svanidhi']:checked").val();
+        	setIfPresent(formData, "pm_svanidhi_loan", svanidhiVal === undefined ? "" : svanidhiVal === "Yes");
+        	//formData.set("pm_svanidhi_loan", svanidhiVal === undefined ? "" : svanidhiVal === "Yes");
+
+        	// bank_acc_status
+        	let bankVal = $("input[name='bank_account']:checked").val();
+        	setIfPresent(formData, "bank_acc_status",bankVal === undefined ? "" : bankVal === "Yes");
+
+        	// diff_abled
+        	let diffVal = $("input[name='differently_abled']:checked").val();
+        	setIfPresent(formData, "diff_abled", diffVal === undefined ? "" : diffVal === "Yes");
+
+        	// are_any_fam_mem_invol_str
+        	let famVal = $("input[name='fam_vendor']:checked").val();
+        	setIfPresent(formData, "are_any_fam_mem_invol_str", famVal === undefined ? "" : famVal === "Yes");
+        	
+        	const isBankYes = $("input[name='bank_account']:checked").val() === "Yes";
+        	const bankPassbook = $('#bank_passbook')[0]?.files[0];
+        	if(isBankYes){
+        		
+        		if(bankpassbook_Preview.html().trim() === '' && !bankPassbook){
+        			$('#pageLoader').hide();
+        			Swal.fire('Missing Bank Passbook', 'Bank passbook is required because Bank Account Status is Yes.', 'warning');
+		            $('#submitBtn').prop('disabled', false).text('Update');
+		            return; 
+        		} 
+        		if(bankPassbook){
+        			setFileIfPresent(formData, "bank_passbook", $('#bank_passbook')[0].files[0]);
+        		}
+        		if(bankpassbook_Preview.html().trim() !== ''){
+        			setIfPresent(formData, "raw_bank_passbook", raw_bank_passbook);
+        		}
+        	}
+        	else{
+        		setFileIfPresent(formData, "bank_passbook", null);
+        		setIfPresent(formData, "raw_bank_passbook", null);
+        	}
+        	
+        	// Lat/Lng
+	        const latitude = $('#latitude_field').val().trim();
+	        const longitude = $('#longitude_field').val().trim();
+	        
+	        setIfPresent(formData, "latitude", latitude);
+	        setIfPresent(formData, "longitude", longitude);
+	        
+	        const landmarkval = $('#landmark').val().trim();
+	        setIfPresent(formData, "landmark", landmarkval);
+	        
+	        const zone = $('#zone').val().trim();
+	        const ward = $('#ward').val().trim();
+	        
+	        
+	        setIfPresent(formData, "zone", zone);
+	        setIfPresent(formData, "ward", ward);
+        	
+	     // Pincode validation
+	        const vendingPincode = $('#vendor_pincode').val().trim();
+	        if (vendingPincode !=="" && !/^\d{6}$/.test(vendingPincode)) {
+	        	$('#pageLoader').hide();
+	            Swal.fire("Invalid vending place pincode", "Pincode must be 6 digits.", "error");
+	            $('#submitBtn').prop('disabled', false).text('Update');
+	            return;
+	        }
+	        setIfPresent(formData, "vending_pincode", vendingPincode);
+
+	        const presentPincode = $('#pincode').val().trim();
+	        if (presentPincode !=="" && !/^\d{6}$/.test(presentPincode)) {
+	        	$('#pageLoader').hide();
+	            Swal.fire("Invalid Present place Pincode", "Pincode must be 6 digits.", "error");
+	            $('#submitBtn').prop('disabled', false).text('Update');
+	            return;
+	        }						        
+	        setIfPresent(formData, "present_pincode", presentPincode);
+
+	        // Aadhaar validation
+	        const aadharNo = $('#aadhar_number').val().trim();
+	        if (aadharNo !=="" && !/^\d{12}$/.test(aadharNo)) {
+	        	$('#pageLoader').hide();
+	            Swal.fire("Invalid Aadhaar Number", "Aadhaar number must be 12 digits.", "error");
+	            $('#submitBtn').prop('disabled', false).text('Update');
+	            return;
+	        }
+	       
+	        setIfPresent(formData, "aadharNo", aadharNo);
+	        
+	        const mobileNumber = $('#mobile_no').val();
+	        if (!/^\d{10}$/.test(mobileNumber)) {
+	        	$('#pageLoader').hide();
+	            Swal.fire("Invalid Mobile Number", "Enter a valid 10-digit number.", "error");
+	            $('#submitBtn').prop('disabled', false).text('Update');
+	            return;
+	        }
+	        	        
+	        setIfPresent(formData, "mobile_number", mobileNumber);
+
+            // Set other fields
+            setIfPresent(formData, "vending_district", $('#vendor_district').val());
+			setIfPresent(formData, "vending_category", $('#businesstype').val());
+			setIfPresent(formData, "vending_space", $('#business_space').val());
+            
+           
+            
+            setIfPresent(formData, "name", $('#name').val());
+            setIfPresent(formData, "f_h_name", $('#father_name').val());
+            setIfPresent(formData, "dob", $('#dob').val());
+            			                   
+	        
+	        let genderVal = $("input[name='gender']:checked").val();
+	        setIfPresent(formData, "gender", genderVal);
+	        
+        	setIfPresent(formData, "social_category", $('#community').val());
+        	setIfPresent(formData, "education_status", $('#education').val());
+        	setIfPresent(formData, "marital_status", $('#maritalStatus').val());
+        	setIfPresent(formData, "no_of_fam_mem", $('#familymembers').val());
+
+        	setIfPresent(formData, "door_no", $('#doorno').val());
+        	setIfPresent(formData, "streetname", $('#streetname').val());
+        	setIfPresent(formData, "areaname", $('#areaname').val());
+        	setIfPresent(formData, "present_district", $('#district').val());
+        	        	
+        	setIfPresent(formData, "userId", userId);
+        	
+        	let vendor_req_id= document.getElementById('vendor_req_id').textContent;
+        	setIfPresent(formData, "vendor_req_id", vendor_req_id);
+        	
+        	setFileIfPresent(formData, "street_vendor_photo", $('#profileimage')[0]);
+			setFileIfPresent(formData, "ration_card_photo", $('#ration_card_photo')[0]);
+			setFileIfPresent(formData, "aadhar_front_photo", $('#aadharfrontimage')[0]);
+			setFileIfPresent(formData, "aadhar_back_photo", $('#aadharbackimage')[0]);
+			
+			if(profile_Preview.html().trim() !== ''){
+    			setIfPresent(formData, "raw_street_vendor_photo", raw_street_vendor_photo);
+    		}
+			
+			if(aadharfront_Preview.html().trim() !== ''){
+    			setIfPresent(formData, "raw_aadhar_front_photo", raw_aadhar_front_photo);
+    		}
+			if(aadharback_Preview.html().trim() !== ''){
+    			setIfPresent(formData, "raw_aadhar_back_photo", raw_aadhar_back_photo);
+    		}
+			if(rationcard_Preview.html().trim() !== ''){
+    			setIfPresent(formData, "raw_ration_card_photo", raw_ration_card_photo);
+    		}
+			
+			for (let pair of formData.entries()) {
+                console.log(pair[0] + ':', pair[1]);
+            }
+			
+			 $.ajax({
+                url: '/gcc/api/streetvendor/updateDetails',
+                type: 'POST',
+                data: formData,
+                enctype: 'multipart/form-data',
+                processData: false,
+                contentType: false,
+                success: function (response) {
+                	$('#pageLoader').hide();
+                    if (response.status) {
+                    	Swal.fire({
+	                        icon: 'success',
+	                        title: 'Success',
+	                        text: response.description ,
+	                        allowOutsideClick: false, 
+		                    allowEscapeKey: false,
+		                    allowEnterKey: false, 
+		                    showConfirmButton: true
+	                    }).then((result) => {
+		                    if (result.isConfirmed) {		                    	
+		                    	location.reload();		                    			                    	
+		                    }
+		                });                       
+                    } else {
+                    	$('#pageLoader').hide();
+                    	 Swal.fire({
+		                        icon: 'error',
+		                        title: 'Update Failed',
+		                        text: response.description || 'Something went wrong!'
+		                    });
+                    }
+                    $('#submitBtn').prop('disabled', false).text('Update');
+                },
+                error: function () {
+                	$('#pageLoader').hide();
+                	Swal.fire({
+	                    icon: 'error',
+	                    title: 'Submission Error',
+	                    text: 'Something went wrong while updating the form.'
+	                });
+                    $('#submitBtn').prop('disabled', false).text('Update');
+                }
+            }); 
+			
+	    });
+        
+
+        </script>
+    </body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/works/request-list.html b/src/main/resources/templates/modules/works/request-list.html
deleted file mode 100644
index d117479..0000000
--- a/src/main/resources/templates/modules/works/request-list.html
+++ /dev/null
@@ -1,813 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="">
-<html xmlns:th="http://www.thymeleaf.org">
-<head th:replace="~{fragments/modules/base/head :: head}"></head>
-    <body>
-		<link rel="stylesheet" type="text/css" href="node_modules/jquery.datetimepicker/jquery.datetimepicker.css"/ >
-        <!--[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">
-                            <div class="row align-items-end">
-                                <div class="col-lg-8">
-                                    <div class="page-header-title">
-                                        <i class="fas fa-headset bg-blue"></i>
-                                        <div class="d-inline">
-                                            <h5>Request List</h5>
-                                            <span>1913 Tax Collection Module</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="index"><i class="ik ik-home"></i></a>
-                                            </li>
-                                            <li class="breadcrumb-item" aria-current="page">1913 Tax Collection</li>
-                                            <li class="breadcrumb-item active" aria-current="page">Request List</li>
-                                        </ol>
-                                    </nav>
-                                </div>
-                            </div>
-                        </div>
-                        <hr>
-                        <div class="row">
-							
-							<div class="card">
-                                <div class="card-block">
-									<div class="d-flex">
-                                        <h4 class="card-title">Tax collection request list</h4>
-                                        
-                                    </div>
-                                
-									<div>
-										<table id="requestDatatable" class="table table-striped table-bordered table-hover dataTable" role="grid" width="100%">
-                                            <thead class="thead-dark">
-                                                <tr role="row">
-													<th class="text-center no-sort" width="1%">S.No</th>
-													<th class="text-center" width="20%">Name</th>
-													<th class="text-center" width="20%">Property tax number</th>
-													<th class="text-center" width="20%">Mobile Number</th>
-													<th class="text-center" width="20%">Availability Date</th>
-													<th class="text-center" width="20%">User Type</th>
-													<th class="text-center" width="20%">Status</th>
-					                                <th class="text-center no-sort" style="width:50px;">Action</th>
-												</tr>
-                                            </theadclass="thead-dark">
-                                            <tbody>
-                                                <tr th:each="taxCollectionRequestList, i : ${taxCollectionRequestEntities}" class="taxCollectionRequestList text-capitalize">
-					                                <td th:text="${i.count}">0</td>
-													<td th:text="${taxCollectionRequestList.name}"></td>
-													<td th:text="${taxCollectionRequestList.ptax}"></td>
-					                                <td th:text="${taxCollectionRequestList.mobile}"></td>
-					                                <td th:text="${taxCollectionRequestList.availabilitydate}"></td>
-					                                <td th:text="${taxCollectionRequestList.usertype}"></td>
-					                                <td>
-														<a th:href="@{#}" th:text="${taxCollectionRequestList.status}" th:classappend="${taxCollectionRequestList.status == 'open'} ? 'badge badge-success mb-1' : 'badge badge-secondary mb-1'" th:onclick="return callStatusUpdate([[${taxCollectionRequestList.request_id}]])" data-animation="true" data-toggle="tooltip" data-placement="top" title="Update Current Status" data-original-title="Update Current Status"></a>
-													</td>
-					                                <td class="text-center">
-					                                    <a th:href="@{#}" th:onclick="return callView([[${taxCollectionRequestList.request_id}]])" data-animation="true" data-toggle="tooltip" data-placement="top" title="View Request Details" data-original-title="View Request Details"><i class="ik ik-eye f-16 text-blue"></i></a>&nbsp;&nbsp;
-					                                </td>
-					                            </tr>
-                                             </tbody>
-                                            <tfoot class="thead-dark">
-                                                <tr>
-													<th class="text-center">S.No</th>
-					                                <th class="text-center">Name</th>
-													<th class="text-center">Property tax number</th>
-													<th class="text-center">Mobile Number</th>
-													<th class="text-center">Availability Date</th>
-													<th class="text-center">User Type</th>
-													<th class="text-center">Status</th>
-					                                <th class="text-center">Action</th>
-												</tr>
-                                            </tfoot>
-                                        </table>
-                                    </div>
-								</div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
-            </div>
-        </div>
-        
-		<div class="modal fade" id="taxCollectionRequestView" tabindex="-1" role="dialog" aria-labelledby="modalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="modalCenterLabel"><i class="ik ik-file-text text-primary"></i> Collection Request Details</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">
-							      
-                            <div class="col-xl-6 col-md-6" id="requestDetails">
-								
-                            </div>
-                            <div class="col-xl-6 col-md-6" style="border-left: 1px solid #dee2e6;" id="pTaxdetails">
-                                &nbsp;
-                            </div>
-						</div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="ik ik-x-square"></i>Close</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-        
-        <div class="modal fade" id="taxCollectionRequestUpdate" tabindex="-1" role="dialog" aria-labelledby="modalCenterLabel" aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
-                <div class="modal-content">
-					
-	                    <div class="modal-header">
-	                        <h5 class="modal-title" id="modalCenterLabel"><i class="ik ik-file-text text-primary"></i> Collection Request Status Update Form</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">
-								      
-	                            <div class="col-xl-6 col-md-6" id="requestDetailsUpdate">
-									
-	                            </div>
-	                            <div class="col-xl-6 col-md-6" style="border-left: 1px solid #dee2e6;" id="statusUpdateForm">
-	                                &nbsp;
-	                            </div>
-	                            
-	                            <div class="card table-card mb-0">
-                                    
-                                   <h5 class="text-warning pl-10 text-center">Status History</h5>
-                                    
-                                    <div class="card-block pb-0">
-                                        <div class="table-responsive">
-                                            <table class="table table-hover mb-0">
-                                                <thead>
-                                                    <tr>
-                                                        <th>Company</th>
-                                                        <th>Start Date</th>
-                                                        <th>End Date</th>
-                                                        <th>Status</th>
-                                                    </tr>
-                                                </thead>
-                                                <tbody>
-                                                    <tr>
-                                                        <td>Apple Company</td>
-                                                        <td>23/05/2017</td>
-                                                        <td>04/08/2018</td>
-                                                        <td><label class="badge badge-success">Paid</label></td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                                
-							</div>
-	                    </div>
-	                    <div class="modal-footer">
-	                        <button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="ik ik-x-square"></i>Close</button>
-	                    </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/jquery.mask/1.14.16/jquery.mask.min.js"></script>
-        <script src="node_modules/amcharts3/amcharts/amcharts.js"></script>
-        <script src="node_modules/amcharts3/amcharts/serial.js"></script>
-        <script src="node_modules/amcharts3/amcharts/themes/light.js"></script>
-        <script src="node_modules/jquery.datetimepicker/jquery.datetimepicker.full.min.js"></script>
-       	<script th:inline="javascript">
-			var loginUserID = /*[[${LoginUserId}]]*/'';
-			$(document).ready(function() {
-			  // Input masking for the desired format
-			  $('#ptax').mask('00-000-00000-000');
-			  $('#mobileno').mask('0000000000');
-			  
-			  // For datetime picker
-			  jQuery('#availabilitydate').datetimepicker({
-				  minTime:'10:00',
-				  maxTime:'18:01',
-				  minDate: 0, // Today
-				  //minDate:'-1970/01/2',
-				  //maxDate:'+1970/01/2',
-				  //timepicker:false, // Disable time picker
-				  mask:false,
-				  disabledWeekDays:[0], //[0,1,2,3,4,5,6] -> 0-Sunday .... 6-saturday
-				  disabledDates:['2023/08/31','2023/08/11','2023/08/12'], // Disable date on holidays
-				  /*
-				  // Disable all weekends
-				  onGenerate:function( ct ){
-				    jQuery(this).find('.xdsoft_date.xdsoft_weekend')
-				      .addClass('xdsoft_disabled');
-				  }
-				  */
-			  });
-			  
-			});
-			
-			function displayPtaxInfo(ptax){
-				var inputElement = $('#ptax');
-				
-				inputElement.removeClass('is-invalid');
-				
-				// Disable the button to prevent multiple clicks
-				$("#ptaxsearchbtn").prop("disabled", true);
-				
-				// Show the loading icon on the button
-				$("#ptaxsearchbtn").html('<i class="fas fa-spinner fa-spin"></i>');
-				  
-				var ptax = inputElement.val();
-				var formatRegex = /^\d{2}-\d{3}-\d{5}-\d{3}$/; //'04-042-03251-000';
-				
-				// Check if the tax value is not null and follows the format
-				if (ptax !== null && formatRegex.test(ptax)) {
-				  console.log('ptax value is valid:', ptax);
-				  // Check if the tax value has the correct length as per the format (15 characters)
-				  if (ptax.length === 16) {
-				    console.log('ptax value length is correct.');
-				    getPtaxInfo(ptax);
-				  } else {
-				    console.log('ptax value length is incorrect.');
-				    
-				    inputElement.addClass('is-invalid');
-				    
-				    $("#ptaxsearchbtn").prop("disabled", false);
-    				$("#ptaxsearchbtn").html('<i class="ik ik-search"></i>');
-				  }
-				} else {
-				  console.log('ptax value is not valid or null.');
-				  
-				  inputElement.addClass('is-invalid'); //Error
-				  
-				  $("#ptaxsearchbtn").prop("disabled", false); 
-    			  $("#ptaxsearchbtn").html('<i class="ik ik-search"></i>');
-				}
-			}
-			
-			function getPtaxInfo(ptax){
-				call_loading('ptaxPersonalInfo','start');
-				//var ptax = '04-042-03251-000';
-				var apiUrl = '/gcc/api/taxcollection/getPropertTaxPersonalDetails?ptax='+ptax;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						
-						// Parse the JSON response into a JavaScript object
-						var data = jsonResponse;
-						if(data.ResultStatus=="False")
-						{
-							$("#ptaxPersonalInfo").html("<center>"+nodata(data.Message)+"</center>");
-							$("#ptaxsearchbtn").prop("disabled", false);
-						    $("#ptaxsearchbtn").html('<i class="ik ik-search"></i>');
-						}
-						else{
-							// Access the values
-							var owner = data.PROPTAX[0].Owner;
-							var address = data.PROPTAX[0].Address;
-							//var famCardNo = data.PROPTAX[0].Fam_Card_No;
-							var mobNo = data.PROPTAX[0].Mob_No;
-							var email = data.PROPTAX[0].Email_ID;
-							
-							// HTML content
-							var ptaxPersonalinfoHtml = '<table class="table table-borderless text-capitalize">' +
-							           '  <tbody>' +
-									   '    <tr>' +
-							           '      <td>Property tax number</td>' +
-							           '      <td class="font-medium">'+ptax+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td>Owner Name</td>' +
-							           '      <td class="font-medium">'+owner+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td>Address</td>' +
-							           '      <td class="font-medium">'+address+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td>Mobile No</td>' +
-							           '      <td class="font-medium">'+mobNo+'</td>' +
-							           '    </tr>' +
-							           '  </tbody>' +
-							           '</table>';
-							$("#ptaxPersonalInfo").html(ptaxPersonalinfoHtml);
-							// Enable the button
-							$("#ptaxsearchbtn").prop("disabled", false);
-	    					$("#ptaxsearchbtn").html('<i class="ik ik-search"></i>');
-						}
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching data:', status, error);
-				      // Enable the button
-				      $("#ptaxsearchbtn").prop("disabled", false);
-				      $("#ptaxsearchbtn").html('<i class="ik ik-search"></i>');
-				    }
-				});
-			}
-			
-			function saveRequest(){
-				// Disable the button to prevent multiple clicks
-				$("#requestSubmitBtn").prop("disabled", true);
-				
-				// Show the loading icon on the button
-				$("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Validating your request, please wait...');
-				var name = $('#name').val();
-				
-				var inputElement = $('#ptax');
-				var ptax = inputElement.val();
-				var formatRegex = /^\d{2}-\d{3}-\d{5}-\d{3}$/; //'04-042-03251-000';
-				inputElement.removeClass('is-invalid');
-				
-				var inputElementMobileNo = $('#mobileno');
-				var mobileNo = inputElementMobileNo.val();
-				var mobileFormatRegex = /^\d{10}$/; //'0000000000';
-				inputElementMobileNo.removeClass('is-invalid');
-				
-				var inputElementUsertype = $('#usertype');
-				var usertype = inputElementUsertype.val();
-				//inputElementUsertype.removeClass('is-invalid');
-				
-				var inputElementAvailabilityDate = $('#availabilitydate');
-				var availabilitydate = inputElementAvailabilityDate.val();
-				
-				var selectedDateTime = new Date(availabilitydate);
-			    var currentDateTime = new Date();
-			
-			    if (selectedDateTime < currentDateTime) {
-					alert('Selected date and time must be greater than or equal to the current date and time.');
-		        	inputElementAvailabilityDate.addClass('is-invalid');
-					$("#requestSubmitBtn").prop("disabled", false);
-    				$("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-		        	return false; // Prevent form submission
-		      	}
-			    
-				var formData = new FormData();
-				
-				// Check if the tax value is not null and follows the format
-				if (ptax !== null && formatRegex.test(ptax) && ptax.length == 16) {
-					
-					// Mobile number Check
-					if (mobileNo !== null && mobileFormatRegex.test(mobileNo) && mobileNo.length == 10) {
-						$("#requestSubmitBtn").html('<i class="fas fa-spinner fa-spin"></i> Submitting your request, please wait...');
-						
-						formData.append('name',name);
-						formData.append('ptax', ptax );
-						formData.append('mobile', mobileNo );
-						formData.append('usertype', usertype );
-						formData.append('availabilitydate', availabilitydate);
-						formData.append('created_by', loginUserID);
-						
-						submitSaveRequest(formData);
-
-						$("#requestSubmitBtn").html('Your request has been successfully submitted!');
-					} else {
-						inputElementMobileNo.addClass('is-invalid');
-						$("#requestSubmitBtn").prop("disabled", false);
-    					$("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-					}
-				 
-				} else {
-				  console.log('ptax value is not valid or null.');
-				  
-				  inputElement.addClass('is-invalid'); //Error
-				  
-				  $("#requestSubmitBtn").prop("disabled", false); 
-    			  $("#requestSubmitBtn").html('<i class="ik ik-save"></i>Save');
-				}
-				return false;
-			}
-			
-			function submitSaveRequest(formData){
-				$.ajax({
-				    type: "POST",
-				    url: '/gcc/api/taxcollection/saveTaxCollectionRequest',
-		                data: formData,
-		                contentType: false,
-		                processData: false,
-				}).done(function(response) {
-	  			      Swal.fire(
-	  			        'Complaint Status Update!',
-	  			        'Complaint closed Successfully!',
-	  			        'success'
-	  			      ).then(() => {
-	  						    location.reload();
-	  						 });
-					
-				}).fail(function(jqXHR, textStatus, errorThrown) {
-					$("#requestSubmitBtn").prop("disabled", false);
-				    // Log the error and any relevant information
-				    console.error("Error sending request: " + textStatus + " " + errorThrown);
-			    
-				});
-			}
-		</script>
-		<script>
-			$(document).ready(function() {
-				
-				// DataTables buttons configuration
-	            var 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'
-	                },
-	                
-	            ];
-				
-			    $('#requestDatatable').DataTable( {
-			        dom: 'Bftip',
-			        columnDefs: [
-					  { targets: 'no-sort', orderable: false }
-					],
-			        lengthMenu: [
-			            [ 50, 100, 200, 500, -1 ],
-			            [ '50 rows', '100 rows', '200 rows','500 rows', 'Show all' ]
-			        ],
-    				scrollY: '50vh',
-			        fixedColumns: {
-				        left: 1,
-				        right: 1
-				    },
-			        buttons: [buttons],
-			        fixedHeader: true,
-			        autoWidth: true,
-			        responsive: true,
-			        searching: false,
-			        select: false,
-			        processing: false,
-			    } );
-			} );
-			
-			function callView(request_id){
-				$('#taxCollectionRequestView').modal({
-				    backdrop: 'static',
-				    keyboard: false
-				})
-				$('#taxCollectionRequestView').modal('show');
-				
-				call_loading('requestDetails','start');
-				getTaxCollectionRequestDetails(request_id);
-				call_loading('pTaxdetails','start');
-				
-				return false;
-			}
-			
-			function getTaxCollectionRequestDetails(request_id){
-				var apiUrl = '/gcc/api/taxcollection/getTaxCollectionRequestById?request_id='+request_id;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						var data = jsonResponse;
-						
-						// Access the values
-						var request_id = data.request_id;
-						var requestNo = data.requestNo;
-						var name = data.name;
-						var mobile = data.mobile;
-						var ptax = data.ptax;
-						var usertype = data.usertype;
-						var availabilitydate = data.availabilitydate;
-						var status = data.status;
-						var cdate = data.cDate;
-						
-						// HTML content
-						var ptaxPersonalinfoHtml = '<table class="table table-borderless text-capitalize">' +
-						           '  <tbody>' +
-								   '    <tr>' +
-						           '      <td>Name</td>' +
-						           '      <td class="font-medium">'+name+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Property tax number</td>' +
-						           '      <td class="font-medium font-weight-bold" id="pTaxVerification">'+ptax+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Mobile Number</td>' +
-						           '      <td class="font-medium">'+mobile+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Availability Date & Time</td>' +
-						           '      <td class="font-medium">'+availabilitydate+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>User Type</td>' +
-						           '      <td class="font-medium">'+usertype+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Current Status</td>' +
-						           '      <td class="font-medium">'+status+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Request Created On</td>' +
-						           '      <td class="font-medium">'+cdate+'</td>' +
-						           '    </tr>' +
-						           '  </tbody>' +
-						           '</table>';
-						$("#requestDetails").html(ptaxPersonalinfoHtml);
-						getpTaxDetails(ptax);
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching collection reqtest data:', status, error);
-				      
-				    }
-				});
-			}
-			
-			function getpTaxDetails(ptax){
-				
-				var apiUrl = '/gcc/api/taxcollection/getPropertTaxPersonalDetails?ptax='+ptax;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						var data = jsonResponse;
-						if (data.ResultStatus === "True") {
-							// Access the values
-							var owner = data.PROPTAX[0].Owner;
-							var address = data.PROPTAX[0].Address;
-							var mobNo = data.PROPTAX[0].Mob_No;
-							var email = data.PROPTAX[0].Email_ID;
-							
-							// HTML content
-							var ptaxPersonalinfoHtml = '<table class="table table-borderless">' +
-							           '  <tbody>' +
-									   '    <tr>' +
-							           '      <td>Property tax number</td>' +
-							           '      <td class="font-medium">'+ptax+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td>Owner Name</td>' +
-							           '      <td class="font-medium">'+owner+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td>Address</td>' +
-							           '      <td class="font-medium">'+address+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td>Mobile No</td>' +
-							           '      <td class="font-medium">'+mobNo+'</td>' +
-							           '    </tr>' +
-							           '  </tbody>' +
-							           '</table>';
-							$("#pTaxdetails").html(ptaxPersonalinfoHtml);
-							
-							// if Ptax data fetched then load valid message
-							var validPtax = ptax+'&nbsp;<font class="custom-tooltip-success"><a href="#" class="text-success" onclick="return false;" data-container=".custom-tooltip-success" data-toggle="tooltip" data-html="true" data-placement="top" title="Property tax number<br>cross-verify success" data-original-title="Property tax number cross-verify success"><i class="ik ik-check-circle"></i></font>';
-							$("#pTaxVerification").html(validPtax);
-						}
-						else {
-						    // No data found
-						    console.log("Message: " + data.Message);
-						    var inValidPtax = ptax+'&nbsp;<font class="custom-tooltip-warning"><a href="#" class="text-warning" onclick="return false;" data-container=".custom-tooltip-warning" data-toggle="tooltip" data-html="true" data-placement="top" title="Property tax number<br>cross-verify failed" data-original-title="Property tax number cross-verify failed"><i class="ik ik-alert-triangle"></i></font>';
-							$("#pTaxVerification").html(inValidPtax);
-							
-						    $("#pTaxdetails").html('<center><img src="images/nodata.png"></br>No Record Found</center>');
-						}
-						// Enable tooltip for model page
-						$('[data-toggle="tooltip"]').tooltip();
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching pTax data:', status, error);
-				      
-				    }
-				});
-			}
-			
-			function callStatusUpdate(request_id){
-				$('#taxCollectionRequestUpdate').modal({
-				    backdrop: 'static',
-				    keyboard: false
-				})
-				$('#taxCollectionRequestUpdate').modal('show');
-				
-				call_loading('requestDetailsUpdate','start');
-				getTaxCollectionRequestUpdate(request_id);
-				call_loading('statusUpdateForm','start');
-				
-				return false;
-			}
-			
-			function getTaxCollectionRequestUpdate(request_id){
-				var apiUrl = '/gcc/api/taxcollection/getTaxCollectionRequestById?request_id='+request_id;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						var data = jsonResponse;
-						
-						// Access the values
-						var request_id = data.request_id;
-						var requestNo = data.requestNo;
-						var name = data.name;
-						var mobile = data.mobile;
-						var ptax = data.ptax;
-						var usertype = data.usertype;
-						var availabilitydate = data.availabilitydate;
-						var status = data.status;
-						var cdate = data.cDate;
-						
-						// HTML content
-						var ptaxPersonalinfoHtml = '<table class="table table-borderless text-capitalize">' +
-						           '  <tbody>' +
-								   '    <tr>' +
-						           '      <td>Name</td>' +
-						           '      <td class="font-medium">'+name+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Property tax number</td>' +
-						           '      <td class="font-medium font-weight-bold" id="pTaxVerification">'+ptax+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Mobile Number</td>' +
-						           '      <td class="font-medium">'+mobile+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Availability Date & Time</td>' +
-						           '      <td class="font-medium">'+availabilitydate+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>User Type</td>' +
-						           '      <td class="font-medium">'+usertype+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Current Status</td>' +
-						           '      <td class="font-medium">'+status+'</td>' +
-						           '    </tr>' +
-						           '    <tr>' +
-						           '      <td>Request Created On</td>' +
-						           '      <td class="font-medium">'+cdate+'</td>' +
-						           '    </tr>' +
-						           '  </tbody>' +
-						           '</table>';
-						$("#requestDetailsUpdate").html(ptaxPersonalinfoHtml);
-						showStatusUpdateForm(request_id, status);
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching collection reqtest data:', status, error);
-				      
-				    }
-				});
-			}
-			
-			function showStatusUpdateForm(request_id, status){
-				
-				var selectInput = `<select class="form-control" name="requestStatus" id="requestStatus" required>
-								        <option value="open">Open</option>
-								        <option value="close">Close</option>
-								    </select>`;
-								    
-				var textareaInput=`<textarea class="form-control" name="statusComments" id="statusComments" rows="4"></textarea>`;
-				
-				var ptaxPersonalinfoHtml = '<form class="request-form" id="request-form" onsubmit="return saveStatus();">' +
-									   '<div class="card table-card mb-0"><div class="card-header" style="background-color: #ffe1003b !important;"><h3>Update Form</h3></div>' +
-									   '<div class="card-block p-0">' +
-									   '<table class="table table-borderless">' +
-							           '  <tbody>' +
-									   '    <tr>' +
-							           '      <td width="30%">Current Status</td>' +
-							           '      <td class="font-medium">'+selectInput+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td colspan="2">Status Comments' + textareaInput+'</td>' +
-							           '    </tr>' +
-							           '  </tbody>' +
-							           '</table>' +
-							           '</div><div class="card-footer text-center">' +
-									   '        <button type="reset" class="btn btn-secondary mr-2"><i class="ik ik-refresh-cw"></i>Reset</button>'+
-                                       ' 	    <button type="submit" class="btn btn-success" id="requestSubmitBtn"><i class="ik ik-save"></i>Save</button>'+
-							           '</div></div></form>';
-							           
-				$("#statusUpdateForm").html(ptaxPersonalinfoHtml);
-				
-				
-				var apiUrl = '/gcc/api/taxcollection/getPropertTaxPersonalDetails?ptax='+ptax;
-				$.ajax({
-				    url: apiUrl,
-				    type: 'GET',
-				    dataType: 'json',
-				    success: function(jsonResponse) {
-						// Handle the API response data here
-						console.log('Data from API:', jsonResponse);
-						// Parse the JSON response into a JavaScript object
-						var data = jsonResponse;
-						if (data.ResultStatus === "True") {
-							// Access the values
-							var owner = data.PROPTAX[0].Owner;
-							var address = data.PROPTAX[0].Address;
-							var mobNo = data.PROPTAX[0].Mob_No;
-							var email = data.PROPTAX[0].Email_ID;
-							
-							// HTML content
-							var ptaxPersonalinfoHtml = '<form class="request-form" id="request-form" onsubmit="return saveStatus();">' +
-									   '<div class="card table-card"><div class="card-header"><h3>Update Form</h3></div>' +
-									   '<div class="card-block">' +
-									   '<table class="table table-borderless">' +
-							           '  <tbody>' +
-									   '    <tr>' +
-							           '      <td>Current Status</td>' +
-							           '      <td class="font-medium">'+ptax+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td>Status Comments</td>' +
-							           '      <td class="font-medium">'+owner+'</td>' +
-							           '    </tr>' +
-							           '    <tr>' +
-							           '      <td>Address</td>' +
-							           '      <td class="font-medium">'+
-									   
-									   '      </td>' +
-							           '    </tr>' +
-							           '  </tbody>' +
-							           '</table>' +
-							           '</div><div class="card-footer  text-center">' +
-									   '        <button type="reset" class="btn btn-secondary mr-2"><i class="ik ik-refresh-cw"></i>Reset</button>'+
-                                       ' 	    <button type="submit" class="btn btn-success" id="requestSubmitBtn"><i class="ik ik-save"></i>Save</button>'+
-							           '</div></div></form>';
-							$("#statusUpdateForm").html(ptaxPersonalinfoHtml);
-						}
-						else {
-						    // No data found
-						    console.log("Status history: " + data.Message);
-						    //$("#pTaxdetails").html('<center><img src="images/nodata.png"></br>No Record Found</center>');
-						}
-						// Enable tooltip for model page
-						$('[data-toggle="tooltip"]').tooltip();
-				    },
-				    error: function(xhr, status, error) {
-				      // Handle errors here
-				      console.error('Error fetching Status history:', status, error);
-				      
-				    }
-				});
-			}
-			
-			function saveStatus(){
-				return false;
-			}
-		</script>
-    </body>
-</html>