From 343cb31a35ef1fc9513cb3f73f2d18b6e8d2b6ff Mon Sep 17 00:00:00 2001
From: Hariprasath S <113695067+Hariprasath4022@users.noreply.github.com>
Date: Mon, 5 Oct 2026 10:52:55 +0530
Subject: [PATCH] Added road works Modules

---
 .classpath                                    |    8 -
 .../configuration/DataSourceConfig.java       |    9 +-
 .../works/controller/APIContoller.java        |  230 +-
 .../works/controller/MainController.java      |   22 +
 .../works/service/ERPEstimateService.java     |    4 +-
 .../works/service/EstimateService.java        | 1865 +++++++-
 src/main/resources/application.properties     |    4 +-
 .../modules/works/edit_stage_script.html      |    2 +-
 .../fragments/modules/works/script.html       |   14 +-
 .../works/user_works_update_script.html       |    4 +-
 .../modules/works/user_works_view_script.html |    4 +-
 .../modules/works/works_view_script.html      |    2 +-
 .../templates/modules/works/addworkspage.html | 3931 +++++++++++++++++
 .../modules/works/erp-works-list.html         |    4 +-
 .../modules/works/erp-works-update.html       |   16 +-
 .../templates/modules/works/erpworkslist.html |   27 +-
 .../modules/works/erpworkslist_old.html       |   34 +-
 .../modules/works/erpworkslist_report.html    |    4 +-
 .../modules/works/non-erp-works-add.html      |   14 +-
 .../modules/works/nonerpworkslist.html        |   79 +-
 .../modules/works/project_status_update.html  |    4 +-
 21 files changed, 6155 insertions(+), 126 deletions(-)
 create mode 100644 src/main/resources/templates/modules/works/addworkspage.html

diff --git a/.classpath b/.classpath
index bc93d16..83a3b6f 100644
--- a/.classpath
+++ b/.classpath
@@ -9,7 +9,6 @@
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
@@ -29,12 +28,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
-			<attribute name="optional" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
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 4d36145..cdd8dc6 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/configuration/DataSourceConfig.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/configuration/DataSourceConfig.java
@@ -24,15 +24,14 @@ import java.util.Properties;
 @EnableTransactionManagement
 public class DataSourceConfig {
 
-	private static String host = "localhost:3306";
-	private static String dbpassword = "root";
+//	private static String host = "localhost:3306";
+//	private static String dbpassword = "root";
 
 	// private static String dbpassword = "gccroot";
 
 	// AWS
-	// private static String host =
-	// "gcc-facial-db-instance-1.cf48eqcciziq.ap-south-1.rds.amazonaws.com:3306";
-	// private static String dbpassword = "gcc-facial-password";
+	 private static String host ="gcc-facial-db-instance-1.cf48eqcciziq.ap-south-1.rds.amazonaws.com:3306";
+	 private static String dbpassword = "gcc-facial-password";
 
 	////////////////////////////// (For GCC APP) ////////////////////////
 	@Configuration
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/works/controller/APIContoller.java b/src/main/java/in/gov/chennaicorporation/gccoffice/works/controller/APIContoller.java
index 906b2d5..0e9cfce 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/works/controller/APIContoller.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/works/controller/APIContoller.java
@@ -19,7 +19,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @RestController
-@RequestMapping("/gcc/works/api/estimates")
+@RequestMapping("/gcc/api/works/estimates")
 
 public class APIContoller {
 
@@ -901,4 +901,232 @@ public class APIContoller {
             return ResponseEntity.status(500).body(response);
         }
     }
+    
+    
+//added by hariprasath
+    
+    @GetMapping("/getWorkDetailsById")
+    @ResponseBody
+    public List<Map<String, Object>> getWorkDetailsById(
+            @RequestParam("estid") String estid) {
+
+        return estimateService.getWorkDetailsById(estid);
+    }
+    
+    
+    @GetMapping("/addWorksQuestions")
+    @ResponseBody
+    public List<Map<String, Object>> getQuestions(
+            @RequestParam("subcategory_id") int subcategoryId) {
+
+        return estimateService.getQuestions(subcategoryId);
+    }
+    
+    @GetMapping("/subquestions")
+    @ResponseBody
+    public List<Map<String, Object>> getSubQuestions(
+            @RequestParam("aam_id") int aamId) {
+
+        return estimateService.getSubQuestions(aamId);
+    }
+    
+    @GetMapping("/getzones")
+    @ResponseBody
+    public List<Map<String, Object>> getZones() {
+
+        return estimateService.getZones();
+    }
+    
+    @GetMapping("/getwards")
+    @ResponseBody
+    public List<Map<String, Object>> getWards(
+            @RequestParam("zone") String zone) {
+
+        return estimateService.getWards(zone);
+    }
+    
+    @GetMapping("/getroadsbyward")
+    @ResponseBody
+    public List<Map<String, Object>> getRoadNamesByWard(
+            @RequestParam("ward") String ward) {
+
+        return estimateService.getRoadNamesByWard(ward);
+    }
+    
+	@PostMapping("/addWorkDetails")
+	@ResponseBody
+	public Map<String, Object> addWorkDetails(@RequestBody Map<String, Object> request) {
+
+		Map<String, Object> response = new HashMap<>();
+
+		try {
+
+			List<Map<String, Object>> details = (List<Map<String, Object>>) request.get("details");
+
+			List<Map<String, Object>> textDetails = (List<Map<String, Object>>) request.get("textDetails");
+
+			Integer createdBy = Integer.valueOf(String.valueOf(request.get("createdBy")));
+
+			Integer estid = Integer.valueOf(String.valueOf(request.get("estid")));
+
+			Integer subCatId  = Integer.valueOf(String.valueOf(request.get("subcategory_id")));
+			
+			String estimateNo = String.valueOf(request.get("estimate_no"));
+
+			// SUBCATEGORY 4 - DUPLICATE ROAD VALIDATION
+
+			if (subCatId  == 4) {
+
+				String duplicateRoad = estimateService.checkDuplicateRoad(estid, textDetails);
+
+				if (duplicateRoad != null) {
+
+					response.put("status", false);
+
+					response.put("message", "Already " + duplicateRoad + " has been mapped for this Estimation");
+
+					return response;
+				}
+			}
+
+			estimateService.saveAllWorkDetails(createdBy, estid,estimateNo,subCatId , details, textDetails);
+
+			response.put("status", true);
+
+			response.put("message", "Work details saved successfully");
+
+		} catch (Exception e) {
+
+			e.printStackTrace();
+
+			response.put("status", false);
+
+			response.put("message", "Unable to save work details");
+		}
+
+		return response;
+	}
+    
+	@GetMapping("/getSavedDetails")
+	@ResponseBody
+	public List<Map<String, Object>> getSavedWorkDetails(
+	        @RequestParam("estid") int estid) {
+
+	    return estimateService.getSavedWorkDetails(estid);
+	}
+    
+	@PostMapping("/deleteSavedDetails")
+	@ResponseBody
+	public Map<String, Object> deleteSavedWorkDetails(@RequestParam("createdBy") int createdBy,
+			@RequestParam("estid") int estid, @RequestParam("ref_id") int refId) {
+
+		try {
+
+			return estimateService.deleteSavedWorkDetails(createdBy, estid, refId);
+
+		} catch (Exception e) {
+
+			e.printStackTrace();
+
+			Map<String, Object> response = new HashMap<>();
+			response.put("status", false);
+			response.put("message", "Unable to remove work details");
+
+			return response;
+		}
+	}
+    
+	@GetMapping("/getEditDetails")
+	@ResponseBody
+	public List<Map<String, Object>> getEditWorkDetails(@RequestParam("estid") int estid,
+			@RequestParam("ref_id") int refId, @RequestParam("subcategory_id") int subcategoryId) {
+
+		return estimateService.getEditWorkDetails(estid, refId, subcategoryId);
+	}
+	    
+	@PostMapping("/updateSavedDetails")
+	@ResponseBody
+	public Map<String, Object> updateSavedWorkDetails(@RequestBody Map<String, Object> request) {
+
+		
+
+		try {
+
+			Integer estid = Integer.valueOf(String.valueOf(request.get("estid")));
+
+			Integer refId = Integer.valueOf(String.valueOf(request.get("ref_id")));
+
+			Integer subcategoryId = Integer.valueOf(String.valueOf(request.get("subcategory_id")));
+
+			Integer createdBy = Integer.valueOf(String.valueOf(request.get("createdBy")));
+			
+			String estimateNo =String.valueOf(request.get("estimate_no"));
+
+			List<Map<String, Object>> details = (List<Map<String, Object>>) request.get("details");
+
+			List<Map<String, Object>> textDetails = (List<Map<String, Object>>) request.get("textDetails");
+
+			/*
+			 * Duplicate ROAD validation
+			 */
+			if (subcategoryId == 4) {
+
+				String duplicateRoad = estimateService.checkDuplicateRoadForUpdate(estid, refId, textDetails);
+
+				if (duplicateRoad != null) {
+					Map<String, Object> response = new HashMap<>();
+
+					response.put("status", false);
+
+					response.put("message", "Already " + duplicateRoad + " present in Database");
+
+					return response;
+				}
+			}
+
+			return estimateService.updateSavedWorkDetails(createdBy, estid, refId, estimateNo, subcategoryId, details,textDetails);
+			
+
+		} catch (Exception e) {
+
+			e.printStackTrace();
+			Map<String, Object> response = new HashMap<>();
+
+			response.put("status", false);
+
+			response.put("message", "Unable to update work details");
+			return response;
+		}
+	
+	}
+		
+		
+	@GetMapping("/checkWorkProgress")
+	@ResponseBody
+	public Map<String, Object> checkWorkProgress(@RequestParam("estid") int estid, @RequestParam("ref_id") int refId) {
+
+		Map<String, Object> response = new HashMap<>();
+
+		try {
+
+			boolean started = estimateService.isWorkProgressStarted(estid, refId);
+
+			response.put("status", true);
+			response.put("workStarted", started);
+
+			if (started) {
+				response.put("message", "Work progress is started, Unable to edit or remove");
+			}
+
+		} catch (Exception e) {
+
+			e.printStackTrace();
+
+			response.put("status", false);
+			response.put("message", "Unable to check work progress");
+		}
+
+		return response;
+	}
+    
 }
diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/works/controller/MainController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/works/controller/MainController.java
index 1957e3a..595b734 100644
--- a/src/main/java/in/gov/chennaicorporation/gccoffice/works/controller/MainController.java
+++ b/src/main/java/in/gov/chennaicorporation/gccoffice/works/controller/MainController.java
@@ -222,5 +222,27 @@ public class MainController {
 
         return BasePath + "project_status_update";
     }
+    
+    @GetMapping("/addworks")
+    public String addworksWebPage(
+            Model model,
+            @RequestParam(value = "estid", required = false) String estid,
+            @RequestParam(value = "sub_category_id", required = false) Integer sub_category_id,
+            @RequestParam(value = "estimate_no", required = false) String estimate_no,
+            @RequestParam(value = "sub_category", required = false) String sub_category)
+    {
+
+        String LoginUserId = LoginUserInfo.getLoginUserId();
+
+        model.addAttribute("LoginUserId", LoginUserId);
+        model.addAttribute("estid", estid);
+        model.addAttribute("sub_category_id", sub_category_id);
+        model.addAttribute("estimate_no", estimate_no);
+        model.addAttribute("sub_category", sub_category);
+        
+
+        return BasePath + "addworkspage";
+    }
+
 
 }
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 965f334..cc190da 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
@@ -240,8 +240,8 @@ public class ERPEstimateService {
     		String loginId,
     		String finYear, String oValue) {
         StringBuilder sql = new StringBuilder("SELECT ew.`estid`, ew.`estimate_no`, DATE(ew.`estimate_date`) AS `estimate_date`,"
-        		+ "ew.`zone`, ew.`ward`, dm.dept_name as `department`, wm.name as `category`, "
-        		+ "trim(tm.description) as `sub_category`, ew.`project_name`, ew.`estimation_amount`, ew.`est_val_with_oh` FROM erp_works ew "
+        		+ "ew.`zone`, ew.`ward`, dm.dept_name as `department`, wm.name as `category`, ew.`sub_category` as sub_category_id, "
+        		+ "trim(tm.description) as `sub_category`, ew.`project_name`, ew.`estimation_amount`, ew.`est_val_with_oh` FROM works_details ew "
         		+ "LEFT JOIN department_master dm ON dm.id = ew.department "
         		+ "LEFT JOIN workstype_master wm ON wm.id = ew.category "
         		+ "LEFT JOIN typeofwork_master tm ON  tm.id = ew.sub_category");
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 bd5d631..a40c68b 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
@@ -3,6 +3,8 @@ package in.gov.chennaicorporation.gccoffice.works.service;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.net.URI;
+import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -35,7 +37,11 @@ import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 @Service
 public class EstimateService {
 	@Autowired
@@ -174,14 +180,16 @@ public class EstimateService {
         
        String remarks_txt = remarks;
        
+       int nonErp=1;
+       
         // ✅ SQL Query
-        String sqlQuery = "INSERT INTO gcc_works_status.non_erp_works (estimate_no, estimate_date, zone, ward, isiconic, project_name, location, " +
+        String sqlQuery = "INSERT INTO gcc_works_status.works_details (estimate_no, estimate_date, zone, ward, isiconic, project_name, location, " +
                      "department, contractor_name, contractor_period, fund_source, scheme, category, sub_category, " +
                      "estimation_amount, technical_sanction_date, admin_sanction_date, admin_sanction_file, tender_called_date, tender_finalized_date, " +
                      "loa_date, loa_file, agreement_date, agreement_file, work_order_date, work_order_file, work_commenced_date, reason, remarks,"
-                     + "project_type, govt_funded_project, special_category, filenumber) " +
+                     + "project_type, govt_funded_project, special_category, filenumber,nonerp) " +
                      "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, "
-                     + "?, ?, ?, ?)";
+                     + "?, ?, ?, ?, ?)";
         
         KeyHolder keyHolder = new GeneratedKeyHolder();
         
@@ -220,6 +228,7 @@ public class EstimateService {
             ps.setString(31, govtfund);
             ps.setString(32, specialcat);
             ps.setString(33, filenumber);
+            ps.setInt(34, nonErp);
             return ps;
         }, keyHolder);
         
@@ -238,7 +247,7 @@ public class EstimateService {
 	        
 	     // ✅ Construct SQL Query with Actual Values (For Logging)
 	        String formattedSql = String.format(
-	            "INSERT INTO gcc_works_status.non_erp_works (estimate_no, estimate_date, zone, ward, isiconic, project_name, location, " +
+	            "INSERT INTO gcc_works_status.works_details (estimate_no, estimate_date, zone, ward, isiconic, project_name, location, " +
 	            "department, contractor_name, contractor_period, fund_source, scheme, category, sub_category, " +
 	            "estimation_amount, technical_sanction_date, admin_sanction_date, admin_sanction_file, tender_called_date, tender_finalized_date, " +
 	            "loa_date, loa_file, agreement_date, agreement_file, work_order_date, work_order_file, work_commenced_date, reason, remarks) " +
@@ -258,7 +267,8 @@ public class EstimateService {
     
     @Transactional
 	public boolean updateESTno(int estid ,String estNo) {
-		String  sqlQuery = "UPDATE `non_erp_works` SET `estimate_no`='"+estNo+"' WHERE `estid`='"+estid+"'";
+//		String  sqlQuery = "UPDATE `non_erp_works` SET `estimate_no`='"+estNo+"' WHERE `estid`='"+estid+"'";
+    	String  sqlQuery = "UPDATE `works_details` SET `estimate_no`='"+estNo+"' WHERE `estid`='"+estid+"'";
 		jdbcTemplate.update(sqlQuery);
 		return true;
 	}
@@ -325,10 +335,10 @@ public class EstimateService {
     	if(!where.equals("")) {
     		where = " WHERE "+ where;
     	}
-    	
+    	// table changed from erp_works to works_details
         String sql = "SELECT ew.estid, ew.estimate_no, ew.estimate_date, ew.zone, ew.ward, ew.project_name, ew.location, " +
                 "                dm.dept_name, ew.contractor_name, ew.contractor_period, fm.name as fund_source, sm.name as scheme, " +
-                "                wm.name as category, tm.description as sub_category FROM gcc_works_status.erp_works ew " +
+                "                wm.name as category, tm.description as sub_category FROM gcc_works_status.works_details ew " +
                 "                left join gcc_works_status.department_master dm on dm.id = ew.department " +
                 "                left join gcc_works_status.workstype_master wm on wm.id = ew.category " +
                 "                left join gcc_works_status.typeofwork_master tm on tm.id = ew.sub_category " +
@@ -371,7 +381,7 @@ public class EstimateService {
     }
 
     public List<Map<String, Object>> getSubCategoryList() {
-        String sql = "SELECT *  FROM gcc_works_status.typeofwork_master order by DESCRIPTION asc";
+        String sql = "SELECT *  FROM gcc_works_status.typeofwork_master WHERE isactive=1 order by DESCRIPTION asc";
         // Fetch the details from the database as a Map
         List<Map<String, Object>> result = jdbcTemplate.queryForList(sql);
 
@@ -397,8 +407,8 @@ public class EstimateService {
     public int updateEstimateDetails(Map<String, Object> updatedDetails, String sanFilePath, String loaFilePath,
                                      String agreementFilePath, String workOrderFilePath) throws IOException {
 
-    	// ✅ Base SQL query
-        StringBuilder sql = new StringBuilder("UPDATE gcc_works_status.erp_works SET "
+    	// ✅ Base SQL query - table changed from erp_works to works_details
+        StringBuilder sql = new StringBuilder("UPDATE gcc_works_status.works_details SET "
                 + "estimate_date = ?, zone = ?, ward = ?, project_name = ?, location = ?, "
                 + "isiconic = ?, department = ?, contractor_name = ?, contractor_period = ?, "
                 + "fund_source = ?, scheme = ?, category = ?, sub_category = ?, estimation_amount = ?, "
@@ -540,7 +550,8 @@ public class EstimateService {
     //model service
 
     public List<Map<String, Object>> fetchEstimateByCode(String estimateCode) {
-        String query = "SELECT * FROM gcc_works_status.erp_works WHERE estimate_no=?";
+//        String query = "SELECT * FROM gcc_works_status.erp_works WHERE estimate_no=?";
+    	String query = "SELECT * FROM gcc_works_status.works_details WHERE estimate_no=?";
         return jdbcTemplate.queryForList(query, estimateCode);
     }
 
@@ -570,7 +581,8 @@ public class EstimateService {
     }
 
     public List<String> getAllWorksDetails() {
-        String sql = "SELECT distinct  estimate_no FROM gcc_works_status.erp_works";
+//        String sql = "SELECT distinct  estimate_no FROM gcc_works_status.erp_works";
+    	String sql = "SELECT distinct  estimate_no FROM gcc_works_status.works_details";
         return jdbcTemplate.queryForList(sql, String.class);
     }
 
@@ -604,7 +616,7 @@ public class EstimateService {
                             String loaFile, String agreementDate, String agreementFile, String workOrderDate,
                             String workOrderFile, String workCommDate) {
 
-        String sql = "INSERT INTO gcc_works_status.erp_works (estimate_no, estimate_date, zone, ward, project_name, location, " +
+        String sql = "INSERT INTO gcc_works_status.works_details (estimate_no, estimate_date, zone, ward, project_name, location, " +
                 "department, contractor_name, contractor_period, fund_source, scheme, category, sub_category, " +
                 "estimation_amount, technical_sanction_date, admin_sanction_date, admin_sanction_file, tender_called_date, tender_finalized_date, loa_date, " +
                 "loa_file, agreement_date, agreement_file, work_order_date, work_order_file, work_commenced_date, isiconic) " +
@@ -775,7 +787,9 @@ public class EstimateService {
 
     public List<Map<String, Object>> getAllNonERPWorks(String loginId) {
     	String accessData = getUserAccess(loginId);
-    	String where="";
+//    	String where="";
+    	
+    	String where="new.`nonerp`=1 ";
     	
     	// Split the string using "_"
         String[] parts = accessData.split("_");
@@ -796,10 +810,10 @@ public class EstimateService {
     	if(!where.equals("")) {
     		where = " WHERE "+ where;
     	}
-    	
-        String sql = "SELECT new.estid, new.estimate_no, new.estimate_date, new.zone, new.ward, new.project_name, new.location, new.filenumber, new.estimation_amount, " +
+    	// table changed from non_erp_works to works_details
+        String sql = "SELECT new.estid, new.estimate_no, new.estimate_date, new.zone, new.ward, new.project_name, new.location, new.filenumber, new.estimation_amount,new.sub_category as sub_category_id, " +
                 "                dm.dept_name, new.contractor_name, new.contractor_period, fm.name as fund_source, sm.name as scheme, " +
-                "                wm.name as category, tm.description as sub_category FROM gcc_works_status.non_erp_works new " +
+                "                wm.name as category, tm.description as sub_category FROM gcc_works_status.works_details new " +
                 "                left join gcc_works_status.department_master dm on dm.id = new.department " +
                 "                left join gcc_works_status.workstype_master wm on wm.id = new.category " +
                 "                left join gcc_works_status.typeofwork_master tm on tm.id = new.sub_category " +
@@ -811,7 +825,7 @@ public class EstimateService {
 
 
     public Map<String, Object> getERPEstimateDetails(String estimateNo) {
-
+    	// table changed from non_erp_works to works_details
         String sql = "select ew.estimate_no, ew.estimate_date, ew.zone, ew.ward, ew.project_name, ew.location, ew.department, ew.contractor_name, " +
                 "ew.contractor_period, ew.estimation_amount as est_amount, ew.technical_sanction_date as tech_sanc_date, ew.admin_sanction_date as admin_sanc_date," +
                 "ew.tender_called_date as tender_call_date, ew.tender_called_date as tender_fin_date, ew.loa_date, ew.agreement_date, ew.work_order_date, " +
@@ -819,12 +833,12 @@ public class EstimateService {
                 "ew.isiconic as iconic_project, dm.dept_name, ew.fund_source as fundsource, fm.name as fund_source, " +
                 "ew.scheme as schemeid, sm.name as scheme,  ew.category as categoryid, wm.name as category, ew.sub_category as subcategoryid, " +
                 "tm.description as sub_category " +
-                "from gcc_works_status.erp_works ew " +
+                "from gcc_works_status.works_details ew " +
                 "                left join gcc_works_status.department_master dm on dm.id = ew.department " +
                 "                left join gcc_works_status.workstype_master wm on wm.id = ew.category " +
                 "                left join gcc_works_status.typeofwork_master tm on tm.id = ew.sub_category " +
                 "                left join gcc_works_status.fundsource_master fm on fm.id = ew.fund_Source " +
-                "                left join gcc_works_status.scheme_master sm on sm.id = ew.scheme where ew.estimate_no = ? LIMIT 100";
+                "                left join gcc_works_status.scheme_master sm on sm.id = ew.scheme where ew.estimate_no = ? AND  LIMIT 100 ";
 
         // Fetch the details from the database as a Map
         List<Map<String, Object>> details = jdbcTemplate.queryForList(sql, estimateNo);
@@ -837,7 +851,7 @@ public class EstimateService {
     }
 
     public Map<String, Object> getNonERPEstimateDetails(String estimateNo) {
-
+    	// table changed from non_erp_works to works_details
         String sql = "select ew.estimate_no, ew.estimate_date, ew.zone, ew.ward, ew.project_name, ew.location, ew.department, ew.contractor_name, " +
                 "ew.contractor_period, ew.estimation_amount as est_amount, ew.technical_sanction_date as tech_sanc_date, ew.admin_sanction_date as admin_sanc_date," +
                 "ew.tender_called_date as tender_call_date, ew.tender_called_date as tender_fin_date, ew.loa_date, ew.agreement_date, ew.work_order_date, " +
@@ -845,7 +859,7 @@ public class EstimateService {
                 "ew.isiconic as iconic_project, dm.dept_name, ew.fund_source as fundsource, fm.name as fund_source, " +
                 "ew.scheme as schemeid, sm.name as scheme,  ew.category as categoryid, wm.name as category, ew.sub_category as subcategoryid, ew.reason, ew.remarks, " +
                 "tm.description as sub_category, ew.`project_type`, ew.`govt_funded_project`, ew.`special_category`, ew.`filenumber` " +
-                "from gcc_works_status.non_erp_works ew " +
+                "from gcc_works_status.works_details ew " +
                 "                left join gcc_works_status.department_master dm on dm.id = ew.department " +
                 "                left join gcc_works_status.workstype_master wm on wm.id = ew.category " +
                 "                left join gcc_works_status.typeofwork_master tm on tm.id = ew.sub_category " +
@@ -864,15 +878,33 @@ public class EstimateService {
 
     public int updateNonERPEstimateDetails(Map<String, Object> updatedDetails, String sanFilePath, String loaFilePath,
                                      String agreementFilePath, String workOrderFilePath) throws IOException {
+    	
+    	
+    	
+    	 String estimateNo =
+    	            String.valueOf(updatedDetails.get("estimate_no"));
+    	 
+    	 System.out.println("estimateNo>>>>>>"+estimateNo);
+    	
+    	Map<String, Object> existingData =
+                getExistingNonErpEstimate(estimateNo);
 
-    	// ✅ Base SQL query
-        StringBuilder sql = new StringBuilder("UPDATE gcc_works_status.non_erp_works SET "
+        if (existingData == null || existingData.isEmpty()) {
+            return 0;
+        }
+
+        // 2. Save OLD data
+        saveNonErpEstimateLog(estimateNo);
+    	
+
+    	// ✅ Base SQL query - table changed from non_erp_works to works_details
+        StringBuilder sql = new StringBuilder("UPDATE gcc_works_status.works_details SET "
                 + "estimate_date = ?, zone = ?, ward = ?, project_name = ?, location = ?, "
                 + "isiconic = ?, department = ?, contractor_name = ?, contractor_period = ?, "
                 + "fund_source = ?, scheme = ?, category = ?, sub_category = ?, estimation_amount = ?, "
                 + "technical_sanction_date = ?, admin_sanction_date = ?, tender_called_date = ?, tender_finalized_date = ?, "
                 + "loa_date = ?, agreement_date = ?, work_order_date = ?, work_commenced_date = ?, "
-                + "project_type=?, govt_funded_project=?, special_category=?, filenumber=? ");
+                + "project_type=?, govt_funded_project=?, special_category=?, filenumber=? ,update_date = NOW()");
 
         // ✅ Dynamically append file updates if new files are provided
         List<Object> params = new ArrayList<>(Arrays.asList(
@@ -945,6 +977,76 @@ public class EstimateService {
         return jdbcTemplate.update(sql.toString(), params.toArray());
     }
     
+    
+    
+private Map<String, Object> getExistingNonErpEstimate(String estimateNo) {
+    	
+    	String sql = "SELECT wd.estid, wd.nonerp, wd.estimate_no, wd.estimate_date, wd.zone, wd.ward, wd.project_name, "
+    			+ " wd.location, wd.department, wd.contractor_name, wd.contractor_period,  "
+    			+ " wd.fund_source, wd.scheme, wd.category, wd.sub_category, wd.estimation_amount,  "
+    			+ " wd.technical_sanction_date, wd.admin_sanction_date, wd.admin_sanction_file, wd.tender_called_date,"
+    			+ " wd.tender_finalized_date, wd.loa_date, wd.loa_file,  "
+    			+ " wd.agreement_date, wd.agreement_file, wd.work_order_date, wd.work_order_file, wd.work_commenced_date, "
+    			+ " wd.update_status, wd.reason, wd.remarks, wd.project_type,  "
+    			+ " wd.govt_funded_project, wd.special_category, wd.filenumber, wd.est_val_with_oh, "
+    			+ " wd.works_data_erp_id, wd.percentage, wd.est_type, wd.est_sub_cat_2, wd.project_id, "
+    			+ " wd.project_code, wd.type_2, wd.type_2_child,  "
+    			+ " wd.isactive, wd.isdelete, wd.isiconic, wd.cdate "
+    			+ " FROM gcc_works_status.works_details wd "
+    			+ " where wd.estimate_no = ? and wd.isactive = 1 and wd.isdelete = 0 AND wd.nonerp = 1";
+    	
+    	 List<Map<String, Object>> result =
+    	            jdbcTemplate.queryForList(sql, estimateNo);
+
+    	    if (result.isEmpty()) {
+    	        return null;
+    	    }
+
+    	    return result.get(0);
+    }
+
+
+			private void saveNonErpEstimateLog(String estimateNo) {
+			
+			    String sql =
+			            "INSERT INTO gcc_works_status.works_details_log "
+			            + "(works_details_estid, nonerp, estimate_no, estimate_date, zone, ward, "
+			            + "project_name, location, department, contractor_name, "
+			            + "contractor_period, fund_source, scheme, category, "
+			            + "sub_category, estimation_amount, technical_sanction_date, "
+			            + "admin_sanction_date, admin_sanction_file, tender_called_date, "
+			            + "tender_finalized_date, loa_date, loa_file, agreement_date, "
+			            + "agreement_file, work_order_date, work_order_file, "
+			            + "work_commenced_date, update_status, reason, remarks, "
+			            + "project_type, govt_funded_project, special_category, "
+			            + "filenumber, est_val_with_oh, works_data_erp_id, percentage, "
+			            + "est_type, est_sub_cat_2, project_id, project_code, type_2, "
+			            + "type_2_child, isactive, isdelete, isiconic, cdate) "
+			
+			            + "SELECT "
+			            + "estid, nonerp, estimate_no, estimate_date, zone, ward, "
+			            + "project_name, location, department, contractor_name, "
+			            + "contractor_period, fund_source, scheme, category, "
+			            + "sub_category, estimation_amount, technical_sanction_date, "
+			            + "admin_sanction_date, admin_sanction_file, tender_called_date, "
+			            + "tender_finalized_date, loa_date, loa_file, agreement_date, "
+			            + "agreement_file, work_order_date, work_order_file, "
+			            + "work_commenced_date, update_status, reason, remarks, "
+			            + "project_type, govt_funded_project, special_category, "
+			            + "filenumber, est_val_with_oh, works_data_erp_id, percentage, "
+			            + "est_type, est_sub_cat_2, project_id, project_code, type_2, "
+			            + "type_2_child, isactive, isdelete, isiconic, cdate "
+			
+			            + "FROM gcc_works_status.works_details "
+			            + "WHERE estimate_no = ? "
+			            + "AND nonerp = 1 "
+			            + "AND isactive = 1 "
+			            + "AND isdelete = 0 "
+			            + "LIMIT 1";
+			
+			    jdbcTemplate.update(sql, estimateNo);
+			}
+    
     ///// Balaji
     
     public List<Map<String, Object>> getestimateworkdetailsById(String estid) {
@@ -1056,6 +1158,8 @@ public class EstimateService {
     	String fundSourceId = getFundSourceId(fundSource);
     	String schemeId = getSchemeId(scheme);
     	
+    	int cpvalue=Integer.parseInt(contractorPeriod);
+    	
     	techSancDate = normalizeDate(techSancDate);
     	agreementDate = normalizeDate(agreementDate);
     	adminSancDate = normalizeDate(adminSancDate);
@@ -1065,7 +1169,8 @@ public class EstimateService {
     	workOrderDate = normalizeDate(workOrderDate);
     	workCommDate = normalizeDate(workCommDate);
     	
-        String sql = "INSERT INTO `gcc_works_status`.`erp_works` (estimate_no, estimate_date, zone, ward, project_name, location, " +
+    	// table changed from non_erp_works to works_details
+        String sql = "INSERT INTO `gcc_works_status`.`works_details` (estimate_no, estimate_date, zone, ward, project_name, location, " +
                 "department, contractor_name, contractor_period, fund_source, scheme, category, sub_category, " +
                 "estimation_amount, technical_sanction_date, admin_sanction_date, admin_sanction_file, tender_called_date, " +
                 "tender_finalized_date, loa_date, " +
@@ -1079,7 +1184,7 @@ public class EstimateService {
 
         int result = jdbcTemplate.update(sql, 
         		estimateNo, estimateDate, zone, ward, projectName, 
-        		location, departmentId, contractorName, contractorPeriod, fundSourceId, 
+        		location, departmentId, contractorName, cpvalue, fundSourceId, 
         		schemeId, categoryId, subCategoryId, estAmount, techSancDate,
                 adminSancDate, admSanFile, tenderCallDate, tenderFinDate, loaDate, 
                 loaFile, agreementDate, agreementFile, workOrderDate, workOrderFile, 
@@ -1088,9 +1193,9 @@ public class EstimateService {
         
         updateWorksDataErpStatus(works_data_erp_id);
         
-        runSqlScript();
+//        runSqlScript(); -- commented because this will be configured through add works option for all the sub category
         
-        String logsql = "INSERT INTO `gcc_works_status`.`erp_works` (estimate_no, estimate_date, zone, ward, project_name, location, " +
+        String logsql = "INSERT INTO `gcc_works_status`.`works_details` (estimate_no, estimate_date, zone, ward, project_name, location, " +
                 "department, contractor_name, contractor_period, fund_source, scheme, category, sub_category, " +
                 "estimation_amount, technical_sanction_date, admin_sanction_date, admin_sanction_file, tender_called_date, " +
                 "tender_finalized_date, loa_date, " +
@@ -1501,6 +1606,22 @@ public class EstimateService {
             String loaFile, String agreementDate, String agreementFile, String workOrderDate,
             String workOrderFile, String workCommDate, String loginid,
             String projecttype, String govtfund, String specialcat) {
+    	
+    	
+    	
+    	Map<String, Object> existingData =
+                getExistingEstimate(estid);
+    	
+    	System.out.println("existingData"+existingData);
+    	
+
+        if (existingData == null || existingData.isEmpty()) {
+            return 0;
+        }
+
+        // save log table(work_details_log)       
+        saveEstimateLog(estid);
+    	
 
 			// Normalize blank date fields to null
 	    	techSancDate = normalizeDate(techSancDate);
@@ -1516,11 +1637,11 @@ public class EstimateService {
 			StringBuilder fileQuery = new StringBuilder();
 			List<Object> params = new ArrayList<>();
 			
-			// Base SQL
-			String sql = "UPDATE `gcc_works_status`.`erp_works` SET "
+			// Base SQL - table changed from non_erp_works to works_details
+			String sql = "UPDATE `gcc_works_status`.`works_details` SET "
 			 + "technical_sanction_date=?, admin_sanction_date=?, tender_called_date=?, "
 			 + "tender_finalized_date=?, loa_date=?, agreement_date=?, work_order_date=?, work_commenced_date=?, "
-			 + "isiconic=?, project_type=?, govt_funded_project=?, special_category=?";
+			 + "isiconic=?, project_type=?, govt_funded_project=?, special_category=?,update_date = NOW()";
 			
 			// Add base parameters
 			Collections.addAll(params, techSancDate, adminSancDate, tenderCallDate, tenderFinDate,
@@ -1559,7 +1680,80 @@ public class EstimateService {
 			return result;
 	}
     
+    
+    
+    private Map<String, Object> getExistingEstimate(String estid) {
+    	
+    	String sql = "SELECT wd.estid, wd.nonerp, wd.estimate_no, wd.estimate_date, wd.zone, wd.ward, wd.project_name, "
+    			+ " wd.location, wd.department, wd.contractor_name, wd.contractor_period,  "
+    			+ " wd.fund_source, wd.scheme, wd.category, wd.sub_category, wd.estimation_amount,  "
+    			+ " wd.technical_sanction_date, wd.admin_sanction_date, wd.admin_sanction_file, wd.tender_called_date,"
+    			+ " wd.tender_finalized_date, wd.loa_date, wd.loa_file,  "
+    			+ " wd.agreement_date, wd.agreement_file, wd.work_order_date, wd.work_order_file, wd.work_commenced_date, "
+    			+ " wd.update_status, wd.reason, wd.remarks, wd.project_type,  "
+    			+ " wd.govt_funded_project, wd.special_category, wd.filenumber, wd.est_val_with_oh, "
+    			+ " wd.works_data_erp_id, wd.percentage, wd.est_type, wd.est_sub_cat_2, wd.project_id, "
+    			+ " wd.project_code, wd.type_2, wd.type_2_child,  "
+    			+ " wd.isactive, wd.isdelete, wd.isiconic, wd.cdate "
+    			+ " FROM gcc_works_status.works_details wd "
+    			+ " where wd.estid = ? and wd.isactive = 1 and wd.isdelete = 0 AND wd.nonerp = 0";
+    	
+    	 List<Map<String, Object>> result =
+    	            jdbcTemplate.queryForList(sql, estid);
+
+    	    if (result.isEmpty()) {
+    	        return null;
+    	    }
+
+    	    return result.get(0);
+    }
+    
+    
+    
+    
+    private void saveEstimateLog(String estid) {
+
+        String sql =
+                " INSERT INTO gcc_works_status.works_details_log "
+                + " (works_details_estid, nonerp, estimate_no, estimate_date, zone, ward, "
+                + " project_name, location, department, contractor_name, "
+                + " contractor_period, fund_source, scheme, category, "
+                + " sub_category, estimation_amount, technical_sanction_date, "
+                + " admin_sanction_date, admin_sanction_file, tender_called_date, "
+                + " tender_finalized_date, loa_date, loa_file, agreement_date, "
+                + " agreement_file, work_order_date, work_order_file, "
+                + " work_commenced_date, update_status, reason, remarks, "
+                + " project_type, govt_funded_project, special_category, "
+                + " filenumber, est_val_with_oh, works_data_erp_id, percentage, "
+                + " est_type, est_sub_cat_2, project_id, project_code, type_2, "
+                + " type_2_child, isactive, isdelete, isiconic, cdate) "
+               
+                
+                + " SELECT "
+                + " estid, nonerp, estimate_no, estimate_date, zone, ward, "
+                + " project_name, location, department, contractor_name, "
+                + " contractor_period, fund_source, scheme, category, "
+                + " sub_category, estimation_amount, technical_sanction_date, "
+                + " admin_sanction_date, admin_sanction_file, tender_called_date, "
+                + " tender_finalized_date, loa_date, loa_file, agreement_date, "
+                + " agreement_file, work_order_date, work_order_file, "
+                + " work_commenced_date, update_status, reason, remarks, "
+                + " project_type, govt_funded_project, special_category, "
+                + " filenumber, est_val_with_oh, works_data_erp_id, percentage, "
+                + " est_type, est_sub_cat_2, project_id, project_code, type_2, "
+                + " type_2_child, isactive, isdelete, isiconic, cdate "
+                + " FROM gcc_works_status.works_details "
+                + " WHERE estid = ? "
+                + " AND isactive = 1 "
+                + " AND isdelete = 0 AND nonerp = 0 ";
+
+        jdbcTemplate.update(sql, estid);
+    } 
+    
     public List<Map<String, Object>> getUserEstWorkDetailsById(String estid) {
+    	
+    	//table changed from non_erp_works to works_details
+    	
         String sql = "SELECT ew.`estid`, ew.`estimate_no`, ew.`estimate_date`, ew.`zone`, ew.`ward`, "
         		+ "ew.`project_name`, ew.`location`, ew.`contractor_name`, ew.`contractor_period`, "
         		+ "fm.`name` AS `fund_source`, sm.`name` AS `scheme`, "
@@ -1574,7 +1768,7 @@ public class EstimateService {
         		+ "ew.`works_data_erp_id`, ew.`percentage`, ew.`project_type`, ew.`govt_funded_project`, ew.`special_category`, "
         		+ "dm.dept_name as `department`, wm.name as `category`, "
         		+ "trim(tm.description) as `sub_category` "
-        		+ "FROM erp_works ew "
+        		+ "FROM works_details ew "
         		+ "LEFT JOIN department_master dm ON dm.id = ew.department "
         		+ "LEFT JOIN workstype_master wm ON wm.id = ew.category "
         		+ "LEFT JOIN typeofwork_master tm ON  tm.id = ew.sub_category "
@@ -1690,4 +1884,1609 @@ public class EstimateService {
 
         return jdbcTemplate.update(sql, pid, feedback, file, inby);
     }
+    
+    
+ // added by hariprasath 
+    
+ 	public List<Map<String, Object>> getWorkDetailsById(String estid) {
+
+         String sql =
+                 "SELECT "
+               + "wd.`estid`, "
+               + "wd.`nonerp`, "
+               + "wd.`estimate_no`, "
+               + "wd.`estimate_date`, "
+               + "wd.`zone`, "
+               + "wd.`ward`, "
+               + "wd.`project_name`, "
+               + "wd.`location`, "
+               + "wd.`contractor_name`, "
+               + "wd.`contractor_period`, "
+               + "fm.`name` AS `fund_source`, "
+               + "sm.`name` AS `scheme`, "
+               + "wd.`estimation_amount`, "
+               + "wd.`est_val_with_oh`, "
+               + "wd.`technical_sanction_date`, "
+               + "wd.`admin_sanction_date`, "
+               + "wd.`tender_called_date`, "
+               + "wd.`tender_finalized_date`, "
+               + "wd.`loa_date`, "
+               + "wd.`agreement_date`, "
+               + "wd.`work_order_date`, "
+               + "CONCAT('" + fileBaseUrl+ "/gcc/files', wd.`admin_sanction_file`) AS `admin_sanction_file`, "
+               + "CONCAT('" + fileBaseUrl+ "/gcc/files', wd.`agreement_file`) AS `agreement_file`, "
+               + "CONCAT('" + fileBaseUrl + "/gcc/files', wd.`loa_file`) AS `loa_file`, "
+               + "CONCAT('" + fileBaseUrl+ "/gcc/files', wd.`work_order_file`) AS `work_order_file`, "
+               + "wd.`work_commenced_date`, "
+               + "wd.`update_status`, "
+               + "wd.`isiconic`, "
+               + "wd.`works_data_erp_id`, "
+               + "wd.`percentage`, "
+               + "wd.`project_type`, "
+               + "wd.`govt_funded_project`, "
+               + "wd.`special_category`, "
+               + "dm.`dept_name` AS `department`, "
+               + "wm.`name` AS `category`, "
+               + "TRIM(tm.`description`) AS `sub_category` "
+               
+               + "FROM `works_details` wd "
+
+               + "LEFT JOIN department_master dm ON dm.id = wd.`department` "
+               + "LEFT JOIN workstype_master wm ON wm.id = wd.`category` "
+               + "LEFT JOIN typeofwork_master tm ON tm.id = wd.`sub_category` "
+               + "LEFT JOIN scheme_master sm ON sm.id = wd.`scheme` "
+               + "LEFT JOIN fundsource_master fm ON fm.id = wd.`fund_source` "
+
+               + "WHERE wd.`estid` = ? "
+               + "AND wd.`isactive` = 1 "
+               + "AND wd.`isdelete` = 0 "
+               + "LIMIT 1";
+
+ 		return jdbcTemplate.queryForList(sql, estid);
+     }
+
+ 	public List<Map<String, Object>> getQuestions(int subcategoryId) {
+
+ 		String questionSql = """
+ 				SELECT
+ 				    id,
+ 				    subcategory_id,
+ 				    issub,
+ 				    question_name,
+ 				    answer_type,
+ 				    ismandatory,
+ 				    allow_zero,
+ 				    orderby,
+ 				    remarks,
+ 				    input_source,
+ 				    api_name,
+ 				    isactive,
+ 				    isdelete
+ 				FROM addworks_question_master
+ 				WHERE subcategory_id = ?
+ 				  AND issub = 0
+ 				  AND isactive = 1
+ 				  AND isdelete = 0
+ 				ORDER BY orderby
+ 				""";
+
+ 		List<Map<String, Object>> questions = jdbcTemplate.queryForList(questionSql, subcategoryId);
+
+ 		String answerSql = """
+ 				SELECT
+ 				    id,
+ 				    question_id,
+ 				    answer,
+ 				    orderby,
+ 				    remarks
+ 				FROM addworks_answer_master
+ 				WHERE question_id = ?
+ 				  AND isactive = 1
+ 				  AND isdelete = 0
+ 				ORDER BY orderby
+ 				""";
+
+ 		for (Map<String, Object> question : questions) {
+
+ 			int questionId = ((Number) question.get("id")).intValue();
+
+ 			String inputSource = String.valueOf(question.get("input_source"));
+
+ 			String answerType = String.valueOf(question.get("answer_type"));
+
+ 			if ("MASTER".equalsIgnoreCase(inputSource)
+ 					&& ("radio".equalsIgnoreCase(answerType) || "dropdown".equalsIgnoreCase(answerType))) {
+
+ 				List<Map<String, Object>> answers = jdbcTemplate.queryForList(answerSql, questionId);
+
+ 				question.put("answers", answers);
+
+ 			} else {
+
+ 				question.put("answers", new ArrayList<Map<String, Object>>());
+ 			}
+ 		}
+
+ 		return questions;
+ 	}
+
+ 	public List<Map<String, Object>> getSubQuestions(int aamId) {
+
+ 		String questionSql = """
+ 				  SELECT
+ 				      aqm.id,
+ 				      aqm.subcategory_id,
+ 				      aqm.issub,
+ 				      aqm.question_name,
+ 				      aqm.answer_type,
+ 				      aqm.ismandatory,
+ 				      aqm.allow_zero,
+ 				      aqm.orderby,
+ 				      aqm.remarks,
+ 				      aqm.isactive,
+ 				      aqm.isdelete,
+ 				      aqm.input_source,
+ 				aqm.api_name
+ 				  FROM addworks_subquestion_mapping asm
+ 				  INNER JOIN addworks_question_master aqm
+ 				      ON aqm.id = asm.aqm_id
+ 				  WHERE asm.aam_id = ?
+ 				    AND asm.isactive = 1
+ 				    AND asm.isdelete = 0
+ 				    AND aqm.isactive = 1
+ 				    AND aqm.isdelete = 0
+ 				  ORDER BY aqm.orderby
+ 				  """;
+
+ 		List<Map<String, Object>> questions = jdbcTemplate.queryForList(questionSql, aamId);
+
+ 		String answerSql = """
+ 				SELECT
+ 				    id,
+ 				    question_id,
+ 				    answer,
+ 				    orderby,
+ 				    remarks
+ 				FROM addworks_answer_master
+ 				WHERE question_id = ?
+ 				  AND isactive = 1
+ 				  AND isdelete = 0
+ 				ORDER BY orderby
+ 				""";
+
+ 		for (Map<String, Object> question : questions) {
+
+ 			int questionId = ((Number) question.get("id")).intValue();
+
+ 			String inputSource = String.valueOf(question.get("input_source"));
+
+ 			String answerType = String.valueOf(question.get("answer_type"));
+
+ 			if ("MASTER".equalsIgnoreCase(inputSource)
+ 					&& ("radio".equalsIgnoreCase(answerType) || "dropdown".equalsIgnoreCase(answerType))) {
+
+ 				List<Map<String, Object>> answers = jdbcTemplate.queryForList(answerSql, questionId);
+
+ 				question.put("answers", answers);
+
+ 			} else {
+
+ 				question.put("answers", new ArrayList<Map<String, Object>>());
+ 			}
+ 		}
+
+ 		return questions;
+ 	}
+
+ 	public List<Map<String, Object>> getZones() {
+
+ 		String sql = """
+ 				SELECT DISTINCT zone
+ 				FROM zones_wards_master
+ 				WHERE zone IS NOT NULL
+ 				  AND zone <> ''
+ 				ORDER BY zone
+ 				""";
+
+ 		return jdbcTemplate.queryForList(sql);
+ 	}
+
+ 	public List<Map<String, Object>> getWards(String zone) {
+
+ 		String sql = """
+ 				SELECT DISTINCT ward
+ 				FROM zones_wards_master
+ 				WHERE zone = ?
+ 				  AND ward IS NOT NULL
+ 				  AND ward <> ''
+ 				ORDER BY ward
+ 				""";
+
+ 		return jdbcTemplate.queryForList(sql, zone);
+ 	}
+
+ 	public List<Map<String, Object>> getRoadNamesByWard(String ward) {
+ 		try {
+ 			String encodedWard = URLEncoder.encode("'"+ ward +"'", StandardCharsets.UTF_8.toString());
+ 			String url = "https://gisgcc.chennaicorporation.gov.in/server/rest/services/GCCDepts/EDPMobile2025/FeatureServer/0/query"
+ 					+ "?where=new_ward%3D" + encodedWard
+ 					+ "&fullText=&objectIds=&time=&geometry=&geometryType=esriGeometryPoint&inSR=4326&defaultSR=4326&spatialRel=esriSpatialRelIntersects&distance=&units=esriSRUnit_Meter&relationParam="
+ 					+ "&outFields=road_id%2Croad_name%2Clocality%2Carea_name%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&returnEnvelope=false&timeReferenceUnknownClient=false&maxRecordCountFactor=&sqlFormat=none&resultType=&featureEncoding=esriDefault&datumTransformation=&cacheHint=false"
+ 					+ "&f=geojson";
+ 			
+ 			//System.out.println("url=="+url);
+
+ 			RestTemplate restTemplate = new RestTemplate();
+ 			String responseBody = restTemplate.getForObject(URI.create(url), String.class);
+
+ 			ObjectMapper objectMapper = new ObjectMapper();
+ 			JsonNode root = objectMapper.readTree(responseBody);
+ 			JsonNode features = root.path("features");
+
+ 			List<Map<String, Object>> roadList = new ArrayList<>();
+ 			if (features.isArray()) {
+ 				for (JsonNode feature : features) {
+ 					JsonNode props = feature.path("properties");
+ 					String roadId = props.path("road_id").asText();
+ 					String roadName = props.path("road_name").asText();
+ 					String locality = props.path("locality").asText();
+ 					String areaName = props.path("area_name").asText();
+ 					String type = props.path("type").asText();
+
+ 					Map<String, Object> roadInfo = new HashMap<>();
+ 					roadInfo.put("road_id", roadId);
+ 					roadInfo.put("road_name", roadName);
+ 					roadInfo.put("locality", locality);
+ 					roadInfo.put("area_name", areaName);
+ 					roadInfo.put("type", type);
+
+ 					roadList.add(roadInfo);
+ 				}
+ 			}
+ 			return roadList;
+
+ 		} catch (Exception e) {
+ 			e.printStackTrace();
+ 			return Collections.emptyList();
+ 		}
+ 	}
+
+ 	@Transactional
+ 	public void saveAllWorkDetails(Integer createdBy, Integer estid, String estimateNo,Integer subCatId, List<Map<String, Object>> details,
+ 			List<Map<String, Object>> textDetails) {
+
+ 		if (details != null) {
+
+ 			for (Map<String, Object> item : details) {
+
+ 				saveDetails(item, createdBy, estid);
+ 			}
+ 		}
+
+ 		if (textDetails != null) {
+
+ 			for (Map<String, Object> item : textDetails) {
+
+ 				saveTextDetails(item, createdBy, estid);
+ 			}
+ 		}
+ 		
+ 		 Set<Integer> refIds = new LinkedHashSet<>();
+
+ 		    if (details != null) {
+
+ 		        for (Map<String, Object> item : details) {
+
+ 		            if (item.get("ref_id") != null) {
+
+ 		                Integer refId =
+ 		                        Integer.valueOf(
+ 		                                String.valueOf(item.get("ref_id"))
+ 		                        );
+
+ 		                refIds.add(refId);
+ 		            }
+ 		        }
+ 		    }
+
+ 		    if (textDetails != null) {
+
+ 		        for (Map<String, Object> item : textDetails) {
+
+ 		            if (item.get("ref_id") != null) {
+
+ 		                Integer refId =
+ 		                        Integer.valueOf(
+ 		                                String.valueOf(item.get("ref_id"))
+ 		                        );
+
+ 		                refIds.add(refId);
+ 		            }
+ 		        }
+ 		    }
+ 		    
+ 		    
+ 		    for (Integer refId : refIds) {
+ 		        /* Insert ERP task question_id = NULL ans_id = NULL */
+ 		    	
+ 		        insertErpWorksTask(estid,refId,estimateNo,subCatId);
+ 		
+ 		        /* Create stages for this particular ref_id */
+ 		        createErpWorksStages(estid,refId,subCatId);
+ 		    }
+ 		
+ 	}
+ 	
+ 	private void insertErpWorksTask(Integer estid, Integer refId, String estimateNo, Integer subCatId) {
+
+ 		String sql = """
+ 				INSERT INTO erp_works_task
+ 				(
+ 				    estid,
+ 				    ref_id,
+ 				    estimate_no,
+ 				    sub_cat_id,
+ 				    question_id,
+ 				    ans_id
+ 				)
+ 				VALUES (?, ?, ?, ?, NULL, NULL)
+ 				""";
+
+ 		jdbcTemplate.update(sql, estid, refId, estimateNo, subCatId);
+ 	}
+ 	
+ 	private void createErpWorksStages(Integer estid, Integer refId, Integer subCatId) {
+
+ 		/* SUBCATEGORY 4 */
+
+ 		if (subCatId == 4) {
+
+ 			createStagesForSubCategory4(estid, refId);
+
+ 			return;
+ 		}
+
+ 		/*OTHER SUBCATEGORIES*/
+
+ 		String sql = """
+ 				SELECT
+ 				    tmid,
+ 				    typeofwork_id,
+ 				    code,
+ 				    taskname,
+ 				    orderby,
+ 				    remarks,
+ 				    percentage
+ 				FROM typeofwork_task_master
+ 				WHERE typeofwork_id = ?
+ 				  AND isactive = 1
+ 				  AND isdelete = 0
+ 				ORDER BY orderby
+ 				""";
+
+ 		List<Map<String, Object>> rows = jdbcTemplate.queryForList(sql, subCatId);
+
+ 		/* If matching subcategory rows are not available, use typeofwork_id = 0 */
+
+ 		if (rows.isEmpty()) {
+
+ 			rows = getDefaultTaskMasterRows();
+ 		}
+
+ 		/* Insert all matching rows into erp_works_stages */
+
+ 		insertStages(estid, refId, rows);
+ 	}
+ 	
+ 	private List<Map<String, Object>> getDefaultTaskMasterRows() {
+
+ 	    String sql = """
+ 	        SELECT
+ 	            tmid,
+ 	            typeofwork_id,
+ 	            code,
+ 	            taskname,
+ 	            orderby,
+ 	            remarks,
+ 	            percentage
+ 	        FROM typeofwork_task_master
+ 	        WHERE typeofwork_id = 0
+ 	          AND isactive = 1
+ 	          AND isdelete = 0
+ 	        ORDER BY orderby
+ 	        """;
+
+ 	    return jdbcTemplate.queryForList(sql);
+ 	}
+ 	
+ 	private void createStagesForSubCategory4(Integer estid, Integer refId) {
+
+ 		/*
+ 		  Get Question 5 answer
+ 		  Q5 = Relaying / Forming
+ 		 */
+
+ 		String question5Sql = """
+ 				SELECT am.answer
+ 				FROM addworks_details ad
+ 				INNER JOIN addworks_answer_master am
+ 				    ON am.id = ad.answer_id
+ 				WHERE ad.estid = ?
+ 				  AND ad.ref_id = ?
+ 				  AND ad.question_id = 5
+ 				  AND ad.isactive = 1
+ 				  AND ad.isdelete = 0
+ 				  AND am.isactive = 1
+ 				  AND am.isdelete = 0
+ 				LIMIT 1
+ 				""";
+
+ 		/*
+ 		  Get Question 4 answer
+ 		  Q4 = BT / CC 
+ 		 */
+
+ 		String question4Sql = """
+ 				SELECT am.answer
+ 				FROM addworks_details ad
+ 				INNER JOIN addworks_answer_master am
+ 				    ON am.id = ad.answer_id
+ 				WHERE ad.estid = ?
+ 				  AND ad.ref_id = ?
+ 				  AND ad.question_id = 4
+ 				  AND ad.isactive = 1
+ 				  AND ad.isdelete = 0
+ 				  AND am.isactive = 1
+ 				  AND am.isdelete = 0
+ 				LIMIT 1
+ 				""";
+
+ 		List<Map<String, Object>> q5Rows = jdbcTemplate.queryForList(question5Sql, estid, refId);
+
+ 		List<Map<String, Object>> q4Rows = jdbcTemplate.queryForList(question4Sql, estid, refId);
+
+ 		/*
+ 		 * If required answers are not available, directly use default stages.
+ 		 */
+
+ 		if (q5Rows.isEmpty() || q4Rows.isEmpty()) {
+
+ 			insertStages(estid, refId, getDefaultTaskMasterRows());
+
+ 			return;
+ 		}
+
+ 		String q5Answer = String.valueOf(q5Rows.get(0).get("answer")).trim();
+
+ 		String q4Answer = String.valueOf(q4Rows.get(0).get("answer")).trim();
+
+ 		/*
+ 		 * --------------------------------------------------------- Convert answers to
+ 		 * code ---------------------------------------------------------
+ 		 *
+ 		 * Relaying + BT = 4RBT Relaying + CC = 4RCC Forming + BT = 4FBT Forming + CC =
+ 		 * 4FCC
+ 		 */
+
+ 		String typeCode = getSubCategory4Code(q5Answer, q4Answer);
+
+ 		/*
+ 		 * If answer combination is unexpected, use default stages.
+ 		 */
+
+ 		if (typeCode == null) {
+
+ 			insertStages(estid, refId, getDefaultTaskMasterRows());
+
+ 			return;
+ 		}
+
+ 		/*
+ 		 * --------------------------------------------------------- Find matching code
+ 		 * in typeofwork_task_master
+ 		 * ---------------------------------------------------------
+ 		 */
+
+ 		String stageSql = """
+ 				SELECT
+ 				    tmid,
+ 				    typeofwork_id,
+ 				    code,
+ 				    taskname,
+ 				    orderby,
+ 				    remarks,
+ 				    percentage
+ 				FROM typeofwork_task_master
+ 				WHERE typeofwork_id = 4
+ 				  AND code = ?
+ 				  AND isactive = 1
+ 				  AND isdelete = 0
+ 				ORDER BY orderby
+ 				""";
+
+ 		List<Map<String, Object>> rows = jdbcTemplate.queryForList(stageSql, typeCode);
+
+ 		/*
+ 		 * Code not found -> default stages
+ 		 */
+
+ 		if (rows.isEmpty()) {
+
+ 			rows = getDefaultTaskMasterRows();
+ 		}
+
+ 		/*
+ 		 * Insert ALL matching rows.
+ 		 */
+
+ 		insertStages(estid, refId, rows);
+ 	}
+ 	
+ 	private String getSubCategory4Code(
+ 	        String q5Answer,
+ 	        String q4Answer) {
+
+ 	    String prefix = null;
+ 	    String roadType = null;
+
+ 	    /*
+ 	     * Q5
+ 	     * Relaying -> R
+ 	     * Forming  -> F
+ 	     */
+
+ 	    if ("Relaying".equalsIgnoreCase(q5Answer)) {
+
+ 	        prefix = "R";
+
+ 	    } else if ("Forming".equalsIgnoreCase(q5Answer)) {
+
+ 	        prefix = "F";
+ 	    }
+
+ 	    /*
+ 	     * Q4
+ 	     * BT -> BT
+ 	     * CC -> CC
+ 	     */
+
+ 	    if ("BT".equalsIgnoreCase(q4Answer)) {
+
+ 	        roadType = "BT";
+
+ 	    } else if ("CC".equalsIgnoreCase(q4Answer)) {
+
+ 	        roadType = "CC";
+ 	    }
+
+ 	    if (prefix == null || roadType == null) {
+
+ 	        return null;
+ 	    }
+
+ 	    return "4" + prefix + roadType;
+ 	}
+ 	
+ 	private void insertStages(Integer estid, Integer refId, List<Map<String, Object>> rows) {
+
+ 		if (rows == null || rows.isEmpty()) {
+ 			return;
+ 		}
+
+ 		String sql = """
+ 				INSERT INTO erp_works_stages
+ 				(
+ 				    estid,
+ 				    ref_id,
+ 				    code,
+ 				    stagename,
+ 				    orderby,
+ 				    remarks,
+ 				    isactive,
+ 				    isdelete,
+ 				    percentage
+ 				)
+ 				VALUES (?, ?, ?, ?, ?, ?, 1, 0, ?)
+ 				""";
+
+ 		for (Map<String, Object> row : rows) {
+
+ 			String code = row.get("code") != null ? String.valueOf(row.get("code")) : null;
+
+ 			String taskName = row.get("taskname") != null ? String.valueOf(row.get("taskname")) : "";
+
+ 			Integer orderBy = row.get("orderby") != null ? ((Number) row.get("orderby")).intValue() : 1;
+
+ 			String remarks = row.get("remarks") != null ? String.valueOf(row.get("remarks")) : "";
+
+ 			Integer percentage = row.get("percentage") != null ? ((Number) row.get("percentage")).intValue() : 0;
+
+ 			jdbcTemplate.update(sql, estid, refId, code, taskName, orderBy, remarks, percentage);
+ 		}
+ 	}
+
+ 	public void saveDetails(Map<String, Object> item, Integer createdBy, Integer estid) {
+
+ 		String sql = """
+ 				INSERT INTO addworks_details
+ 				(
+ 				    estid,
+ 				    question_id,
+ 				    answer_id,
+ 				    ref_id,
+ 				    cby
+ 				)
+ 				VALUES
+ 				(?, ?, ?, ?, ?)
+ 				""";
+
+ 		Integer questionId = Integer.valueOf(String.valueOf(item.get("question_id")));
+
+ 		Integer answerId = Integer.valueOf(String.valueOf(item.get("answer_id")));
+
+ 		Integer refId = Integer.valueOf(String.valueOf(item.get("ref_id")));
+
+ 		jdbcTemplate.update(sql, estid, questionId, answerId, refId, createdBy);
+ 	}
+
+ 	public void saveTextDetails(Map<String, Object> item, Integer createdBy, Integer estid) {
+
+ 		String sql = """
+ 				INSERT INTO addworks_text_details
+ 				(
+ 				    estid,
+ 				    question_id,
+ 				    answer,
+ 				    ref_id,
+ 				    cby
+ 				)
+ 				VALUES
+ 				(?, ?, ?, ?, ?)
+ 				""";
+
+ 		Integer questionId = Integer.valueOf(String.valueOf(item.get("question_id")));
+
+ 		String answer = item.get("answer") != null ? String.valueOf(item.get("answer")) : null;
+
+ 		Integer refId = Integer.valueOf(String.valueOf(item.get("ref_id")));
+
+ 		jdbcTemplate.update(sql, estid, questionId, answer, refId, createdBy);
+ 	}
+
+ 	public List<Map<String, Object>> getSavedWorkDetails(int estid) {
+
+ 		String sql = """
+ 				SELECT
+ 				    d.ref_id,
+ 				    q.id AS question_id,
+ 				    q.question_name,
+ 				    q.answer_type,
+ 				    q.ismandatory,
+ 				    q.input_source,
+ 				    q.api_name,
+ 				    d.answer_id,
+ 				    a.answer,
+ 				    q.orderby
+ 				FROM addworks_details d
+
+ 				INNER JOIN addworks_question_master q
+ 				    ON q.id = d.question_id
+
+ 				INNER JOIN addworks_answer_master a
+ 				    ON a.id = d.answer_id
+
+ 				WHERE d.estid = ?
+ 				  AND d.isactive = 1
+ 				  AND d.isdelete = 0
+ 				  AND q.isactive = 1
+ 				  AND q.isdelete = 0
+
+ 				UNION ALL
+
+ 				SELECT
+ 				    t.ref_id,
+ 				    q.id AS question_id,
+ 				    q.question_name,
+ 				    q.answer_type,
+ 				    q.ismandatory,
+ 				    q.input_source,
+ 				    q.api_name,
+ 				    NULL AS answer_id,
+ 				    t.answer,
+ 				    q.orderby
+ 				FROM addworks_text_details t
+
+ 				INNER JOIN addworks_question_master q
+ 				    ON q.id = t.question_id
+
+ 				WHERE t.estid = ?
+ 				  AND t.isactive = 1
+ 				  AND t.isdelete = 0
+ 				  AND q.isactive = 1
+ 				  AND q.isdelete = 0
+
+ 				ORDER BY ref_id, orderby
+ 				""";
+
+ 		List<Map<String, Object>> rows = jdbcTemplate.queryForList(sql, estid, estid);
+
+ 		/*
+ 		 * Group records by ref_id
+ 		 */
+ 		Map<Integer, Map<String, Object>> grouped = new LinkedHashMap<>();
+
+ 		for (Map<String, Object> row : rows) {
+
+ 			int refId = ((Number) row.get("ref_id")).intValue();
+
+ 			Map<String, Object> set = grouped.get(refId);
+
+ 			if (set == null) {
+
+ 				set = new LinkedHashMap<>();
+
+ 				set.put("ref_id", refId);
+
+ 				set.put("questions", new ArrayList<Map<String, Object>>());
+
+ 				grouped.put(refId, set);
+ 			}
+
+ 			@SuppressWarnings("unchecked")
+ 			List<Map<String, Object>> questions = (List<Map<String, Object>>) set.get("questions");
+
+ 			Map<String, Object> question = new LinkedHashMap<>();
+
+ 			question.put("question_id", row.get("question_id"));
+
+ 			question.put("question_name", row.get("question_name"));
+
+ 			question.put("answer_type", row.get("answer_type"));
+
+ 			question.put("ismandatory", row.get("ismandatory"));
+
+ 			question.put("input_source", row.get("input_source"));
+
+ 			question.put("api_name", row.get("api_name"));
+
+ 			question.put("answer_id", row.get("answer_id"));
+
+ 			question.put("answer", row.get("answer"));
+
+ 			questions.add(question);
+ 		}
+
+ 		return new ArrayList<>(grouped.values());
+ 	}
+
+ 	public String checkDuplicateRoad(Integer estid, List<Map<String, Object>> textDetails) {
+
+ 		if (textDetails == null || textDetails.isEmpty()) {
+ 			return null;
+ 		}
+
+ 		/*
+ 		 * Get ROAD question IDs
+ 		 */
+ 		String roadQuestionSql = """
+ 				SELECT id
+ 				FROM addworks_question_master
+ 				WHERE subcategory_id = 4
+ 				  AND input_source = 'API'
+ 				  AND api_name = 'ROAD'
+ 				  AND isactive = 1
+ 				  AND isdelete = 0
+ 				""";
+
+ 		List<Map<String, Object>> roadQuestions = jdbcTemplate.queryForList(roadQuestionSql);
+
+ 		if (roadQuestions.isEmpty()) {
+ 			return null;
+ 		}
+
+ 		Set<Integer> roadQuestionIds = new HashSet<>();
+
+ 		for (Map<String, Object> row : roadQuestions) {
+
+ 			roadQuestionIds.add(((Number) row.get("id")).intValue());
+ 		}
+
+ 		/*
+ 		 * Get existing ROAD answers
+ 		 */
+ 		String existingSql = """
+ 				SELECT answer
+ 				FROM addworks_text_details
+ 				WHERE estid = ?
+ 				  AND question_id IN (
+ 				      SELECT id
+ 				      FROM addworks_question_master
+ 				      WHERE subcategory_id = 4
+ 				        AND input_source = 'API'
+ 				        AND api_name = 'ROAD'
+ 				        AND isactive = 1
+ 				        AND isdelete = 0
+ 				  )
+ 				  AND isactive = 1
+ 				  AND isdelete = 0
+ 				""";
+
+ 		List<Map<String, Object>> existingRows = jdbcTemplate.queryForList(existingSql, estid);
+
+ 		/*
+ 		 * Check new records against existing records
+ 		 */
+ 		for (Map<String, Object> item : textDetails) {
+
+ 			Integer questionId = Integer.valueOf(String.valueOf(item.get("question_id")));
+
+ 			if (!roadQuestionIds.contains(questionId)) {
+ 				continue;
+ 			}
+
+ 			String answer = item.get("answer") != null ? String.valueOf(item.get("answer")) : "";
+
+ 			if (answer.trim().isEmpty()) {
+ 				continue;
+ 			}
+
+ 			String[] parts = answer.split(",", -1);
+
+ 			String roadId = parts[0].trim();
+
+ 			String roadName = parts.length > 1 ? parts[1].trim() : roadId;
+
+ 			/*
+ 			 * Compare with existing DB records
+ 			 */
+ 			for (Map<String, Object> existing : existingRows) {
+
+ 				String existingAnswer = existing.get("answer") != null ? String.valueOf(existing.get("answer")) : "";
+
+ 				if (existingAnswer.trim().isEmpty()) {
+ 					continue;
+ 				}
+
+ 				String[] existingParts = existingAnswer.split(",", -1);
+
+ 				String existingRoadId = existingParts[0].trim();
+
+ 				if (roadId.equals(existingRoadId)) {
+
+ 					return roadName;
+ 				}
+ 			}
+ 		}
+
+ 		return null;
+ 	}
+
+ 	@Transactional
+ 	public Map<String, Object> deleteSavedWorkDetails(int createdBy, int estid, int refId) {
+
+ 		Map<String, Object> response = new HashMap<>();
+
+ 		/*
+ 		 * First check work progress
+ 		 */
+ 		if (isWorkProgressStarted(estid, refId)) {
+
+ 			response.put("status", false);
+ 			response.put("message", "Work progress is started, Unable to edit or remove");
+
+ 			return response;
+ 		}
+
+ 		/*
+ 		 * 1. Deactivate addworks_details
+ 		 */
+ 		String detailsSql = """
+ 				UPDATE addworks_details
+ 				SET
+ 				    updated_by = ?,
+ 				    updated_date = NOW(),
+ 				    isactive = 0,
+ 				    isdelete = 1
+ 				WHERE estid = ?
+ 				  AND ref_id = ?
+ 				  AND isactive = 1
+ 				  AND isdelete = 0
+ 				""";
+
+ 		int detailsUpdated = jdbcTemplate.update(detailsSql, createdBy, estid, refId);
+
+ 		/*
+ 		 * 2. Deactivate addworks_text_details
+ 		 */
+ 		String textDetailsSql = """
+ 				UPDATE addworks_text_details
+ 				SET
+ 				    updated_by = ?,
+ 				    updated_date = NOW(),
+ 				    isactive = 0,
+ 				    isdelete = 1
+ 				WHERE estid = ?
+ 				  AND ref_id = ?
+ 				  AND isactive = 1
+ 				  AND isdelete = 0
+ 				""";
+
+ 		int textDetailsUpdated = jdbcTemplate.update(textDetailsSql, createdBy, estid, refId);
+
+ 		/*
+ 		 * 3. Deactivate erp_works_task
+ 		 */
+ 		String taskSql = """
+ 				UPDATE erp_works_task
+ 				SET
+ 				    isactive = 0,
+ 				    isdelete = 1
+ 				WHERE estid = ?
+ 				  AND ref_id = ?
+ 				  AND isactive = 1
+ 				  AND isdelete = 0
+ 				""";
+
+ 		int taskUpdated = jdbcTemplate.update(taskSql, estid, refId);
+
+ 		/*
+ 		 * 4. Deactivate erp_works_stages
+ 		 */
+ 		String stagesSql = """
+ 				UPDATE erp_works_stages
+ 				SET
+ 				    isactive = 0,
+ 				    isdelete = 1
+ 				WHERE estid = ?
+ 				  AND ref_id = ?
+ 				  AND isactive = 1
+ 				  AND isdelete = 0
+ 				""";
+
+ 		int stagesUpdated = jdbcTemplate.update(stagesSql, estid, refId);
+
+ 		boolean deleted = detailsUpdated > 0 || textDetailsUpdated > 0 || taskUpdated > 0 || stagesUpdated > 0;
+
+ 		response.put("status", deleted);
+
+ 		response.put("message", deleted ? "Work details removed successfully" : "Work details not found");
+
+ 		return response;
+ 	}
+
+ 	public List<Map<String, Object>> getEditWorkDetails(int estid, int refId, int subcategoryId) {
+
+ 		/* Get questions  for the subcategory */
+
+ 		String questionSql = """
+ 				SELECT
+ 				    id,
+ 				    subcategory_id,
+ 				    issub,
+ 				    question_name,
+ 				    answer_type,
+ 				    ismandatory,
+ 				    allow_zero,
+ 				    orderby,
+ 				    remarks,
+ 				    input_source,
+ 				    api_name
+ 				FROM addworks_question_master
+ 				WHERE subcategory_id = ?
+ 				  AND issub = 0
+ 				  AND isactive = 1
+ 				  AND isdelete = 0
+ 				ORDER BY orderby
+ 				""";
+
+ 		List<Map<String, Object>> questions = jdbcTemplate.queryForList(questionSql, subcategoryId);
+
+ 		String savedSql = """
+ 				SELECT
+ 				    question_id,
+ 				    answer_id,
+ 				    answer,
+ 				    source_type
+ 				FROM
+ 				(
+ 				    SELECT
+ 				        question_id,
+ 				        answer_id,
+ 				        NULL AS answer,
+ 				        'MASTER' AS source_type
+ 				    FROM addworks_details
+ 				    WHERE estid = ?
+ 				      AND ref_id = ?
+ 				      AND isactive = 1
+ 				      AND isdelete = 0
+
+ 				    UNION ALL
+
+ 				    SELECT
+ 				        question_id,
+ 				        NULL AS answer_id,
+ 				        answer,
+ 				        'TEXT' AS source_type
+ 				    FROM addworks_text_details
+ 				    WHERE estid = ?
+ 				      AND ref_id = ?
+ 				      AND isactive = 1
+ 				      AND isdelete = 0
+ 				) x
+ 				""";
+
+ 		List<Map<String, Object>> savedRows = jdbcTemplate.queryForList(savedSql, estid, refId, estid, refId);
+
+
+ 		Map<Integer, Map<String, Object>> savedMap = new HashMap<>();
+
+ 		for (Map<String, Object> row : savedRows) {
+
+ 			Integer questionId = ((Number) row.get("question_id")).intValue();
+
+ 			savedMap.put(questionId, row);
+ 		}
+
+
+ 		String answerSql = """
+ 				SELECT
+ 				    id,
+ 				    question_id,
+ 				    answer,
+ 				    orderby,
+ 				    remarks
+ 				FROM addworks_answer_master
+ 				WHERE question_id = ?
+ 				  AND isactive = 1
+ 				  AND isdelete = 0
+ 				ORDER BY orderby
+ 				""";
+
+ 		for (Map<String, Object> question : questions) {
+
+ 			int questionId = ((Number) question.get("id")).intValue();
+
+ 			String inputSource = String.valueOf(question.get("input_source"));
+
+ 			String answerType = String.valueOf(question.get("answer_type"));
+
+ 			/*
+ 			 * MASTER dropdown / radio
+ 			 */
+ 			if ("MASTER".equalsIgnoreCase(inputSource)
+ 					&& ("radio".equalsIgnoreCase(answerType) || "dropdown".equalsIgnoreCase(answerType))) {
+
+ 				question.put("answers", jdbcTemplate.queryForList(answerSql, questionId));
+
+ 			} else {
+
+ 				question.put("answers", new ArrayList<Map<String, Object>>());
+ 			}
+
+ 			/*
+ 			 * Get saved answer
+ 			 */
+ 			Map<String, Object> saved = savedMap.get(questionId);
+
+ 			if (saved != null) {
+
+ 				question.put("saved_answer_id", saved.get("answer_id"));
+
+ 				question.put("saved_answer", saved.get("answer"));
+
+ 			} else {
+
+ 				question.put("saved_answer_id", null);
+
+ 				question.put("saved_answer", null);
+ 			}
+ 		}
+
+ 		return questions;
+ 	}
+
+ 	public String checkDuplicateRoadForUpdate(int estid, int refId, List<Map<String, Object>> textDetails) {
+
+ 		if (textDetails == null || textDetails.isEmpty()) {
+ 			return null;
+ 		}
+
+ 		Set<String> requestRoadIds = new HashSet<>();
+
+ 		for (Map<String, Object> row : textDetails) {
+
+ 			Integer questionId = Integer.valueOf(String.valueOf(row.get("question_id")));
+
+ 			String answer = row.get("answer") == null ? null : String.valueOf(row.get("answer"));
+
+ 			if (answer == null || answer.trim().isEmpty()) {
+ 				continue;
+ 			}
+
+ 			String apiName = jdbcTemplate.queryForObject("""
+ 					SELECT api_name
+ 					FROM addworks_question_master
+ 					WHERE id = ?
+ 					""", String.class, questionId);
+
+ 			if (!"ROAD".equalsIgnoreCase(apiName)) {
+ 				continue;
+ 			}
+
+ 			String[] parts = answer.split(",", -1);
+
+ 			String roadId = parts[0].trim();
+
+ 			String roadName = parts.length > 1 ? parts[1].trim() : roadId;
+
+ 			/*
+ 			 * Duplicate inside same update request
+ 			 */
+ 			if (!requestRoadIds.add(roadId)) {
+ 				return roadName;
+ 			}
+
+ 			/*
+ 			 * Check other ref_ids
+ 			 */
+ 			String existingSql = """
+ 					SELECT COUNT(*)
+ 					FROM addworks_text_details td
+ 					JOIN addworks_question_master qm
+ 					    ON qm.id = td.question_id
+ 					WHERE td.estid = ?
+ 					  AND td.ref_id <> ?
+ 					  AND td.isactive = 1
+ 					  AND td.isdelete = 0
+ 					  AND qm.input_source = 'API'
+ 					  AND qm.api_name = 'ROAD'
+ 					  AND SUBSTRING_INDEX(td.answer, ',', 1) = ?
+ 					""";
+
+ 			Integer count = jdbcTemplate.queryForObject(existingSql, Integer.class, estid, refId, roadId);
+
+ 			if (count != null && count > 0) {
+ 				return roadName;
+ 			}
+ 		}
+
+ 		return null;
+ 	}
+
+ 	@Transactional
+ 	public Map<String, Object>  updateSavedWorkDetails(
+ 	        int updatedBy,
+ 	        int estid,
+ 	        int refId,
+ 	        String estimateNo,
+ 	        int subCatId,
+ 	        List<Map<String, Object>> details,
+ 	        List<Map<String, Object>> textDetails) {
+
+ 		Map<String, Object> response = new HashMap<>();
+ 		
+ 		if (isWorkProgressStarted(estid, refId)) {
+
+ 			response.put("status", false);
+ 			response.put("message", "Work progress is started, Unable to edit or remove");
+
+ 			return response;
+ 		}
+ 		
+ 	    /*
+ 	      STEP 1
+ 	      Log current Add Works details
+ 	     */
+
+ 		logAddWorksDetails(updatedBy, estid, refId);
+
+
+ 	    /*	     
+ 	      STEP 2
+ 	      Log current Add Works text details
+ 	     */
+
+ 		logAddWorksTextDetails(updatedBy, estid, refId);
+
+
+ 	    /*	     
+ 	      STEP 3
+ 	      Log current ERP task	     
+ 	     */
+
+ 		logErpWorksTask(updatedBy, estid, refId);
+
+
+ 	    /*	     
+ 	      STEP 4
+ 	      Log current ERP stages	     
+ 	     */
+
+ 	     logErpWorksStages(updatedBy, estid, refId);
+
+
+ 	    /*	     
+ 	      STEP 5
+ 	      Update Add Works MASTER details	     
+ 	     */
+
+ 		updateAddWorksDetails(updatedBy, estid, refId, details);
+
+
+ 	    /*	     
+ 	      STEP 6
+ 	      Update Add Works TEXT/API details	     
+ 	     */
+
+ 		updateAddWorksTextDetails(updatedBy, estid, refId, textDetails);
+
+
+ 	    /*	     
+ 	      STEP 7
+ 	      Update ERP task
+ 	      Only one task record for this estid + ref_id.
+ 	      question_id and ans_id remain NULL.
+ 	     
+ 	     */
+
+ 		updateErpWorksTask(estid, refId, estimateNo, subCatId);
+
+
+ 	    /*	     
+ 	      STEP 8
+ 	      Deactivate old stages	     
+ 	     */
+
+ 		deactivateOldStages(estid, refId);
+
+
+ 	    /*	     
+ 	      STEP 9
+ 	      Create stages again based on updated answers	     
+ 	     */
+
+ 		createErpWorksStages(estid, refId, subCatId);
+ 		
+ 		response.put("status", true);
+ 		response.put("message", "Work details updated successfully");
+
+ 		return response;
+ 	}
+ 	
+ 	private void logAddWorksDetails(int loggedBy, int estid, int refId) {
+
+ 		String sql = """
+ 				INSERT INTO addworks_details_log
+ 				(
+ 				    adid,
+ 				    estid,
+ 				    question_id,
+ 				    answer_id,
+ 				    ref_id,
+ 				    cby,
+ 				    updated_by,
+ 				    updated_date,
+ 				    isactive,
+ 				    isdelete,
+ 				    cdate,
+ 				    logged_by,
+ 				    logged_date
+ 				)
+ 				SELECT
+ 				    id,
+ 				    estid,
+ 				    question_id,
+ 				    answer_id,
+ 				    ref_id,
+ 				    cby,
+ 				    updated_by,
+ 				    updated_date,
+ 				    isactive,
+ 				    isdelete,
+ 				    cdate,
+ 				    ?,
+ 				    NOW()
+ 				FROM addworks_details
+ 				WHERE estid = ?
+ 				  AND ref_id = ?
+ 				  AND isactive = 1
+ 				  AND isdelete = 0
+ 				""";
+
+ 		jdbcTemplate.update(sql, loggedBy, estid, refId);
+ 	}
+
+ 	private void logAddWorksTextDetails(int loggedBy, int estid, int refId) {
+
+ 		String sql = """
+ 				INSERT INTO addworks_text_details_log
+ 				(
+ 				    atdid,
+ 				    estid,
+ 				    question_id,
+ 				    answer,
+ 				    ref_id,
+ 				    cby,
+ 				    updated_by,
+ 				    updated_date,
+ 				    isactive,
+ 				    isdelete,
+ 				    cdate,
+ 				    logged_by,
+ 				    logged_date
+ 				)
+ 				SELECT
+ 				    id,
+ 				    estid,
+ 				    question_id,
+ 				    answer,
+ 				    ref_id,
+ 				    cby,
+ 				    updated_by,
+ 				    updated_date,
+ 				    isactive,
+ 				    isdelete,
+ 				    cdate,
+ 				    ?,
+ 				    NOW()
+ 				FROM addworks_text_details
+ 				WHERE estid = ?
+ 				  AND ref_id = ?
+ 				  AND isactive = 1
+ 				  AND isdelete = 0
+ 				""";
+
+ 		jdbcTemplate.update(sql, loggedBy, estid, refId);
+ 	}
+
+ 	private void logErpWorksTask(int loggedBy, int estid, int refId) {
+
+ 		String sql = """
+ 				INSERT INTO erp_works_task_log
+ 				(
+ 				    task_id,
+ 				    estid,
+ 				    ref_id,
+ 				    estimate_no,
+ 				    sub_cat_id,
+ 				    question_id,
+ 				    ans_id,
+ 				    remarks,
+ 				    cdate,
+ 				    isactive,
+ 				    isdelete,
+ 				    percentage,
+ 				    logged_by,
+ 				    logged_date
+ 				)
+ 				SELECT
+ 				    id,
+ 				    estid,
+ 				    ref_id,
+ 				    estimate_no,
+ 				    sub_cat_id,
+ 				    question_id,
+ 				    ans_id,
+ 				    remarks,
+ 				    cdate,
+ 				    isactive,
+ 				    isdelete,
+ 				    percentage,
+ 				    ?,
+ 				    NOW()
+ 				FROM erp_works_task
+ 				WHERE estid = ?
+ 				  AND ref_id = ?
+ 				  AND isactive = 1
+ 				  AND isdelete = 0
+ 				""";
+
+ 		jdbcTemplate.update(sql, loggedBy, estid, refId);
+ 	}
+
+ 	private void logErpWorksStages(int loggedBy, int estid, int refId) {
+
+ 		String sql = """
+ 				INSERT INTO erp_works_stages_log
+ 				(
+ 				    stage_id,
+ 				    estid,
+ 				    ref_id,
+ 				    code,
+ 				    stagename,
+ 				    orderby,
+ 				    remarks,
+ 				    isactive,
+ 				    isdelete,
+ 				    percentage,
+ 				    logged_by,
+ 				    logged_date
+ 				)
+ 				SELECT
+ 				    tmid,
+ 				    estid,
+ 				    ref_id,
+ 				    code,
+ 				    stagename,
+ 				    orderby,
+ 				    remarks,
+ 				    isactive,
+ 				    isdelete,
+ 				    percentage,
+ 				    ?,
+ 				    NOW()
+ 				FROM erp_works_stages
+ 				WHERE estid = ?
+ 				  AND ref_id = ?
+ 				  AND isactive = 1
+ 				  AND isdelete = 0
+ 				""";
+
+ 		jdbcTemplate.update(sql, loggedBy, estid, refId);
+ 	}
+
+ 	private void updateAddWorksDetails(int updatedBy, int estid, int refId, List<Map<String, Object>> details) {
+
+ 		if (details == null || details.isEmpty()) {
+ 			return;
+ 		}
+
+ 		String findSql = """
+ 				SELECT id
+ 				FROM addworks_details
+ 				WHERE estid = ?
+ 				  AND question_id = ?
+ 				  AND ref_id = ?
+ 				  AND isactive = 1
+ 				  AND isdelete = 0
+ 				LIMIT 1
+ 				""";
+
+ 		String updateSql = """
+ 				UPDATE addworks_details
+ 				SET
+ 				    answer_id = ?,
+ 				    updated_by = ?,
+ 				    updated_date = NOW()
+ 				WHERE id = ?
+ 				  AND estid = ?
+ 				  AND ref_id = ?
+ 				  AND isactive = 1
+ 				  AND isdelete = 0
+ 				""";
+
+ 		for (Map<String, Object> row : details) {
+
+ 			Integer questionId = Integer.valueOf(String.valueOf(row.get("question_id")));
+
+ 			Integer answerId = Integer.valueOf(String.valueOf(row.get("answer_id")));
+
+ 			List<Map<String, Object>> existingRows = jdbcTemplate.queryForList(findSql, estid, questionId, refId);
+
+ 			if (!existingRows.isEmpty()) {
+
+ 				Integer id = ((Number) existingRows.get(0).get("id")).intValue();
+
+ 				jdbcTemplate.update(updateSql, answerId, updatedBy, id, estid, refId);
+ 			}
+ 		}
+ 	}
+
+ 	private void updateAddWorksTextDetails(int updatedBy, int estid, int refId, List<Map<String, Object>> textDetails) {
+
+ 		if (textDetails == null || textDetails.isEmpty()) {
+ 			return;
+ 		}
+
+ 		String findSql = """
+ 				SELECT id
+ 				FROM addworks_text_details
+ 				WHERE estid = ?
+ 				  AND question_id = ?
+ 				  AND ref_id = ?
+ 				  AND isactive = 1
+ 				  AND isdelete = 0
+ 				LIMIT 1
+ 				""";
+
+ 		String updateSql = """
+ 				UPDATE addworks_text_details
+ 				SET
+ 				    answer = ?,
+ 				    updated_by = ?,
+ 				    updated_date = NOW()
+ 				WHERE id = ?
+ 				  AND estid = ?
+ 				  AND ref_id = ?
+ 				  AND isactive = 1
+ 				  AND isdelete = 0
+ 				""";
+
+ 		for (Map<String, Object> row : textDetails) {
+
+ 			Integer questionId = Integer.valueOf(String.valueOf(row.get("question_id")));
+
+ 			String answer = row.get("answer") == null ? null : String.valueOf(row.get("answer"));
+
+ 			List<Map<String, Object>> existingRows = jdbcTemplate.queryForList(findSql, estid, questionId, refId);
+
+ 			if (!existingRows.isEmpty()) {
+
+ 				Integer id = ((Number) existingRows.get(0).get("id")).intValue();
+
+ 				jdbcTemplate.update(updateSql, answer, updatedBy, id, estid, refId);
+ 			}
+ 		}
+ 	}
+
+ 	private void updateErpWorksTask(int estid, int refId, String estimateNo, int subCatId) {
+
+ 		String sql = """
+ 				UPDATE erp_works_task
+ 				SET
+ 				    estimate_no = ?,
+ 				    sub_cat_id = ?,
+ 				    question_id = NULL,
+ 				    ans_id = NULL
+ 				WHERE estid = ?
+ 				  AND ref_id = ?
+ 				  AND isactive = 1
+ 				  AND isdelete = 0
+ 				""";
+
+ 		int updated = jdbcTemplate.update(sql, estimateNo, subCatId, estid, refId);
+
+ 		/*
+ 		 * Normally the task must already exist because this is an update operation.
+ 		 */
+ 		if (updated == 0) {
+
+ 			String insertSql = """
+ 					INSERT INTO erp_works_task
+ 					(
+ 					    estid,
+ 					    ref_id,
+ 					    estimate_no,
+ 					    sub_cat_id,
+ 					    question_id,
+ 					    ans_id
+ 					)
+ 					VALUES (?, ?, ?, ?, NULL, NULL)
+ 					""";
+
+ 			jdbcTemplate.update(insertSql, estid, refId, estimateNo, subCatId);
+ 		}
+ 	}
+ 	
+ 	private void deactivateOldStages(int estid, int refId) {
+
+ 		String sql = """
+ 				UPDATE erp_works_stages
+ 				SET
+ 				    isactive = 0,
+ 				    isdelete = 1
+ 				WHERE estid = ?
+ 				  AND ref_id = ?
+ 				  AND isactive = 1
+ 				  AND isdelete = 0
+ 				""";
+
+ 		jdbcTemplate.update(sql, estid, refId);
+ 	}
+ 	
+ 	public boolean isWorkProgressStarted(int estid, int refId) {
+
+ 		String sql = """
+ 				SELECT COUNT(*)
+ 				FROM erp_task_data
+ 				WHERE estid = ?
+ 				  AND ref_id = ?
+ 				  AND isactive = 1
+ 				""";
+
+ 		Integer count = jdbcTemplate.queryForObject(sql, Integer.class, estid, refId);
+
+ 		return count != null && count > 0;
+ 	}
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 5c2b240..2f562e6 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,5 +1,5 @@
-spring.profiles.active=local
-#spring.profiles.active=production
+#spring.profiles.active=local
+spring.profiles.active=production
 #For Server production
 #assets.base-url=/gcc/assets/
 #For local test
diff --git a/src/main/resources/templates/fragments/modules/works/edit_stage_script.html b/src/main/resources/templates/fragments/modules/works/edit_stage_script.html
index 98a867e..c528194 100644
--- a/src/main/resources/templates/fragments/modules/works/edit_stage_script.html
+++ b/src/main/resources/templates/fragments/modules/works/edit_stage_script.html
@@ -56,7 +56,7 @@ function get_works_stage_data_data(){
 function get_works_stage_details() {
     
 	var formData = new FormData();
-	var apiUrl = '/gcc/works/api/estimates/getUserEstWorkDetailsById?estid='+estid;
+	var apiUrl = '/gcc/api/works/estimates/getUserEstWorkDetailsById?estid='+estid;
     // Return a Promise
     return new Promise(function(resolve, reject) {
         $.ajax({
diff --git a/src/main/resources/templates/fragments/modules/works/script.html b/src/main/resources/templates/fragments/modules/works/script.html
index d644483..b3ea419 100644
--- a/src/main/resources/templates/fragments/modules/works/script.html
+++ b/src/main/resources/templates/fragments/modules/works/script.html
@@ -26,7 +26,7 @@
     }
 
     function loadScheme() {
-        fetch('/gcc/works/api/estimates/getSchemeList')
+        fetch('/gcc/api/works/estimates/getSchemeList')
             .then(response => response.json())
             .then(data => {
                 let schemeDropdown = document.getElementById('erpscheme');
@@ -43,7 +43,7 @@
     }
 
     function loadCategory() {
-        fetch('/gcc/works/api/estimates/getCategoryList')
+        fetch('/gcc/api/works/estimates/getCategoryList')
             .then(response => response.json())
             .then(data => {
                 let categoryDropdown = document.getElementById('erpcategory');
@@ -60,7 +60,7 @@
     }
 
     function loadSubCategory() {
-        fetch('/gcc/works/api/estimates/getSubCategoryList')
+        fetch('/gcc/api/works/estimates/getSubCategoryList')
             .then(response => response.json())
             .then(data => {
                 let subCategoryDropdown = document.getElementById('erpsubcategory');
@@ -77,7 +77,7 @@
     }
 
     function loadDepartment() {
-        fetch('/gcc/works/api/estimates/getDepartmentList')
+        fetch('/gcc/api/works/estimates/getDepartmentList')
             .then(response => response.json())
             .then(data => {
                 let departmentDropdown = document.getElementById('erpdepartment');
@@ -94,7 +94,7 @@
     }
 
     function loadSource() {
-        fetch('/gcc/works/api/estimates/getSourceofFundList')
+        fetch('/gcc/api/works/estimates/getSourceofFundList')
             .then(response => response.json())
             .then(data => {
                 let SourceDropDown = document.getElementById('erpfundsource');
@@ -131,7 +131,7 @@
     }
 
     function loadDepartmentFilter() {
-        fetch('/gcc/works/api/estimates/getDepartmentList')
+        fetch('/gcc/api/works/estimates/getDepartmentList')
             .then(response => response.json())
             .then(data => {
                 let departmentDropdown = document.getElementById('departmentf');
@@ -148,7 +148,7 @@
     }
 
     function loadSourceFilter() {
-        fetch('/gcc/works/api/estimates/getSourceofFundList')
+        fetch('/gcc/api/works/estimates/getSourceofFundList')
             .then(response => response.json())
             .then(data => {
                 let SourceDropDown = document.getElementById('fundsourcef');
diff --git a/src/main/resources/templates/fragments/modules/works/user_works_update_script.html b/src/main/resources/templates/fragments/modules/works/user_works_update_script.html
index d610397..de388c1 100644
--- a/src/main/resources/templates/fragments/modules/works/user_works_update_script.html
+++ b/src/main/resources/templates/fragments/modules/works/user_works_update_script.html
@@ -179,7 +179,7 @@
 			function get_works_update_details() {
 			    
 				var formData = new FormData();
-				var apiUrl = '/gcc/works/api/estimates/getUserEstWorkDetailsById?estid='+estid;
+				var apiUrl = '/gcc/api/works/estimates/getUserEstWorkDetailsById?estid='+estid;
 			    // Return a Promise
 			    return new Promise(function(resolve, reject) {
 			        $.ajax({
@@ -193,13 +193,11 @@
 			                	resolve(jsonResponse);
 							}else{
 								//call_petition_search_from("Invalid Petition Number: Please provide a valid petition number.");
-								console.log('Fetched petition details ('+petitionNo+') Is null:');
 							}
 			                
 			            },
 			            error: function(xhr, status, error) {
 			                // Reject the Promise with the error message
-			                console.error('Error fetching petition details ('+petitionNo+'):', error.message);
 			                reject(error);
 			            }
 			        });
diff --git a/src/main/resources/templates/fragments/modules/works/user_works_view_script.html b/src/main/resources/templates/fragments/modules/works/user_works_view_script.html
index c37c4b3..51c5b37 100644
--- a/src/main/resources/templates/fragments/modules/works/user_works_view_script.html
+++ b/src/main/resources/templates/fragments/modules/works/user_works_view_script.html
@@ -174,7 +174,7 @@
 			function get_works_details() {
 			    
 				var formData = new FormData();
-				var apiUrl = '/gcc/works/api/estimates/getUserEstWorkDetailsById?estid='+estid;
+				var apiUrl = '/gcc/api/works/estimates/getUserEstWorkDetailsById?estid='+estid;
 			    // Return a Promise
 			    return new Promise(function(resolve, reject) {
 			        $.ajax({
@@ -253,7 +253,7 @@
 		}
 		function getStageList(estid){
 			var formData = new FormData();
-			var apiUrl = '/gcc/works/api/estimates/getUserEstWorkStageDetailsByEstid?estid='+estid;
+			var apiUrl = '/gcc/api/works/estimates/getUserEstWorkStageDetailsByEstid?estid='+estid;
 		    // Return a Promise
 		    return new Promise(function(resolve, reject) {
 		        $.ajax({
diff --git a/src/main/resources/templates/fragments/modules/works/works_view_script.html b/src/main/resources/templates/fragments/modules/works/works_view_script.html
index bb2402e..b4381f6 100644
--- a/src/main/resources/templates/fragments/modules/works/works_view_script.html
+++ b/src/main/resources/templates/fragments/modules/works/works_view_script.html
@@ -62,7 +62,7 @@
 			function get_works_details() {
 			    
 				var formData = new FormData();
-				var apiUrl = '/gcc/works/api/estimates/getestimateworkdetailsById?estid='+estid;
+				var apiUrl = '/gcc/api/works/estimates/getestimateworkdetailsById?estid='+estid;
 			    // Return a Promise
 			    return new Promise(function(resolve, reject) {
 			        $.ajax({
diff --git a/src/main/resources/templates/modules/works/addworkspage.html b/src/main/resources/templates/modules/works/addworkspage.html
new file mode 100644
index 0000000..b0e0885
--- /dev/null
+++ b/src/main/resources/templates/modules/works/addworkspage.html
@@ -0,0 +1,3931 @@
+<!DOCTYPE html>
+<html lang="en" dir="">
+<html xmlns:th="http://www.thymeleaf.org">
+<link rel="stylesheet"
+      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css">
+<link rel="stylesheet"
+      href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css">
+
+<head th:replace="~{fragments/modules/base/head :: head}"></head>
+<style>
+    .is-invalid {
+        border: 2px solid red !important;
+        background-color: #ffcccc !important;
+    }
+
+    .checkbox-large {
+        width: 20px;
+        height: 20px;
+    }
+
+    .readonly-select {
+        pointer-events: none; /* Prevent user interaction */
+        background-color: #e9ecef; /* Light grey background (like disabled) */
+    }
+</style>
+
+<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="fa fa-list-alt bg-blue"></i>
+                                <div class="d-inline">
+                                    <h5>Works Module - Estimates</h5>                                                                    
+                                </div>
+                            </div>
+                        </div>                      
+                    </div>
+                </div>
+                <hr>
+
+                
+                <div class="col-md-14">
+				    <div class="card">
+				
+				        <div class="card-header">
+				            <b>Estimates Information:</b>
+				            <span class="text-primary" id="estimateNo"></span>
+				        </div>
+							
+						<div class="card-body">	
+				
+				        <div class="table-responsive">
+				            <table class="table table-bordered table-sm mb-0">
+				
+				                <tbody>
+				
+				                    <tr>
+				                        <th style="width: 15%;">Estimates No:</th>
+				                        <td style="width: 35%;" id="estimate_no"></td>
+				
+				                        <th style="width: 15%;">Estimate Date:</th>
+				                        <td style="width: 35%;" id="estimate_date"></td>
+				                    </tr>
+				
+				                    <tr>
+				                        <th>Zone:</th>
+				                        <td id="zone"></td>
+				
+				                        <th>Ward:</th>
+				                        <td id="ward"></td>
+				                    </tr>
+				
+				                    <tr>
+				                        <th>Project Name:</th>
+				                        <td colspan="3" id="project_name"></td>
+				                    </tr>
+				
+				                    <tr>
+				                        <th>Location:</th>
+				                        <td colspan="3" id="location"></td>
+				                    </tr>
+				
+				                    <tr>
+				                        <th>Department:</th>
+				                        <td id="department"></td>
+				
+				                        <th>Estimate Amount:</th>
+				                        <td id="estimation_amount"></td>
+				                    </tr>
+				
+				                    <tr>
+				                        <th>Source of Fund:</th>
+				                        <td id="fund_source"></td>
+				
+				                        <th>Scheme:</th>
+				                        <td id="scheme"></td>
+				                    </tr>
+				
+				                    <tr>
+				                        <th>Category:</th>
+				                        <td id="category"></td>
+				
+				                        <th>Sub-Category:</th>
+				                        <td id="sub_category"></td>
+				                    </tr>
+				
+				                </tbody>
+				
+				            </table>
+				        </div>
+				        
+				        </div>
+				
+				    </div>
+				</div>
+                
+                <br>
+                             
+                <div class="col-md-14">
+				    <div class="card" id="viewdetailscard">
+				    	<div class="card-header d-flex justify-content-between align-items-center">            
+			            <span><b>Work Details</b></span>
+
+						 <span id="totalNoOfdata" class="badge badge-primary">0</span>
+						
+			        	</div>
+				        <div class="card-body">
+				        
+				        </div>
+				    	
+				    </div>
+				</div>
+                
+                <div class="col-md-14">
+				    <div class="card" id="getdetailscard">
+				    	<div class="card-header d-flex justify-content-between align-items-center">
+            
+			            <span><b>Add Work Details</b></span>
+			
+			            <button type="button" class="btn btn-primary btn-sm px-3" id="addMoreBtn"><i class="fa-solid fa-plus mr-1"></i>Add More</button>
+			
+			        	</div>
+				        <div class="card-body">
+				        
+				        <div id="workSetsContainer"></div>
+				        
+				        
+				        <div class="mt-3 text-center">
+
+			                <button type="button" class="btn btn-primary" id="saveWorksBtn">
+			                    Save Works Details
+			                </button>
+			
+			                <button type="button" class="btn btn-outline-primary ml-2" id="backBtn">
+			                    Back
+			                </button>
+			
+			            </div>
+				        
+				        </div>
+				    	
+				    </div>
+				</div>
+
+            </div>
+
+            
+        </div>
+        
+        <div id="pageLoader" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(255, 255, 255, 0.8); z-index: 9999; text-align: center;">
+				<div style="position: relative; top: 50%; transform: translateY(-50%);">
+					<div class="spinner-border text-primary" role="status" style="width: 3rem; height: 3rem;">
+						<span class="sr-only">Loading...</span>
+					</div>
+					<!-- Add the 'Please wait' text below the spinner -->
+					<p style="margin-top: 1rem; font-size: 1.2rem; color: #007bff;">Please wait...</p>
+				</div>
+			</div>
+			
+			
+			<div class="modal fade" id="editWorkModal" tabindex="-1" role="dialog" aria-hidden="true">				
+				    <div class="modal-dialog modal-lg" role="document">				
+				        <div class="modal-content">				
+				            <div class="modal-header">
+				                <h5 class="modal-title">
+				                    Edit <span id="editWorkTitle"></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="editQuestionContainer" class="row">
+				                </div>				
+				            </div>				
+				            <div class="modal-footer">				
+				                <button type="button" class="btn btn-secondary" data-dismiss="modal"> Cancel</button>				
+				                <button type="button" class="btn btn-primary" id="updateWorkBtn">Update</button>				
+				            </div>
+				
+				        </div>
+				
+				    </div>
+				</div>
+			
+			
+			
+        <footer th:replace="~{fragments/modules/base/footer :: footer}"></footer>
+    </div>
+</div>
+
+	<div th:replace="~{fragments/modules/works/modal-box :: div}"></div> 
+	
+    <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
+    
+    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
+
+    <script th:replace="~{fragments/modules/base/script :: script}"></script>
+    <script th:replace="~{fragments/modules/works/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 createdBy = /*[[${LoginUserId}]]*/'';
+	var estid = /*[[${estid}]]*/'';
+	var estimate_no=/*[[${estimate_no}]]*/'';
+	var subcategory_id=/*[[${sub_category_id}]]*/'';
+	var sub_category=/*[[${sub_category}]]*/'';
+	
+	
+	var questionList = [];
+
+	var existingRefIds = [];
+	
+	var savedWorkCount = 0;
+	
+	var editEstId = null;
+	var editRefId = null;
+	var editQuestionList = [];
+	
+	var savedWorkData = [];
+
+	//var nextRefId = 1;
+	
+	function get_work_details(estid,estimate_no) {
+		
+		$("#pageLoader").show();
+		
+		//console.log("estid="+estid);
+
+	    var apiUrl = '/gcc/api/works/estimates/getWorkDetailsById?estid='
+	                 + encodeURIComponent(estid);
+
+	    $.ajax({
+	        url: apiUrl,
+	        type: 'GET',
+	        dataType: 'json',
+
+	        success: function(response) {
+	        	
+	        	$("#pageLoader").hide();
+
+	            if (response && response.length > 0) {
+
+	                var data = response[0];
+
+	                // Estimate No
+	                $("#estimateNo").text(" - " + (data.estimate_no || ""));
+	                $("#estimate_no").text(data.estimate_no || "-");
+
+	                // Estimate Date
+	                $("#estimate_date").text(
+	                    formatDate(data.estimate_date)
+	                );
+
+	                // Zone
+	                $("#zone").text(
+	                    data.zone ? "Zone - " + data.zone : "-"
+	                );
+
+	                // Ward
+	                $("#ward").text(data.ward || "-");
+
+	                // Project Name
+	                $("#project_name").text(data.project_name || "-");
+
+	                // Location
+	                $("#location").text(data.location || "-");
+
+	                // Department
+	                $("#department").text(data.department || "-");
+
+	                // Estimate Amount
+	                $("#estimation_amount").text(
+	                    formatAmount(data.estimation_amount)
+	                );
+
+	                // Source of Fund
+	                $("#fund_source").text(data.fund_source || "-");
+
+	                // Scheme
+	                $("#scheme").text(data.scheme || "-");
+
+	                // Category
+	                $("#category").text(data.category || "-");
+
+	                // Sub Category
+	                $("#sub_category").text(data.sub_category || "-");
+
+	            }
+	        },
+
+	        error: function(xhr, status, error) {
+	        	
+	        	$("#pageLoader").hide();
+
+	            console.log("Error loading estimate details:", error);
+
+	        }
+	    });
+	}
+	
+	function initializeAddWorkSets() {
+		
+		/* if (!questionList || questionList.length === 0) {
+
+	        Swal.fire({
+	            icon: "warning",
+	            title: "Questions Not Added",
+	            text: "Questions Not Added for this subcategory.",
+	            confirmButtonText: "OK"
+	        });
+
+	        return;
+	    } */
+
+	    if (existingRefIds.length === 0) {
+
+	        addWorkSet();
+
+	    }
+
+	}
+	
+	function loadQuestionMaster() {
+		
+		$("#pageLoader").show();
+
+	    $.ajax({
+	        url: '/gcc/api/works/estimates/addWorksQuestions',
+	        type: 'GET',
+	        data: {
+	            subcategory_id: subcategory_id
+	        },
+	        dataType: 'json',
+
+	        success: function(response) {
+	        	
+	        	$("#pageLoader").hide();
+
+	            questionList = response || [];
+
+	            console.log("Question List:", questionList);
+	            initializeAddWorkSets();
+
+
+	        },
+
+	        error: function(xhr, status, error) {
+	        	
+	        	$("#pageLoader").hide();
+
+	            console.log("Question loading error:", error);
+
+	        }
+	    });
+	}
+	
+	function addWorkSet() {
+
+		 var refId = nextRefId;
+		    nextRefId++;
+
+		    existingRefIds.push(refId);
+		    
+		 // Display number = saved count + current Add Work sets + 1
+		    var displayNumber =
+		        savedWorkCount +
+		        $("#workSetsContainer .work-set").length +
+		        1;
+
+
+		    var setHtml = `
+		        <div class="work-set border rounded p-3 mb-4"
+		             data-ref-id="${refId}">
+
+		            <div class="d-flex justify-content-between align-items-center mb-3">
+
+		                <h6 class="mb-0 set-title">
+		                ${displayNumber}. ${sub_category} Details		               
+		                </h6>
+
+		                <button type="button"
+		                        class="btn btn-danger btn-sm remove-work-set">
+		                    Cancel
+		                </button>
+
+		            </div>
+
+		            <div class="row"
+		                 id="questionContainer_${refId}">
+		            </div>
+
+		        </div>
+		    `;
+
+		    $("#workSetsContainer").append(setHtml);
+
+		    renderQuestions(refId);
+
+		    var setContainer =
+		        $("#questionContainer_" + refId);
+
+		    setContainer
+		        .find(".api-dropdown")
+		        .each(function() {
+		            loadApiDropdown($(this));
+		        });
+
+		    
+		}
+	
+	function getNextRefId() {
+
+	    while (existingRefIds.includes(nextRefId)) {
+	        nextRefId++;
+	    }
+
+	    var refId = nextRefId;
+
+	    existingRefIds.push(refId);
+
+	    nextRefId++;
+
+	    return refId;
+	}
+	
+	function renderQuestions(refId) {
+
+	    var container = $("#questionContainer_" + refId);
+
+	    questionList.forEach(function(question) {
+
+	        renderQuestion(question, refId, container);
+
+	    });
+	}
+	
+	
+	function renderQuestion(question, refId, container) {
+
+	    var questionId = question.id;
+	    var answerType = question.answer_type;
+	    var inputSource = question.input_source;
+	    var apiName = question.api_name;
+
+	    var mandatory =
+	        question.ismandatory == 1 ||
+	        question.ismandatory === true;
+
+	    var requiredMark = mandatory
+	        ? '<span class="text-danger">*</span>'
+	        : '';
+
+	    var fieldHtml = '';
+
+
+	    // ==========================================
+	    // API BASED INPUT
+	    // ==========================================
+
+	    if (inputSource &&
+	        inputSource.toUpperCase() === "API") {
+
+	        fieldHtml = createApiDropdown(
+	            question,
+	            refId,
+	            requiredMark
+	        );
+
+	    }
+
+
+	    // ==========================================
+	    // MASTER BASED INPUT
+	    // ==========================================
+
+	    else if (inputSource &&
+	             inputSource.toUpperCase() === "MASTER") {
+
+	        if (answerType.toLowerCase() === "dropdown") {
+
+	            fieldHtml = createDropdown(
+	                question,
+	                refId,
+	                requiredMark
+	            );
+
+	        }
+	        else if (answerType.toLowerCase() === "radio") {
+
+	            fieldHtml = createRadio(
+	                question,
+	                refId,
+	                requiredMark
+	            );
+
+	        }
+
+	    }
+
+
+	    // ==========================================
+	    // TEXT BASED INPUT
+	    // ==========================================
+
+	    else if (inputSource &&
+	             inputSource.toUpperCase() === "TEXT") {
+
+	        if (answerType === "text") {
+
+	            fieldHtml = createText(
+	                question,
+	                refId,
+	                requiredMark
+	            );
+
+	        }
+	        else if (answerType === "text-number") {
+
+	            fieldHtml = createNumberText(
+	                question,
+	                refId,
+	                requiredMark
+	            );
+
+	        }
+	        else if (answerType === "text-alphabets") {
+
+	            fieldHtml = createAlphabetText(
+	                question,
+	                refId,
+	                requiredMark
+	            );
+
+	        }
+	        else if (answerType === "text-alphanumeric") {
+
+	            fieldHtml = createAlphaNumericText(
+	                question,
+	                refId,
+	                requiredMark
+	            );
+
+	        }
+	        else if (answerType === "textarea") {
+
+	            fieldHtml = createTextarea(
+	                question,
+	                refId,
+	                requiredMark
+	            );
+
+	        }
+
+	    }
+
+	    container.append(fieldHtml);
+	}
+	
+	function createApiDropdown(question, refId, requiredMark) {
+
+	    return `
+	        <div class="col-md-6 mb-3 question-wrapper"
+	             data-question-id="${question.id}"
+	             data-input-source="${question.input_source}"
+	             data-api-name="${question.api_name}"
+	             data-mandatory="${question.ismandatory}">
+
+	            <label>
+	                ${question.question_name} ${requiredMark}
+	            </label>
+
+	            <select class="form-control dynamic-field api-dropdown"
+	                    name="question_${question.id}_${refId}"
+	                    data-question-id="${question.id}"
+	                    data-ref-id="${refId}"
+	                    data-answer-type="${question.answer_type}"
+	                    data-input-source="${question.input_source}"
+	                    data-api-name="${question.api_name}"
+	                    data-mandatory="${question.ismandatory}">
+
+	                <option value="">
+	                    Select ${question.question_name}
+	                </option>
+
+	            </select>
+
+	            <small class="text-danger validation-error"></small>
+
+	        </div>
+	    `;
+	}
+	
+	function loadApiDropdown(selectElement) {
+
+	    var apiName =
+	        selectElement.data("api-name");
+
+	    if (!apiName) {
+	        return;
+	    }
+
+	    apiName = apiName.toUpperCase();
+
+
+	    if (apiName === "ZONE") {
+
+	        loadZones(selectElement);
+
+	    }
+	    else if (apiName === "WARD") {
+
+	        // Ward should NOT load independently.
+	        // It depends on Zone.
+
+	        selectElement.empty();
+
+	        selectElement.append(
+	            '<option value="">Select Ward</option>'
+	        );
+
+	    }
+	    else if (apiName === "ROAD") {
+
+	        // Road should NOT load independently.
+	        // It depends on Ward.
+
+	        selectElement.empty();
+
+	        selectElement.append(
+	            '<option value="">Select Road / Street</option>'
+	        );
+
+	    }
+
+	}
+	
+	function createDropdown(question, refId, requiredMark) {
+
+	    var html = `
+	        <div class="col-md-6 mb-3 question-wrapper"
+	             data-question-id="${question.id}"
+	             data-input-source="${question.input_source}"
+	             data-mandatory="${question.ismandatory}">
+
+	            <label>
+	                ${question.question_name} ${requiredMark}
+	            </label>
+
+	            <select class="form-control dynamic-field"
+	                    name="question_${question.id}_${refId}"
+	                    data-question-id="${question.id}"
+	                    data-ref-id="${refId}"
+	                    data-answer-type="dropdown"
+	                    data-input-source="MASTER"
+	                    data-mandatory="${question.ismandatory}">
+
+	                <option value="">
+	                    Select ${question.question_name}
+	                </option>
+	    `;
+
+	    if (question.answers && question.answers.length > 0) {
+
+	        question.answers.forEach(function(answer) {
+
+	            html += `
+	                <option value="${answer.id}">
+	                    ${escapeHtml(answer.answer)}
+	                </option>
+	            `;
+
+	        });
+	    }
+
+	    html += `
+	            </select>
+
+	            <small class="text-danger validation-error"></small>
+
+	        </div>
+	    `;
+
+	    return html;
+	}
+	
+	function escapeHtml(value) {
+
+	    if (value === null || value === undefined) {
+	        return "";
+	    }
+
+	    return String(value)
+	        .replace(/&/g, "&amp;")
+	        .replace(/</g, "&lt;")
+	        .replace(/>/g, "&gt;")
+	        .replace(/"/g, "&quot;")
+	        .replace(/'/g, "&#039;");
+	}
+	
+	function createRadio(question, refId, requiredMark) {
+
+	    var html = `
+	        <div class="col-md-6 mb-3 question-wrapper"
+	             data-question-id="${question.id}"
+	             data-input-source="MASTER"
+	             data-mandatory="${question.ismandatory}">
+
+	            <label>
+	                ${question.question_name} ${requiredMark}
+	            </label>
+
+	            <div>
+	    `;
+
+	    if (question.answers && question.answers.length > 0) {
+
+	        question.answers.forEach(function(answer) {
+
+	            html += `
+	                <div class="form-check form-check-inline">
+
+	                    <input type="radio"
+	                           class="form-check-input dynamic-field"
+	                           name="question_${question.id}_${refId}"
+	                           value="${answer.id}"
+	                           data-question-id="${question.id}"
+	                           data-ref-id="${refId}"
+	                           data-answer-type="radio"
+	                           data-input-source="MASTER"
+	                           data-mandatory="${question.ismandatory}">
+
+	                    <label class="form-check-label">
+	                        ${escapeHtml(answer.answer)}
+	                    </label>
+
+	                </div>
+	            `;
+
+	        });
+	    }
+
+	    html += `
+	            </div>
+
+	            <small class="text-danger validation-error"></small>
+
+	        </div>
+	    `;
+
+	    return html;
+	}
+	
+	function createText(question, refId, requiredMark) {
+
+	    return `
+	        <div class="col-md-6 mb-3 question-wrapper"
+	             data-question-id="${question.id}"
+	             data-input-source="TEXT"
+	             data-mandatory="${question.ismandatory}">
+
+	            <label>
+	                ${question.question_name} ${requiredMark}
+	            </label>
+
+	            <input type="text"
+	                   class="form-control dynamic-field"
+	                   name="question_${question.id}_${refId}"
+	                   data-question-id="${question.id}"
+	                   data-ref-id="${refId}"
+	                   data-answer-type="text"
+	                   data-input-source="TEXT"
+	                   data-mandatory="${question.ismandatory}">
+
+	            <small class="text-danger validation-error"></small>
+
+	        </div>
+	    `;
+	}
+	
+	function createNumberText(question, refId, requiredMark) {
+
+	    return `
+	        <div class="col-md-6 mb-3 question-wrapper"
+	             data-question-id="${question.id}"
+	             data-input-source="TEXT"
+	             data-answer-type="text-number"
+	             data-mandatory="${question.ismandatory}"
+	             data-allow-zero="${question.allow_zero}">
+
+	            <label>
+	                ${escapeHtml(question.question_name)} ${requiredMark}
+	            </label>
+
+	            <input type="text"
+	                   class="form-control dynamic-field number-field"
+	                   name="question_${question.id}_${refId}"
+	                   data-question-id="${question.id}"
+	                   data-ref-id="${refId}"
+	                   data-answer-type="text-number"
+	                   data-input-source="TEXT"
+	                   data-mandatory="${question.ismandatory}"
+	                   data-allow-zero="${question.allow_zero}">
+
+	            <small class="text-danger validation-error"></small>
+
+	        </div>
+	    `;
+	}
+	
+	function createAlphabetText(question, refId, requiredMark) {
+
+	    return `
+	        <div class="col-md-6 mb-3 question-wrapper"
+	             data-question-id="${question.id}"
+	             data-input-source="TEXT"
+	             data-answer-type="text-alphabets"
+	             data-mandatory="${question.ismandatory}">
+
+	            <label>
+	                ${escapeHtml(question.question_name)} ${requiredMark}
+	            </label>
+
+	            <input type="text"
+	                   class="form-control dynamic-field alphabet-field"
+	                   name="question_${question.id}_${refId}"
+	                   data-question-id="${question.id}"
+	                   data-ref-id="${refId}"
+	                   data-answer-type="text-alphabets"
+	                   data-input-source="TEXT"
+	                   data-mandatory="${question.ismandatory}">
+
+	            <small class="text-danger validation-error"></small>
+
+	        </div>
+	    `;
+	}
+	
+	function createAlphaNumericText(question, refId, requiredMark) {
+
+	    return `
+	        <div class="col-md-6 mb-3 question-wrapper"
+	             data-question-id="${question.id}"
+	             data-input-source="TEXT"
+	             data-answer-type="text-alphanumeric"
+	             data-mandatory="${question.ismandatory}">
+
+	            <label>
+	                ${escapeHtml(question.question_name)} ${requiredMark}
+	            </label>
+
+	            <input type="text"
+	                   class="form-control dynamic-field alphanumeric-field"
+	                   name="question_${question.id}_${refId}"
+	                   data-question-id="${question.id}"
+	                   data-ref-id="${refId}"
+	                   data-answer-type="text-alphanumeric"
+	                   data-input-source="TEXT"
+	                   data-mandatory="${question.ismandatory}">
+
+	            <small class="text-danger validation-error"></small>
+
+	        </div>
+	    `;
+	}
+	
+	function createTextarea(question, refId, requiredMark) {
+
+	    return `
+	        <div class="col-md-12 mb-3 question-wrapper"
+	             data-question-id="${question.id}"
+	             data-input-source="TEXT"
+	             data-mandatory="${question.ismandatory}">
+
+	            <label>
+	                ${escapeHtml(question.question_name)}
+	                ${requiredMark}
+	            </label>
+
+	            <textarea
+	                class="form-control dynamic-field"
+	                name="question_${question.id}_${refId}"
+	                rows="2"
+	                data-question-id="${question.id}"
+	                data-ref-id="${refId}"
+	                data-answer-type="textarea"
+	                data-input-source="TEXT"
+	                data-mandatory="${question.ismandatory}"></textarea>
+
+	            <small class="text-danger validation-error"></small>
+
+	        </div>
+	    `;
+	}
+	
+	function loadSubQuestions(answerId, refId) {
+
+	    var container =
+	        $("#questionContainer_" + refId);
+
+	    // Remove previously displayed subquestions
+	    container
+	        .find("[data-parent-answer-id]")
+	        .remove();
+
+	    $.ajax({
+
+	        url: '/gcc/api/works/estimates/subquestions',
+
+	        type: 'GET',
+
+	        data: {
+	            aam_id: answerId
+	        },
+
+	        dataType: 'json',
+
+	        success: function(response) {
+
+	            response.forEach(function(question) {
+
+	                var subContainer = $(`
+	                    <div class="row subquestion-container"
+	                         data-parent-answer-id="${answerId}">
+	                    </div>
+	                `);
+
+	                container.append(subContainer);
+
+	                renderQuestion(
+	                    question,
+	                    refId,
+	                    subContainer
+	                );
+
+	            });
+
+	        }
+
+	    });
+	}
+	
+	function loadZones(selectElement) {
+
+	    $.ajax({
+
+	        url: '/gcc/api/works/estimates/getzones',
+
+	        type: 'GET',
+
+	        dataType: 'json',
+
+	        success: function(response) {
+
+	            selectElement.empty();
+
+	            selectElement.append(
+	                '<option value="">Select Zone</option>'
+	            );
+
+	            response.forEach(function(item) {
+
+	                selectElement.append(
+	                    $('<option>', {
+	                        value: item.zone,
+	                        text: item.zone
+	                    })
+	                );
+
+	            });
+
+	        },
+
+	        error: function(xhr, status, error) {
+
+	            console.log(
+	                "Error loading zones:",
+	                error
+	            );
+
+	        }
+
+	    });
+	}
+	
+	$(document).on(
+		    "change",
+		    '.api-dropdown[data-api-name="ZONE"]',
+		    function() {
+
+		        var zoneSelect = $(this);
+
+		        var zone = zoneSelect.val();
+
+		        var workSet =
+		            zoneSelect.closest(".work-set");
+
+
+		        // Find Ward in SAME work set
+		        var wardSelect =
+		            workSet.find(
+		                '.api-dropdown[data-api-name="WARD"]'
+		            );
+
+
+		        // Find Road in SAME work set
+		        var roadSelect =
+		            workSet.find(
+		                '.api-dropdown[data-api-name="ROAD"]'
+		            );
+
+
+		        // Clear Ward
+		        wardSelect.empty();
+
+		        wardSelect.append(
+		            '<option value="">Select Ward</option>'
+		        );
+
+
+		        // Clear Road
+		        roadSelect.empty();
+
+		        roadSelect.append(
+		            '<option value="">Select Road / Street</option>'
+		        );
+
+
+		        if (!zone) {
+		            return;
+		        }
+
+
+		        loadWards(
+		            zone,
+		            wardSelect
+		        );
+
+		    }
+		);
+	
+	function loadWards(zone, selectElement) {
+		$("#pageLoader").show();
+
+	    $.ajax({
+
+	        url: '/gcc/api/works/estimates/getwards',
+
+	        type: 'GET',
+
+	        data: {
+	            zone: zone
+	        },
+
+	        dataType: 'json',
+
+	        success: function(response) {
+	        	$("#pageLoader").hide();
+
+	            selectElement.empty();
+
+	            selectElement.append(
+	                '<option value="">Select Ward</option>'
+	            );
+
+	            response.forEach(function(item) {
+
+	                selectElement.append(
+	                    $('<option>', {
+	                        value: item.ward,
+	                        text: item.ward
+	                    })
+	                );
+
+	            });
+
+	        },
+
+	        error: function(xhr, status, error) {
+	        	$("#pageLoader").hide();
+
+	            console.log(
+	                "Error loading wards:",
+	                error
+	            );
+
+	        }
+
+	    });
+	}
+	
+
+	$(document).on(
+		    "change",
+		    '.api-dropdown[data-api-name="WARD"]',
+		    function() {
+
+		        var wardSelect = $(this);
+
+		        var ward = wardSelect.val();
+
+		        var workSet =
+		            wardSelect.closest(".work-set");
+
+
+		        var roadSelect =
+		            workSet.find(
+		                '.api-dropdown[data-api-name="ROAD"]'
+		            );
+
+
+		        // Clear existing roads
+		        roadSelect.empty();
+
+		        roadSelect.append(
+		            '<option value="">Select Road / Street</option>'
+		        );
+
+
+		        if (!ward) {
+		            return;
+		        }
+
+
+		        loadRoads(
+		            ward,
+		            roadSelect
+		        );
+
+		    }
+		);
+	
+	function loadRoads(ward, selectElement) {
+		$("#pageLoader").show();
+
+	    $.ajax({
+
+	        url: '/gcc/api/works/estimates/getroadsbyward',
+
+	        type: 'GET',
+
+	        data: {
+	            ward: ward
+	        },
+
+	        dataType: 'json',
+
+	        success: function(response) {
+	        	$("#pageLoader").hide();
+
+	            selectElement.empty();
+
+	            selectElement.append(
+	                '<option value="">Select Road / Street</option>'
+	            );
+
+	            response.forEach(function(item) {
+	            	
+	            	var roadValue =
+	                    item.road_id + "," +
+	                    item.road_name + "," +
+	                    item.locality + "," +
+	                    item.area_name + "," +
+	                    item.type;
+	            	
+	            	var displayroadValue =	                   
+	                    item.road_name + "," +
+	                    item.locality + "," +
+	                    item.area_name + "," +
+	                    item.type;
+
+	                selectElement.append(
+	                    $('<option>', {
+
+	                        value: roadValue,
+
+	                        text: displayroadValue
+
+	                    })
+	                );
+
+	            });
+	            
+	            
+	            if (selectElement.hasClass("select2-hidden-accessible")) {
+	            	selectElement.select2('destroy');
+				}
+
+				// Initialize Select2
+				selectElement.select2({
+					placeholder: "Select Road / Street",
+					allowClear: true,
+					width: '100%'
+				});
+
+	        },
+
+	        error: function(xhr, status, error) {
+	        	$("#pageLoader").hide();
+
+	            console.log(
+	                "Error loading roads:",
+	                error
+	            );
+
+	        }
+
+	    });
+	}
+	
+	
+	$("#addMoreBtn").on("click", function () {
+		
+		if (!questionList || questionList.length === 0) {
+
+	        Swal.fire({
+	            icon: "warning",
+	            title: "Questions Not Added",
+	            text: "Questions Not Added for this subcategory.",
+	            confirmButtonText: "OK"
+	        });
+
+	        return;
+	    }
+
+	    addWorkSet();
+
+	});
+	
+	$(document).on(
+		    "click",
+		    ".remove-work-set",
+		    function () {
+
+		        $(this)
+		            .closest(".work-set")
+		            .remove();
+
+		        refreshSetNumbers();
+		    }
+		);
+	
+	function refreshSetNumbers() {
+
+	    $("#workSetsContainer .work-set").each(function(index) {
+
+	        $(this)
+	            .find(".set-title")
+	            .text(
+	                `${savedWorkCount + index + 1}. ${sub_category} Details`
+	            );
+
+	    });
+	}
+	
+	function validateWorkDetails(containerSelector) {
+
+	    var isValid = true;
+	    var firstError = null;
+
+	    $(containerSelector)
+	        .find(".question-wrapper")
+	        .each(function() {
+
+	            var wrapper = $(this);
+
+	            var mandatory =
+	                String(wrapper.attr("data-mandatory")) === "1"
+	                ||
+	                String(wrapper.attr("data-mandatory"))
+	                    .toLowerCase() === "true";
+
+	            var errorElement =
+	                wrapper.find(".validation-error");
+
+	            errorElement.text("");
+
+	            if (!mandatory) {
+	                return;
+	            }
+
+	            var answerType =
+	                String(
+	                    wrapper.find(".dynamic-field")
+	                        .first()
+	                        .data("answer-type") || ""
+	                ).toLowerCase();
+
+	            if (answerType === "radio") {
+
+	                if (
+	                    wrapper.find(
+	                        "input[type='radio']:checked"
+	                    ).length === 0
+	                ) {
+
+	                    errorElement.text(
+	                        "Please select an option."
+	                    );
+
+	                    isValid = false;
+
+	                    if (!firstError) {
+	                        firstError = wrapper;
+	                    }
+	                }
+
+	            } else if (answerType === "text-number") {
+
+	                var value =
+	                    wrapper.find(".dynamic-field")
+	                        .first()
+	                        .val();
+
+	                if (!value ||
+	                    String(value).trim() === "") {
+
+	                    errorElement.text(
+	                        "This field is required."
+	                    );
+
+	                    isValid = false;
+
+	                    if (!firstError) {
+	                        firstError = wrapper;
+	                    }
+
+	                } else {
+
+	                    value =
+	                        String(value).trim();
+
+	                    if (!/^\d+(\.\d+)?$/.test(value)) {
+
+	                        errorElement.text(
+	                            "Negative values are not allowed."
+	                        );
+
+	                        isValid = false;
+
+	                        if (!firstError) {
+	                            firstError = wrapper;
+	                        }
+
+	                    } else {
+
+	                        var numericValue =
+	                            parseFloat(value);
+
+	                        var allowZero =
+	                            String(
+	                                wrapper.attr("data-allow-zero")
+	                            ) === "1"
+	                            ||
+	                            String(
+	                                wrapper.attr("data-allow-zero")
+	                            ).toLowerCase() === "true";
+
+	                        if (
+	                            numericValue === 0 &&
+	                            !allowZero
+	                        ) {
+
+	                            errorElement.text(
+	                                "Zero is not allowed."
+	                            );
+
+	                            isValid = false;
+
+	                            if (!firstError) {
+	                                firstError = wrapper;
+	                            }
+	                        }
+	                    }
+	                }
+
+	            } else {
+
+	                var value =
+	                    wrapper.find(".dynamic-field")
+	                        .first()
+	                        .val();
+
+	                if (!value ||
+	                    String(value).trim() === "") {
+
+	                    errorElement.text(
+	                        "This field is required."
+	                    );
+
+	                    isValid = false;
+
+	                    if (!firstError) {
+	                        firstError = wrapper;
+	                    }
+	                }
+	            }
+	        });
+
+	    if (!isValid && firstError) {
+
+	        var modalBody =
+	            $("#editWorkModal .modal-body");
+
+	        if ($(containerSelector).is(
+	            "#editQuestionContainer"
+	        )) {
+
+	            modalBody.animate({
+	                scrollTop:
+	                    firstError.position().top - 50
+	            }, 500);
+
+	        } else {
+
+	            $("html, body").animate({
+	                scrollTop:
+	                    firstError.offset().top - 100
+	            }, 500);
+	        }
+	    }
+
+	    return isValid;
+	}
+		
+	
+	$(document).on("click", "#saveWorksBtn", function() {
+
+	    saveWorkDetails();
+
+	});
+	
+	$(document).on("click", "#backBtn", function() {
+
+		//window.history.back();
+		
+		 window.close();
+
+	});
+	
+	function validateLocationGroup(container) {
+
+	    var zoneField = container.find(
+	        '.api-dropdown[data-api-name="ZONE"]'
+	    );
+
+	    var wardField = container.find(
+	        '.api-dropdown[data-api-name="WARD"]'
+	    );
+
+	    var roadField = container.find(
+	        '.api-dropdown[data-api-name="ROAD"]'
+	    );
+
+	    var zone = zoneField.val();
+	    var ward = wardField.val();
+	    var road = roadField.val();
+
+	    var hasZone = zone && String(zone).trim() !== "";
+	    var hasWard = ward && String(ward).trim() !== "";
+	    var hasRoad = road && String(road).trim() !== "";
+
+	    /*
+	     * All three empty -> VALID
+	     */
+	    if (!hasZone && !hasWard && !hasRoad) {
+
+	        return true;
+	    }
+
+	    /*
+	     * All three filled -> VALID
+	     */
+	    if (hasZone && hasWard && hasRoad) {
+
+	        return true;
+	    }
+
+	    /*
+	     * Partial selection -> INVALID
+	     */
+
+	    if (!hasZone) {
+
+	        zoneField
+	            .closest(".question-wrapper")
+	            .find(".validation-error")
+	            .text("Please select Zone.");
+	    }
+
+	    if (!hasWard) {
+
+	        wardField
+	            .closest(".question-wrapper")
+	            .find(".validation-error")
+	            .text("Please select Ward.");
+	    }
+
+	    if (!hasRoad) {
+
+	        roadField
+	            .closest(".question-wrapper")
+	            .find(".validation-error")
+	            .text("Please select Road / Street.");
+	    }
+
+	    return false;
+	}
+	
+	function saveWorkDetails() {
+		
+		
+		if (!questionList || questionList.length === 0) {
+
+	        Swal.fire({
+	            icon: "warning",
+	            title: "Questions Not Added",
+	            text: "Questions Not Added for this subcategory.",
+	            confirmButtonText: "OK"
+	        });
+
+	        return;
+	    }
+
+	    // First validate
+	    if (!validateWorkDetails("#workSetsContainer")) {
+		    return;
+		}
+
+	 // ==========================================
+	    // SUBCATEGORY 4 - CHECK DUPLICATE ROAD
+	    // ==========================================
+	    if (parseInt(subcategory_id) === 4) {
+
+	        var roadIds = {};
+	        var duplicateRoadId = null;
+
+	        $(".work-set").each(function() {
+
+	            var set = $(this);
+
+	            set.find('.api-dropdown[data-api-name="ROAD"]').each(function() {
+
+	                var roadValue = $(this).val();
+
+	                if (!roadValue || roadValue === "") {
+	                    return;
+	                }
+
+	                // roadValue:
+	                // road_id,road_name,locality,area_name,type
+	                var roadId = String(roadValue).split(",")[0].trim();
+
+	                if (roadIds[roadId]) {
+	                    duplicateRoadId = roadId;
+	                    return false;
+	                }
+
+	                roadIds[roadId] = true;
+	            });
+
+	            if (duplicateRoadId) {
+	                return false;
+	            }
+	        });
+
+	        if (duplicateRoadId) {
+
+	            Swal.fire({
+	                icon: "warning",
+	                title: "Duplicate Road",
+	                text: "The same road cannot be selected more than once."
+	            });
+
+	            return;
+	        }
+	    }
+	 
+	    /* if (parseInt(subcategory_id) !== 4) {
+	    	
+	    	var locationValid = true;
+	        var firstInvalidSet = null;
+
+	        $(".work-set").each(function() {
+
+	            var workSet = $(this);
+
+	            if (!validateLocationGroup(workSet)) {
+
+	                locationValid = false;
+
+	                if (!firstInvalidSet) {
+	                    firstInvalidSet = workSet;
+	                }
+	            }
+	        });
+
+	        if (!locationValid) {
+
+	            Swal.fire({
+	                icon: "warning",
+	                title: "Incomplete Location Details",
+	                text: "Please select Zone, Ward and Road / Street together, or leave all three empty.",
+	                confirmButtonText: "OK"
+	            });
+
+	            if (firstInvalidSet) {
+
+	                $("html, body").animate({
+	                    scrollTop: firstInvalidSet.offset().top - 100
+	                }, 500);
+	            }
+
+	            return;
+	        }
+	    	
+	    } */
+
+	    var details = [];
+	    var textDetails = [];
+
+
+	    $(".work-set").each(function() {
+
+	        var set = $(this);
+
+	        var refId = set.attr("data-ref-id");
+
+
+	        set.find(".dynamic-field").each(function() {
+
+	            var field = $(this);
+
+	            var questionId =
+	                field.attr("data-question-id");
+
+	            var answerType =
+	                String(
+	                    field.attr("data-answer-type") || ""
+	                ).toLowerCase();
+
+	            var inputSource =
+	                String(
+	                    field.attr("data-input-source") || ""
+	                ).toUpperCase();
+
+
+	            /*
+	             * RADIO
+	             *
+	             * Only MASTER radio answers go
+	             * to addworks_details.
+	             */
+	            if (answerType === "radio") {
+
+	                if (!field.is(":checked")) {
+	                    return;
+	                }
+
+
+	                if (inputSource === "MASTER") {
+
+	                    details.push({
+
+	                        estid: estid,
+
+	                        question_id: parseInt(questionId),
+
+	                        answer_id: parseInt(field.val()),
+
+	                        ref_id: parseInt(refId)
+
+	                    });
+
+	                }
+
+	                /*
+	                 * If a radio ever comes from API,
+	                 * store its actual value in text_details.
+	                 */
+	                else {
+
+	                    textDetails.push({
+
+	                        estid: estid,
+
+	                        question_id: parseInt(questionId),
+
+	                        answer: field.val(),
+
+	                        ref_id: parseInt(refId)
+
+	                    });
+
+	                }
+
+	            }
+
+
+	            /*
+	             * DROPDOWN
+	             */
+	            else if (answerType === "dropdown") {
+
+	                var value = field.val();
+
+
+	                if (!value || value === "") {
+	                    return;
+	                }
+
+
+	                /*
+	                 * MASTER dropdown
+	                 * answer_id = addworks_answer_master.id
+	                 */
+	                if (inputSource === "MASTER") {
+
+	                    details.push({
+
+	                        estid: estid,
+
+	                        question_id: parseInt(questionId),
+
+	                        answer_id: parseInt(value),
+
+	                        ref_id: parseInt(refId)
+
+	                    });
+
+	                }
+
+
+	                /*
+	                 * API dropdown
+	                 * Save actual API value as text.
+	                 */
+	                 else if (inputSource === "API") {
+
+	                	    /*
+	                	     * Zone / Ward / Road are handled below
+	                	     * because all three must be sent even
+	                	     * when they are empty.
+	                	     */
+	                	    var apiName = String(
+	                	        field.attr("data-api-name") || ""
+	                	    ).toUpperCase();
+
+	                	    if (
+	                	        parseInt(subcategory_id) !== 4 &&
+	                	        (
+	                	            apiName === "ZONE" ||
+	                	            apiName === "WARD" ||
+	                	            apiName === "ROAD"
+	                	        )
+	                	    ) {
+
+	                	        return;
+	                	    }
+
+	                	    textDetails.push({
+	                	        estid: estid,
+	                	        question_id: parseInt(questionId),
+	                	        answer: value,
+	                	        ref_id: parseInt(refId)
+	                	    });
+	                	}
+
+	            }
+
+
+	            /*
+	             * TEXT / TEXTAREA / NUMBER /
+	             * ALPHABETS / ALPHANUMERIC
+	             */
+	            else {
+
+	                var value = field.val().trim();
+
+
+	                if (value === null ||
+	                    value === undefined ||
+	                    String(value).trim() === "") {
+
+	                    return;
+	                }
+
+
+	                textDetails.push({
+
+	                    estid: estid,
+
+	                    question_id: parseInt(questionId),
+
+	                    answer: value,
+
+	                    ref_id: parseInt(refId)
+
+	                });
+
+	            }
+
+	        });
+	        
+	        
+	        /*
+	         * ==========================================
+	         * ZONE / WARD / ROAD
+	         * ==========================================
+	         *
+	         * For subcategory != 4:
+	         *
+	         * all empty  -> save ""
+	         * all filled -> save values
+	         *
+	         * Partial selection is already rejected above.
+	         */
+
+	        if (parseInt(subcategory_id) !== 4) {
+
+	            var zoneField = set.find(
+	                '.api-dropdown[data-api-name="ZONE"]'
+	            );
+
+	            var wardField = set.find(
+	                '.api-dropdown[data-api-name="WARD"]'
+	            );
+
+	            var roadField = set.find(
+	                '.api-dropdown[data-api-name="ROAD"]'
+	            );
+
+	            if (zoneField.length > 0) {
+
+	                textDetails.push({
+	                    estid: estid,
+	                    question_id: parseInt(
+	                        zoneField.attr("data-question-id")
+	                    ),
+	                    answer: zoneField.val() || "",
+	                    ref_id: parseInt(refId)
+	                });
+	            }
+
+	            if (wardField.length > 0) {
+
+	                textDetails.push({
+	                    estid: estid,
+	                    question_id: parseInt(
+	                        wardField.attr("data-question-id")
+	                    ),
+	                    answer: wardField.val() || "",
+	                    ref_id: parseInt(refId)
+	                });
+	            }
+
+	            if (roadField.length > 0) {
+
+	                textDetails.push({
+	                    estid: estid,
+	                    question_id: parseInt(
+	                        roadField.attr("data-question-id")
+	                    ),
+	                    answer: roadField.val() || "",
+	                    ref_id: parseInt(refId)
+	                });
+	            }
+	        }
+
+	    });
+	    
+	    if (details.length === 0 && textDetails.length === 0) {
+	        Swal.fire({
+	            icon: "warning",
+	            title: "No Data",
+	            text: "Please enter or select at least one work detail."
+	        });
+
+	        return;
+	    }
+
+
+	    var requestData = {		    		
+	        estid: estid,
+	        estimate_no:estimate_no,	        
+	        subcategory_id: parseInt(subcategory_id),
+	        createdBy:parseInt(createdBy),
+	        details: details,
+	        textDetails: textDetails
+
+	    };
+
+
+	    console.log(
+	        "Save Request:",
+	        JSON.stringify(requestData, null, 2)
+	    );
+
+
+	    $.ajax({
+
+	        url: '/gcc/api/works/estimates/addWorkDetails',
+
+	        type: 'POST',
+
+	        contentType: 'application/json',
+
+	        dataType: 'json',
+
+	        data: JSON.stringify(requestData),
+
+
+	        beforeSend: function() {
+	        	
+	        	$("#pageLoader").show();
+
+	            $("#saveWorksBtn")
+	                .prop("disabled", true)
+	                .text("Saving...");
+
+	        },
+
+
+	        success: function(response) {
+	        	$("#pageLoader").hide();
+
+	            if (response.status === true) {
+
+	                Swal.fire({
+	                    icon: "success",
+	                    title: "Success",
+	                    text: response.message
+	                }).then(function() {
+
+	                    // Reload the page
+	                    location.reload();
+
+	                });
+
+	            } else {
+	            	$("#pageLoader").hide();
+
+	                Swal.fire({
+	                    icon: "error",
+	                    title: "Error",
+	                    text: response.message
+	                });
+
+	            }
+
+	        },
+
+
+	        error: function(xhr, status, error) {
+	        	$("#pageLoader").hide();
+
+	            console.log("Save error:", xhr);
+
+	            Swal.fire({
+	                icon: "error",
+	                title: "Error",
+	                text: "Unable to save work details."
+	            });
+
+	        },
+
+
+	        complete: function() {
+	        	
+
+	            $("#saveWorksBtn").prop("disabled", false).text("Save Works Details");
+
+	        }
+
+	    });
+	}
+	
+	$(document).ready(function () {
+		
+		
+        get_work_details(estid,estimate_no);
+        
+        loadSavedWorkDetails(estid);
+        
+        loadQuestionMaster();
+        
+               
+    });
+	
+	
+	
+	function loadSavedWorkDetails(estid) {
+		
+		$("#pageLoader").show();
+
+	    $.ajax({
+
+	        url: '/gcc/api/works/estimates/getSavedDetails',
+
+	        type: 'GET',
+
+	        data: {
+	            estid: estid
+	        },
+
+	        dataType: 'json',
+
+	        success: function(data) {
+
+	        	$("#pageLoader").hide();
+	        	
+	            console.log("Existing work details:",data);
+	            
+	            savedWorkData = data || [];
+	            
+	         // Display current number of saved sets
+	            $("#totalNoOfdata").text(savedWorkData ? savedWorkData.length : 0);
+
+	            existingRefIds = [];
+
+	            if (savedWorkData && savedWorkData.length > 0) {
+
+	            	savedWorkData.forEach(function(set) {
+
+	                    if (set.ref_id !== null &&
+	                        set.ref_id !== undefined) {
+
+	                        var refId =parseInt(set.ref_id);
+
+	                        if (!existingRefIds.includes(refId)) {
+
+	                            existingRefIds.push(refId);
+	                        }
+	                    }
+	                });
+	            }
+	            
+	           
+
+	            // ------------------------------------------
+	            // Maximum existing ref_id
+	            // ------------------------------------------
+
+	            if (existingRefIds.length > 0) {
+
+	                savedWorkCount =
+	                    Math.max.apply(
+	                        null,
+	                        existingRefIds
+	                    );
+
+	                nextRefId =
+	                    savedWorkCount + 1;
+
+	            } else {
+
+	                savedWorkCount = 0;
+
+	                nextRefId = 1;
+	            }
+
+	            //console.log("Existing Ref IDs:",existingRefIds);
+	            //console.log("Maximum Ref ID:",savedWorkCount);
+
+	            //console.log("Next Ref ID:",nextRefId);
+
+	            renderSavedWorkDetails(data);
+	        },
+
+	        error: function(xhr, status, error) {
+	        	
+	        	$("#pageLoader").hide();
+
+	            console.log("Error loading saved work details:",error);
+
+	            existingRefIds = [];
+
+	            savedWorkCount = 0;
+
+	            nextRefId = 1;
+
+	            renderSavedWorkDetails([]);
+	        }
+	    });
+	}
+	
+	function renderSavedWorkDetails(data) {
+
+	    var container =
+	        $("#viewdetailscard .card-body");
+
+	    container.empty();
+
+	    if (!data || data.length === 0) {
+
+	        container.html(`
+	            <div class="text-muted">
+	                No work details found.
+	            </div>
+	        `);
+
+	        return;
+	    }
+
+	    data.forEach(function(set) {
+
+	        var refId =
+	            parseInt(set.ref_id);
+
+	        var html = `
+
+	            <div class="border rounded p-3 mb-4"
+	                 data-ref-id="${refId}">
+
+	                <div class="d-flex justify-content-between align-items-center mb-3">
+
+	                    <h6 class="mb-0">
+	                        ${refId}. ${sub_category} Details
+	                    </h6>
+
+	                        <div>
+	                        <button type="button"
+	                                class="btn btn-primary btn-sm edit-saved-work mr-1"
+	                                data-estid="${estid}"
+	                                data-ref-id="${refId}">
+	                            <i class="fas fa-edit"></i> Edit
+	                        </button>
+
+	                        <button type="button"
+	                                class="btn btn-danger btn-sm remove-saved-work"
+	                                data-estid="${estid}"
+	                                data-ref-id="${refId}">
+	                            <i class="fas fa-trash"></i> Remove
+	                        </button>
+	                    </div>
+
+	                </div>
+
+	                <div class="row">
+	        `;
+
+	        if (set.questions &&
+	            set.questions.length > 0) {
+
+	            set.questions.forEach(function(question) {
+
+	                var answer =
+	                    question.answer;
+
+	                if (answer === null ||
+	                    answer === undefined ||
+	                    String(answer).trim() === "") {
+
+	                    answer = "-";
+	                }
+
+	                html += `
+
+	                    <div class="col-md-6 mb-3">
+
+	                        <label class="mb-1">
+	                            <b>
+	                                ${escapeHtml(
+	                                    question.question_name
+	                                )}
+	                            </b>
+	                        </label>
+
+	                        <div class="form-control bg-light p-2">
+
+	                            ${escapeHtml(
+	                                String(answer)
+	                            )}
+
+	                        </div>
+
+	                    </div>
+	                `;
+	            });
+	        }
+
+	        html += `
+
+	                </div>
+
+	            </div>
+	        `;
+
+	        container.append(html);
+	    });
+	}
+	
+	$(document).on("click", ".remove-saved-work", function() {
+
+	    var button = $(this);
+
+	    var estid = button.data("estid");
+	    var refId = button.data("ref-id");
+
+	    /*
+	     * First check whether work progress has started
+	     */
+	    checkWorkProgressBeforeAction(
+	        estid,
+	        refId,
+	        function() {
+
+	            /*
+	             * Work progress has NOT started.
+	             * Now show remove confirmation.
+	             */
+
+	            Swal.fire({
+	                icon: "warning",
+	                title: "Remove Work Details?",
+	                text: "Are you sure you want to remove this "
+	                      + sub_category + " details?",
+	                showCancelButton: true,
+	                confirmButtonText: "Yes, Remove",
+	                cancelButtonText: "No",
+	                reverseButtons: true
+
+	            }).then(function(result) {
+
+	                if (result.isConfirmed) {
+
+	                    deleteSavedWorkDetails(
+	                        estid,
+	                        refId,
+	                        button
+	                    );
+	                }
+	            });
+	        }
+	    );
+
+	});
+	
+	function deleteSavedWorkDetails(estid, refId, button) {
+
+	    button.prop("disabled", true)
+	         .text("Removing...");
+	    
+	    $("#pageLoader").show();
+
+	    $.ajax({
+
+	        url: '/gcc/api/works/estimates/deleteSavedDetails',
+
+	        type: 'POST',
+
+	        data: {
+	        	createdBy:parseInt(createdBy),
+	            estid: estid,
+	            ref_id: refId
+	        },
+
+	        dataType: 'json',
+
+	        success: function(response) {
+	        	
+	        	$("#pageLoader").hide();
+
+	            if (response.status === true) {
+
+	                Swal.fire({
+
+	                    icon: "success",
+
+	                    title: "Removed",
+
+	                    text: response.message,
+
+	                    confirmButtonText: "OK"
+
+	                }).then(function() {
+
+	                    // Reload saved details
+	                    loadSavedWorkDetails(estid);
+
+	                });
+
+	            } else {
+
+	                Swal.fire({
+
+	                    icon: "error",
+
+	                    title: "Unable to Remove",
+
+	                    text: response.message
+
+	                });
+
+	                button.prop("disabled", false)
+	                      .text("Remove");
+	            }
+	        },
+
+	        error: function(xhr, status, error) {
+	        	
+	        	$("#pageLoader").hide();
+
+	            console.log(
+	                "Delete error:",
+	                xhr
+	            );
+
+	            Swal.fire({
+
+	                icon: "error",
+
+	                title: "Error",
+
+	                text: "Unable to remove work details."
+
+	            });
+
+	            button.prop("disabled", false)
+	                  .text("Remove");
+	        }
+	    });
+	}
+	
+	$(document).on(
+		    "change",
+		    "input[type='radio'].dynamic-field, select.dynamic-field",
+		    function () {
+
+		        var answerId = $(this).val();
+		        var questionId = $(this).data("question-id");
+		        var refId = $(this).data("ref-id");
+
+		        if (!answerId) {
+		            return;
+		        }
+
+		        loadSubQuestions(
+		            parseInt(answerId),
+		            refId
+		        );
+		    }
+		);
+	
+	$(document).on("input", ".number-field", function () {
+
+	    this.value = this.value.replace(/[^0-9.]/g, "");
+
+	    // Allow only one decimal
+	    var parts = this.value.split(".");
+
+	    if (parts.length > 2) {
+	        this.value = parts[0] + "." + parts.slice(1).join("");
+	    }
+
+	});
+	
+	$(document).on("input", ".alphabet-field", function () {
+
+	    this.value = this.value.replace(/[^a-zA-Z .]/g, "");
+
+	});
+	
+	$(document).on("input", ".alphanumeric-field", function () {
+
+	    this.value = this.value.replace(/[^a-zA-Z0-9]/g, "");
+
+	});
+	
+	function formatDate(dateString) {
+
+	    if (!dateString) {
+	        return "-";
+	    }
+
+	    var parts = dateString.split("-");
+
+	    if (parts.length === 3) {
+	        return parts[2] + "-" + parts[1] + "-" + parts[0];
+	    }
+
+	    return dateString;
+	}
+	
+	function formatAmount(amount) {
+
+	    if (amount === null || amount === undefined || amount === "") {
+	        return "-";
+	    }
+
+	    return "Rs." + Number(amount).toLocaleString("en-IN");
+	}
+	
+	/* edit */
+	
+	$(document).on("click", ".edit-saved-work", function() {
+
+		    var button = $(this);
+		
+		    var estid = button.data("estid");
+		    var refId = button.data("ref-id");
+
+		    checkWorkProgressBeforeAction(
+		        estid,
+		        refId,
+		        function() {
+
+		            // Only if work progress has NOT started
+
+		            editEstId = estid;
+		            editRefId = refId;
+
+		            $("#editWorkTitle").text(
+		                sub_category + " - Ref ID: " + editRefId
+		            );
+
+		            $("#editQuestionContainer").html(`
+		                <div class="col-md-12 text-center py-4">
+		                    <div class="spinner-border text-primary"></div>
+		                    <div class="mt-2">
+		                        Loading details...
+		                    </div>
+		                </div>
+		            `);
+
+		            $("#editWorkModal").modal("show");
+
+		            loadEditWorkDetails(
+		                editEstId,
+		                editRefId
+		            );
+		        }
+		    );
+		    
+		    
+		});
+	
+	function checkWorkProgressBeforeAction(estid, refId, callback) {
+
+	    $.ajax({
+	        url: '/gcc/api/works/estimates/checkWorkProgress',
+	        type: 'GET',
+	        data: {
+	            estid: estid,
+	            ref_id: refId
+	        },
+	        dataType: 'json',
+
+	        success: function(response) {
+
+	            if (response.status !== true) {
+
+	                Swal.fire({
+	                    icon: "error",
+	                    title: "Error",
+	                    text: response.message ||
+	                          "Unable to check work progress"
+	                });
+
+	                return;
+	            }
+
+	            /*
+	             * Work progress already started
+	             */
+	            if (response.workStarted === true) {
+
+	                Swal.fire({
+	                    icon: "warning",
+	                    title: "Unable to Proceed",
+	                    text: "Work progress is started, Unable to edit or remove",
+	                    confirmButtonText: "OK"
+	                });
+
+	                return;
+	            }
+
+	            /*
+	             * Work progress has NOT started
+	             * Continue with Edit / Remove
+	             */
+	            if (typeof callback === "function") {
+	                callback();
+	            }
+	        },
+
+	        error: function(xhr, status, error) {
+
+	            console.log(
+	                "Work progress check error:",
+	                xhr
+	            );
+
+	            Swal.fire({
+	                icon: "error",
+	                title: "Error",
+	                text: "Unable to check work progress."
+	            });
+	        }
+	    });
+	}
+	
+	function loadEditWorkDetails(estid, refId) {
+
+	    $.ajax({
+
+	        url: '/gcc/api/works/estimates/getEditDetails',
+
+	        type: 'GET',
+
+	        data: {
+	            estid: estid,
+	            ref_id: refId,
+	            subcategory_id: subcategory_id
+	        },
+
+	        dataType: 'json',
+
+	        success: function(response) {
+
+	            console.log("Edit details:", response);
+
+	            editQuestionList = response || [];
+
+	            if (editQuestionList.length === 0) {
+
+	                $("#editQuestionContainer").html(`
+	                    <div class="col-md-12 text-center text-muted">
+	                        No questions found.
+	                    </div>
+	                `);
+
+	                return;
+	            }
+
+	            $("#editQuestionContainer").empty();
+
+	            editQuestionList.forEach(function(question) {
+
+	                renderEditQuestion(
+	                    question,
+	                    refId
+	                );
+	            });
+
+	            // Load API dropdowns
+	            $("#editQuestionContainer")
+	                .find(".api-dropdown")
+	                .each(function() {
+
+	                    loadEditApiDropdown(
+	                        $(this),
+	                        $(this).attr("data-saved-value")
+	                    );
+	                });
+
+	            // Initialize Select2
+	            $("#editQuestionContainer")
+	                .find(".select2")
+	                .each(function() {
+
+	                    if (!$(this).hasClass(
+	                        "select2-hidden-accessible"
+	                    )) {
+
+	                        $(this).select2({
+	                            dropdownParent: $("#editWorkModal"),
+	                            width: "100%"
+	                        });
+	                    }
+	                });
+
+	            // Load conditional subquestions if necessary
+	            //loadExistingEditSubQuestions();
+
+	        },
+
+	        error: function(xhr, status, error) {
+
+	            console.log("Edit details error:", xhr);
+
+	            $("#editQuestionContainer").html(`
+	                <div class="col-md-12 text-danger text-center">
+	                    Unable to load work details.
+	                </div>
+	            `);
+	        }
+	    });
+	}
+	
+	function renderEditQuestion(question, refId) {
+
+	    var questionId = question.id;
+
+	    var answerType =
+	        String(question.answer_type || "").toLowerCase();
+
+	    var inputSource =
+	        String(question.input_source || "").toUpperCase();
+
+	    var mandatory =
+	        question.ismandatory == 1 ||
+	        question.ismandatory === true;
+
+	    var requiredMark =
+	        mandatory
+	            ? '<span class="text-danger">*</span>'
+	            : '';
+
+	    var savedAnswer =
+	        question.saved_answer;
+
+	    var savedAnswerId =
+	        question.saved_answer_id;
+
+	    var fieldHtml = "";
+
+	    if (inputSource === "API") {
+
+	        fieldHtml = createEditApiDropdown(
+	            question,
+	            refId,
+	            requiredMark,
+	            savedAnswer
+	        );
+
+	    } else if (inputSource === "MASTER") {
+
+	        if (answerType === "dropdown") {
+
+	            fieldHtml = createEditDropdown(
+	                question,
+	                refId,
+	                requiredMark,
+	                savedAnswerId
+	            );
+
+	        } else if (answerType === "radio") {
+
+	            fieldHtml = createEditRadio(
+	                question,
+	                refId,
+	                requiredMark,
+	                savedAnswerId
+	            );
+	        }
+
+	    } else if (inputSource === "TEXT") {
+
+	        if (answerType === "text") {
+
+	            fieldHtml = createEditText(
+	                question,
+	                refId,
+	                requiredMark,
+	                savedAnswer
+	            );
+
+	        } else if (answerType === "text-number") {
+
+	            fieldHtml = createEditNumberText(
+	                question,
+	                refId,
+	                requiredMark,
+	                savedAnswer
+	            );
+
+	        } else if (answerType === "text-alphabets") {
+
+	            fieldHtml = createEditAlphabetText(
+	                question,
+	                refId,
+	                requiredMark,
+	                savedAnswer
+	            );
+
+	        } else if (answerType === "text-alphanumeric") {
+
+	            fieldHtml = createEditAlphaNumericText(
+	                question,
+	                refId,
+	                requiredMark,
+	                savedAnswer
+	            );
+
+	        } else if (answerType === "textarea") {
+
+	            fieldHtml = createEditTextarea(
+	                question,
+	                refId,
+	                requiredMark,
+	                savedAnswer
+	            );
+	        }
+	    }
+
+	    $("#editQuestionContainer").append(fieldHtml);
+	}
+	
+	function createEditText(
+		    question,
+		    refId,
+		    requiredMark,
+		    value
+		) {
+
+		    return `
+		        <div class="col-md-6 mb-3 question-wrapper"
+		             data-question-id="${question.id}"
+		             data-input-source="TEXT"
+		             data-answer-type="text"
+		             data-mandatory="${question.ismandatory}">
+
+		            <label>
+		                ${escapeHtml(question.question_name)}
+		                ${requiredMark}
+		            </label>
+
+		            <input type="text"
+		                   class="form-control dynamic-field"
+		                   name="edit_question_${question.id}_${refId}"
+		                   value="${escapeHtml(value || '')}"
+		                   data-question-id="${question.id}"
+		                   data-ref-id="${refId}"
+		                   data-answer-type="text"
+		                   data-input-source="TEXT"
+		                   data-mandatory="${question.ismandatory}">
+
+		            <small class="text-danger validation-error"></small>
+		        </div>
+		    `;
+		}
+	
+	function createEditNumberText(
+		    question,
+		    refId,
+		    requiredMark,
+		    value
+		) {
+
+		    return `
+		        <div class="col-md-6 mb-3 question-wrapper"
+		             data-question-id="${question.id}"
+		             data-input-source="TEXT"
+		             data-answer-type="text-number"
+		             data-mandatory="${question.ismandatory}"
+		             data-allow-zero="${question.allow_zero}">
+
+		            <label>
+		                ${escapeHtml(question.question_name)}
+		                ${requiredMark}
+		            </label>
+
+		            <input type="text"
+		                   class="form-control dynamic-field number-field"
+		                   name="edit_question_${question.id}_${refId}"
+		                   value="${escapeHtml(value || '')}"
+		                   data-question-id="${question.id}"
+		                   data-ref-id="${refId}"
+		                   data-answer-type="text-number"
+		                   data-input-source="TEXT"
+		                   data-mandatory="${question.ismandatory}"
+		                   data-allow-zero="${question.allow_zero}"
+		                   autocomplete="off">
+
+		            <small class="text-danger validation-error"></small>
+		        </div>
+		    `;
+		}
+	
+	function createEditAlphabetText(
+		    question,
+		    refId,
+		    requiredMark,
+		    value
+		) {
+
+		    return `
+		        <div class="col-md-6 mb-3 question-wrapper"
+		             data-question-id="${question.id}"
+		             data-input-source="TEXT"
+		             data-answer-type="text-alphabets"
+		             data-mandatory="${question.ismandatory}">
+
+		            <label>
+		                ${escapeHtml(question.question_name)}
+		                ${requiredMark}
+		            </label>
+
+		            <input type="text"
+		                   class="form-control dynamic-field alphabet-field"
+		                   name="edit_question_${question.id}_${refId}"
+		                   value="${escapeHtml(value || '')}"
+		                   data-question-id="${question.id}"
+		                   data-ref-id="${refId}"
+		                   data-answer-type="text-alphabets"
+		                   data-input-source="TEXT"
+		                   data-mandatory="${question.ismandatory}"
+		                   autocomplete="off">
+
+		            <small class="text-danger validation-error"></small>
+		        </div>
+		    `;
+		}
+	
+	function createEditAlphaNumericText(
+		    question,
+		    refId,
+		    requiredMark,
+		    value
+		) {
+
+		    return `
+		        <div class="col-md-6 mb-3 question-wrapper"
+		             data-question-id="${question.id}"
+		             data-input-source="TEXT"
+		             data-answer-type="text-alphanumeric"
+		             data-mandatory="${question.ismandatory}">
+
+		            <label>
+		                ${escapeHtml(question.question_name)}
+		                ${requiredMark}
+		            </label>
+
+		            <input type="text"
+		                   class="form-control dynamic-field alphanumeric-field"
+		                   name="edit_question_${question.id}_${refId}"
+		                   value="${escapeHtml(value || '')}"
+		                   data-question-id="${question.id}"
+		                   data-ref-id="${refId}"
+		                   data-answer-type="text-alphanumeric"
+		                   data-input-source="TEXT"
+		                   data-mandatory="${question.ismandatory}"
+		                   autocomplete="off">
+
+		            <small class="text-danger validation-error"></small>
+		        </div>
+		    `;
+		}
+	
+	function createEditTextarea(
+		    question,
+		    refId,
+		    requiredMark,
+		    value
+		) {
+
+		    return `
+		        <div class="col-md-12 mb-3 question-wrapper"
+		             data-question-id="${question.id}"
+		             data-input-source="TEXT"
+		             data-answer-type="textarea"
+		             data-mandatory="${question.ismandatory}">
+
+		            <label>
+		                ${escapeHtml(question.question_name)}
+		                ${requiredMark}
+		            </label>
+
+		            <textarea
+		                class="form-control dynamic-field"
+		                name="edit_question_${question.id}_${refId}"
+		                rows="3"
+		                data-question-id="${question.id}"
+		                data-ref-id="${refId}"
+		                data-answer-type="textarea"
+		                data-input-source="TEXT"
+		                data-mandatory="${question.ismandatory}">${escapeHtml(value || '')}</textarea>
+
+		            <small class="text-danger validation-error"></small>
+		        </div>
+		    `;
+		}
+	
+	function createEditDropdown(
+		    question,
+		    refId,
+		    requiredMark,
+		    savedAnswerId
+		) {
+
+		    var html = `
+		        <div class="col-md-6 mb-3 question-wrapper"
+		             data-question-id="${question.id}"
+		             data-input-source="MASTER"
+		             data-answer-type="dropdown"
+		             data-mandatory="${question.ismandatory}">
+
+		            <label>
+		                ${escapeHtml(question.question_name)}
+		                ${requiredMark}
+		            </label>
+
+		            <select class="form-control dynamic-field select2"
+		                    name="edit_question_${question.id}_${refId}"
+		                    data-question-id="${question.id}"
+		                    data-ref-id="${refId}"
+		                    data-answer-type="dropdown"
+		                    data-input-source="MASTER"
+		                    data-mandatory="${question.ismandatory}">
+
+		                <option value="">Select</option>
+		    `;
+
+		    (question.answers || []).forEach(function(answer) {
+
+		        var selected =
+		            String(answer.id) === String(savedAnswerId)
+		                ? "selected"
+		                : "";
+
+		        html += `
+		            <option value="${answer.id}" ${selected}>
+		                ${escapeHtml(answer.answer)}
+		            </option>
+		        `;
+		    });
+
+		    html += `
+		            </select>
+
+		            <small class="text-danger validation-error"></small>
+		        </div>
+		    `;
+
+		    return html;
+		}
+	
+	function createEditRadio(
+		    question,
+		    refId,
+		    requiredMark,
+		    savedAnswerId
+		) {
+
+		    var html = `
+		        <div class="col-md-6 mb-3 question-wrapper"
+		             data-question-id="${question.id}"
+		             data-input-source="MASTER"
+		             data-answer-type="radio"
+		             data-mandatory="${question.ismandatory}">
+
+		            <label class="d-block">
+		                ${escapeHtml(question.question_name)}
+		                ${requiredMark}
+		            </label>
+		    `;
+
+		    (question.answers || []).forEach(function(answer) {
+
+		        var checked =
+		            String(answer.id) === String(savedAnswerId)
+		                ? "checked"
+		                : "";
+
+		        html += `
+		            <div class="form-check form-check-inline">
+
+		                <input type="radio"
+		                       class="form-check-input dynamic-field"
+		                       name="edit_question_${question.id}_${refId}"
+		                       value="${answer.id}"
+		                       ${checked}
+		                       data-question-id="${question.id}"
+		                       data-ref-id="${refId}"
+		                       data-answer-type="radio"
+		                       data-input-source="MASTER"
+		                       data-mandatory="${question.ismandatory}">
+
+		                <label class="form-check-label">
+		                    ${escapeHtml(answer.answer)}
+		                </label>
+
+		            </div>
+		        `;
+		    });
+
+		    html += `
+		            <small class="text-danger validation-error d-block"></small>
+		        </div>
+		    `;
+
+		    return html;
+		}
+	
+	function createEditApiDropdown(
+		    question,
+		    refId,
+		    requiredMark,
+		    savedValue
+		) {
+
+		    return `
+		        <div class="col-md-6 mb-3 question-wrapper"
+		             data-question-id="${question.id}"
+		             data-input-source="API"
+		             data-answer-type="dropdown"
+		             data-mandatory="${question.ismandatory}">
+
+		            <label>
+		                ${escapeHtml(question.question_name)}
+		                ${requiredMark}
+		            </label>
+
+		            <select class="form-control dynamic-field api-dropdown select2"
+		                    name="edit_question_${question.id}_${refId}"
+		                    data-question-id="${question.id}"
+		                    data-ref-id="${refId}"
+		                    data-answer-type="dropdown"
+		                    data-input-source="API"
+		                    data-api-name="${escapeHtml(question.api_name || '')}"
+		                    data-mandatory="${question.ismandatory}"
+		                    data-saved-value="${escapeHtml(savedValue || '')}">
+
+		                <option value="">Select</option>
+
+		            </select>
+
+		            <small class="text-danger validation-error"></small>
+		        </div>
+		    `;
+		}
+	
+	function initializeEditSelect2(
+		    selectElement,
+		    placeholder
+		) {
+
+		    if (
+		        selectElement.hasClass(
+		            "select2-hidden-accessible"
+		        )
+		    ) {
+
+		        selectElement.select2("destroy");
+		    }
+
+		    selectElement.select2({
+
+		        placeholder: placeholder,
+
+		        allowClear: true,
+
+		        width: "100%",
+
+		        dropdownParent: $("#editWorkModal")
+		    });
+		}
+	
+	function loadEditApiDropdown(selectElement, savedValue) {
+
+	    var apiName = String(
+	        selectElement.attr("data-api-name") || ""
+	    ).toUpperCase();
+
+	    if (!apiName) {
+	        return;
+	    }
+
+	    // =========================
+	    // ZONE
+	    // =========================
+	    if (apiName === "ZONE") {
+
+	        loadEditZones(
+	            selectElement,
+	            savedValue
+	        );
+	    }
+
+	    // =========================
+	    // WARD
+	    // =========================
+	    else if (apiName === "WARD") {
+
+	        selectElement.empty();
+
+	        selectElement.append(
+	            '<option value="">Select Ward</option>'
+	        );
+
+	        /*
+	         * Ward depends on Zone.
+	         *
+	         * Zone will be loaded first.
+	         * So don't load Ward directly here.
+	         */
+	    }
+
+	    // =========================
+	    // ROAD
+	    // =========================
+	    else if (apiName === "ROAD") {
+
+	        selectElement.empty();
+
+	        selectElement.append(
+	            '<option value="">Select Road / Street</option>'
+	        );
+
+	        /*
+	         * Road depends on Ward.
+	         *
+	         * Ward will be loaded first.
+	         * So don't load Road directly here.
+	         */
+	    }
+	}
+	
+	function loadEditZones(selectElement, savedValue) {
+
+	    $("#pageLoader").show();
+
+	    $.ajax({
+
+	        url: '/gcc/api/works/estimates/getzones',
+
+	        type: 'GET',
+
+	        dataType: 'json',
+
+	        success: function(response) {
+
+	            selectElement.empty();
+
+	            selectElement.append(
+	                '<option value="">Select Zone</option>'
+	            );
+
+	            response.forEach(function(item) {
+
+	                selectElement.append(
+	                    $('<option>', {
+	                        value: item.zone,
+	                        text: item.zone
+	                    })
+	                );
+	            });
+
+	            // Restore saved zone
+	            if (
+	                savedValue !== null &&
+	                savedValue !== undefined &&
+	                savedValue !== ""
+	            ) {
+
+	                selectElement.val(
+	                    savedValue
+	                );
+	            }
+
+	            // Initialize Select2
+	            initializeEditSelect2(
+	                selectElement,
+	                "Select Zone"
+	            );
+
+	            $("#pageLoader").hide();
+
+	            /*
+	             * After Zone is restored,
+	             * load Ward for the same question container.
+	             */
+	            if (savedValue) {
+
+	                var questionContainer =
+	                    selectElement.closest(
+	                        "#editQuestionContainer"
+	                    );
+
+	                var wardSelect =
+	                    questionContainer.find(
+	                        '.api-dropdown[data-api-name="WARD"]'
+	                    );
+
+	                if (wardSelect.length > 0) {
+
+	                    var savedWard =
+	                        wardSelect.attr(
+	                            "data-saved-value"
+	                        );
+
+	                    loadEditWards(
+	                        savedValue,
+	                        wardSelect,
+	                        savedWard
+	                    );
+	                }
+	            }
+	        },
+
+	        error: function(xhr, status, error) {
+
+	            $("#pageLoader").hide();
+
+	            console.log(
+	                "Error loading edit zones:",
+	                error
+	            );
+	        }
+	    });
+	}
+	
+	function loadEditWards(
+		    zone,
+		    selectElement,
+		    savedValue
+		) {
+
+		    if (!zone) {
+
+		        selectElement.empty();
+
+		        selectElement.append(
+		            '<option value="">Select Ward</option>'
+		        );
+
+		        return;
+		    }
+
+		    $("#pageLoader").show();
+
+		    $.ajax({
+
+		        url: '/gcc/api/works/estimates/getwards',
+
+		        type: 'GET',
+
+		        data: {
+		            zone: zone
+		        },
+
+		        dataType: 'json',
+
+		        success: function(response) {
+
+		            selectElement.empty();
+
+		            selectElement.append(
+		                '<option value="">Select Ward</option>'
+		            );
+
+		            response.forEach(function(item) {
+
+		                selectElement.append(
+		                    $('<option>', {
+		                        value: item.ward,
+		                        text: item.ward
+		                    })
+		                );
+		            });
+
+		            // Restore saved Ward
+		            if (
+		                savedValue !== null &&
+		                savedValue !== undefined &&
+		                savedValue !== ""
+		            ) {
+
+		                selectElement.val(
+		                    savedValue
+		                );
+		            }
+
+		            initializeEditSelect2(
+		                selectElement,
+		                "Select Ward"
+		            );
+
+		            $("#pageLoader").hide();
+
+		            /*
+		             * After Ward is restored,
+		             * load Road.
+		             */
+		            if (savedValue) {
+
+		                var questionContainer =
+		                    selectElement.closest(
+		                        "#editQuestionContainer"
+		                    );
+
+		                var roadSelect =
+		                    questionContainer.find(
+		                        '.api-dropdown[data-api-name="ROAD"]'
+		                    );
+
+		                if (roadSelect.length > 0) {
+
+		                    var savedRoad =
+		                        roadSelect.attr(
+		                            "data-saved-value"
+		                        );
+
+		                    loadEditRoads(
+		                        savedValue,
+		                        roadSelect,
+		                        savedRoad
+		                    );
+		                }
+		            }
+		        },
+
+		        error: function(xhr, status, error) {
+
+		            $("#pageLoader").hide();
+
+		            console.log(
+		                "Error loading edit wards:",
+		                error
+		            );
+		        }
+		    });
+		}
+	
+	
+	function loadEditRoads(
+		    ward,
+		    selectElement,
+		    savedValue
+		) {
+
+		    if (!ward) {
+
+		        selectElement.empty();
+
+		        selectElement.append(
+		            '<option value="">Select Road / Street</option>'
+		        );
+
+		        return;
+		    }
+
+		    $("#pageLoader").show();
+
+		    $.ajax({
+
+		        url: '/gcc/api/works/estimates/getroadsbyward',
+
+		        type: 'GET',
+
+		        data: {
+		            ward: ward
+		        },
+
+		        dataType: 'json',
+
+		        success: function(response) {
+
+		            selectElement.empty();
+
+		            selectElement.append(
+		                '<option value="">Select Road / Street</option>'
+		            );
+
+		            response.forEach(function(item) {
+
+		                var roadValue =
+		                    item.road_id + "," +
+		                    item.road_name + "," +
+		                    item.locality + "," +
+		                    item.area_name + "," +
+		                    item.type;
+
+		                var displayroadValue =
+		                    item.road_name + "," +
+		                    item.locality + "," +
+		                    item.area_name + "," +
+		                    item.type;
+
+		                selectElement.append(
+		                    $('<option>', {
+		                        value: roadValue,
+		                        text: displayroadValue
+		                    })
+		                );
+		            });
+
+		            // Restore saved Road
+		            if (
+		                savedValue !== null &&
+		                savedValue !== undefined &&
+		                savedValue !== ""
+		            ) {
+
+		                selectElement.val(
+		                    savedValue
+		                );
+		            }
+
+		            initializeEditSelect2(
+		                selectElement,
+		                "Select Road / Street"
+		            );
+
+		            $("#pageLoader").hide();
+		        },
+
+		        error: function(xhr, status, error) {
+
+		            $("#pageLoader").hide();
+
+		            console.log(
+		                "Error loading edit roads:",
+		                error
+		            );
+		        }
+		    });
+		}
+	
+	function validateEditRoadDuplicate() {
+
+	    if (parseInt(subcategory_id) !== 4) {
+	        return true;
+	    }
+
+	    var currentRefId = String(editRefId);
+
+	    var roadIds = {};
+
+	    // Existing saved records
+	    savedWorkData.forEach(function(set) {
+
+	         if (String(set.ref_id) === currentRefId) {
+	            return;
+	        } 
+
+	        if (!set.questions) {
+	            return;
+	        }
+
+	        set.questions.forEach(function(question) {
+
+	            if (
+	                String(question.input_source).toUpperCase() === "API"
+	                &&
+	                String(question.api_name).toUpperCase() === "ROAD"
+	            ) {
+
+	                var value = question.answer;
+
+	                if (!value) {
+	                    return;
+	                }
+
+	                var roadId =
+	                    String(value).split(",")[0].trim();
+
+	                if (roadId) {
+	                    roadIds[roadId] = true;
+	                }
+	            }
+	        });
+	    });
+
+	    // Current edit value
+	    var roadField =
+	        $('#editQuestionContainer .api-dropdown[data-api-name="ROAD"]');
+
+	    if (roadField.length === 0) {
+	        return true;
+	    }
+
+	    var value = roadField.val();
+
+	    if (!value) {
+	        return true;
+	    }
+
+	    var roadId =
+	        String(value).split(",")[0].trim();
+
+	    if (roadIds[roadId]) {
+
+	        Swal.fire({
+	            icon: "warning",
+	            title: "Duplicate Road",
+	            text: "The same road cannot be selected in another work detail."
+	        });
+
+	        return false;
+	    }
+
+	    return true;
+	}
+	
+	$(document).on("click", "#updateWorkBtn", function() {
+
+	    if (!validateWorkDetails("#editQuestionContainer")) {
+	        return;
+	    }
+	    
+	    /* Zone / Ward / Road group validation */
+	     
+	    /* if (parseInt(subcategory_id) !== 4) {
+
+	        if (!validateLocationGroup(
+	            $("#editQuestionContainer")
+	        )) {
+
+	            Swal.fire({
+	                icon: "warning",
+	                title: "Incomplete Location Details",
+	                text: "Please select Zone, Ward and Road / Street together, or leave all three empty.",
+	                confirmButtonText: "OK"
+	            });
+
+	            return;
+	        }
+	    } */
+
+	    /* Existing duplicate road validation */
+	    if (parseInt(subcategory_id) === 4) {
+
+	        if (!validateEditRoadDuplicate()) {
+	            return;
+	        }
+	    }
+
+	    var details = [];
+	    var textDetails = [];
+
+	    $("#editQuestionContainer")
+	        .find(".dynamic-field")
+	        .each(function() {
+
+	            var field = $(this);
+
+	            var questionId =
+	                field.attr("data-question-id");
+
+	            var answerType =
+	                String(
+	                    field.attr("data-answer-type") || ""
+	                ).toLowerCase();
+
+	            var inputSource =
+	                String(
+	                    field.attr("data-input-source") || ""
+	                ).toUpperCase();
+
+	            if (answerType === "radio") {
+
+	                if (!field.is(":checked")) {
+	                    return;
+	                }
+
+	                if (inputSource === "MASTER") {
+
+	                    details.push({
+	                        estid: parseInt(editEstId),
+	                        question_id: parseInt(questionId),
+	                        answer_id: parseInt(field.val()),
+	                        ref_id: parseInt(editRefId)
+	                    });
+
+	                } else {
+
+	                    textDetails.push({
+	                        estid: parseInt(editEstId),
+	                        question_id: parseInt(questionId),
+	                        answer: field.val(),
+	                        ref_id: parseInt(editRefId)
+	                    });
+	                }
+
+	            } else if (answerType === "dropdown") {
+
+	                var value = field.val();
+
+	                if (!value) {
+	                    return;
+	                }
+
+	                if (inputSource === "MASTER") {
+
+	                    details.push({
+	                        estid: parseInt(editEstId),
+	                        question_id: parseInt(questionId),
+	                        answer_id: parseInt(value),
+	                        ref_id: parseInt(editRefId)
+	                    });
+
+	                } else {
+
+	                    var apiName = String(
+	                        field.attr("data-api-name") || ""
+	                    ).toUpperCase();
+
+	                    /*
+	                     * For subcategory != 4,
+	                     * Zone/Ward/Road are handled separately below.
+	                     */
+	                    if (
+	                        parseInt(subcategory_id) !== 4 &&
+	                        (
+	                            apiName === "ZONE" ||
+	                            apiName === "WARD" ||
+	                            apiName === "ROAD"
+	                        )
+	                    ) {
+	                        return;
+	                    }
+
+	                    textDetails.push({
+	                        estid: parseInt(editEstId),
+	                        question_id: parseInt(questionId),
+	                        answer: value,
+	                        ref_id: parseInt(editRefId)
+	                    });
+	                }
+
+	            } else {
+
+	                var value = field.val();
+
+	                if (
+	                    value === null ||
+	                    value === undefined ||
+	                    String(value).trim() === ""
+	                ) {
+	                    return;
+	                }
+
+	                textDetails.push({
+	                    estid: parseInt(editEstId),
+	                    question_id: parseInt(questionId),
+	                    answer: value,
+	                    ref_id: parseInt(editRefId)
+	                });
+	            }
+	        });
+	    
+	    /*
+	     * ==========================================
+	     * ZONE / WARD / ROAD
+	     * ==========================================
+	     *
+	     * For subcategory != 4:
+	     *
+	     * Therefore ALWAYS send all three.
+	     */
+	    if (parseInt(subcategory_id) !== 4) {
+
+	        var zoneField = $("#editQuestionContainer").find(
+	            '.api-dropdown[data-api-name="ZONE"]'
+	        );
+
+	        var wardField = $("#editQuestionContainer").find(
+	            '.api-dropdown[data-api-name="WARD"]'
+	        );
+
+	        var roadField = $("#editQuestionContainer").find(
+	            '.api-dropdown[data-api-name="ROAD"]'
+	        );
+
+	        if (zoneField.length > 0) {
+
+	            textDetails.push({
+	                estid: parseInt(editEstId),
+	                question_id: parseInt(
+	                    zoneField.attr("data-question-id")
+	                ),
+	                answer: zoneField.val() || "",
+	                ref_id: parseInt(editRefId)
+	            });
+	        }
+
+	        if (wardField.length > 0) {
+
+	            textDetails.push({
+	                estid: parseInt(editEstId),
+	                question_id: parseInt(
+	                    wardField.attr("data-question-id")
+	                ),
+	                answer: wardField.val() || "",
+	                ref_id: parseInt(editRefId)
+	            });
+	        }
+
+	        if (roadField.length > 0) {
+
+	            textDetails.push({
+	                estid: parseInt(editEstId),
+	                question_id: parseInt(
+	                    roadField.attr("data-question-id")
+	                ),
+	                answer: roadField.val() || "",
+	                ref_id: parseInt(editRefId)
+	            });
+	        }
+	    }
+
+	    var requestData = {
+	        estid: parseInt(editEstId),
+	        estimate_no:estimate_no,
+	        ref_id: parseInt(editRefId),
+	        subcategory_id: parseInt(subcategory_id),
+	        details: details,
+	        textDetails: textDetails,
+	        createdBy:parseInt(createdBy),
+	    };
+
+	    console.log("Update Request:",JSON.stringify(requestData, null, 2));
+
+	    $("#updateWorkBtn")
+	        .prop("disabled", true)
+	        .text("Updating...");
+
+	    $.ajax({
+
+	        url: "/gcc/api/works/estimates/updateSavedDetails",
+
+	        type: "POST",
+
+	        contentType: "application/json",
+
+	        dataType: "json",
+
+	        data: JSON.stringify(requestData),
+
+	        success: function(response) {
+
+	            if (response.status === true) {
+
+	                $("#editWorkModal").modal("hide");
+
+	                Swal.fire({
+	                    icon: "success",
+	                    title: "Updated",
+	                    text: response.message
+	                }).then(function() {
+
+	                    loadSavedWorkDetails(estid);
+	                });
+
+	            } else {
+
+	                Swal.fire({
+	                    icon: "error",
+	                    title: "Unable to Update",
+	                    text: response.message
+	                });
+	            }
+	        },
+
+	        error: function(xhr) {
+
+	            console.log(
+	                "Update error:",
+	                xhr.responseText
+	            );
+
+	            Swal.fire({
+	                icon: "error",
+	                title: "Error",
+	                text: "Unable to update work details."
+	            });
+	        },
+
+	        complete: function() {
+
+	            $("#updateWorkBtn")
+	                .prop("disabled", false)
+	                .text("Update");
+	        }
+	    });
+	});
+	
+	$(document).on(
+		    "change",
+		    '#editQuestionContainer .api-dropdown[data-api-name="ZONE"]',
+		    function() {
+
+		        var zoneSelect = $(this);
+
+		        var zone = zoneSelect.val();
+
+		        var container =
+		            zoneSelect.closest(
+		                "#editQuestionContainer"
+		            );
+
+		        var wardSelect =
+		            container.find(
+		                '.api-dropdown[data-api-name="WARD"]'
+		            );
+
+		        var roadSelect =
+		            container.find(
+		                '.api-dropdown[data-api-name="ROAD"]'
+		            );
+
+		        // Clear Ward
+		        wardSelect.empty();
+
+		        wardSelect.append(
+		            '<option value="">Select Ward</option>'
+		        );
+
+		        // Clear Road
+		        roadSelect.empty();
+
+		        roadSelect.append(
+		            '<option value="">Select Road / Street</option>'
+		        );
+
+		        if (
+		            wardSelect.hasClass(
+		                "select2-hidden-accessible"
+		            )
+		        ) {
+		            wardSelect.trigger("change");
+		        }
+
+		        if (
+		            roadSelect.hasClass(
+		                "select2-hidden-accessible"
+		            )
+		        ) {
+		            roadSelect.trigger("change");
+		        }
+
+		        if (!zone) {
+		            return;
+		        }
+
+		        loadEditWards(
+		            zone,
+		            wardSelect,
+		            null
+		        );
+		    }
+		);
+	
+	$(document).on(
+		    "change",
+		    '#editQuestionContainer .api-dropdown[data-api-name="WARD"]',
+		    function() {
+
+		        var wardSelect = $(this);
+
+		        var ward = wardSelect.val();
+
+		        var container =
+		            wardSelect.closest(
+		                "#editQuestionContainer"
+		            );
+
+		        var roadSelect =
+		            container.find(
+		                '.api-dropdown[data-api-name="ROAD"]'
+		            );
+
+		        roadSelect.empty();
+
+		        roadSelect.append(
+		            '<option value="">Select Road / Street</option>'
+		        );
+
+		        if (
+		            roadSelect.hasClass(
+		                "select2-hidden-accessible"
+		            )
+		        ) {
+		            roadSelect.trigger("change");
+		        }
+
+		        if (!ward) {
+		            return;
+		        }
+
+		        loadEditRoads(
+		            ward,
+		            roadSelect,
+		            null
+		        );
+		    }
+		);
+    
+    </script>
+    </body>
+
+    </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/modules/works/erp-works-list.html b/src/main/resources/templates/modules/works/erp-works-list.html
index f0a1495..51cb449 100644
--- a/src/main/resources/templates/modules/works/erp-works-list.html
+++ b/src/main/resources/templates/modules/works/erp-works-list.html
@@ -318,7 +318,7 @@
             //alert("finYear:"+finYear);
             //alert("oValue:"+oValue);
             
-        	var apiUrl = '/gcc/works/api/estimates/getFilteredERpWorksList?loginId='+createdBy+'&finYear='+finYear+'&oValue='+oValue;
+        	var apiUrl = '/gcc/api/works/estimates/getFilteredERpWorksList?loginId='+createdBy+'&finYear='+finYear+'&oValue='+oValue;
     	    // Return a Promise
     	    return new Promise(function(resolve, reject) {
     	        $.ajax({
@@ -714,7 +714,7 @@
             formData.set("isiconic", iconicProjectValue);
             
             $.ajax({
-                url: "/gcc/works/api/estimates/saveEstimateWorkDetails",
+                url: "/gcc/api/works/estimates/saveEstimateWorkDetails",
                 type: "POST",
                 contentType: false,
                 processData: false,
diff --git a/src/main/resources/templates/modules/works/erp-works-update.html b/src/main/resources/templates/modules/works/erp-works-update.html
index 7979671..174524a 100644
--- a/src/main/resources/templates/modules/works/erp-works-update.html
+++ b/src/main/resources/templates/modules/works/erp-works-update.html
@@ -550,7 +550,7 @@
 
         // AJAX call
         $.ajax({
-            url: "/gcc/works/api/estimates/getERPWorksDetails",
+            url: "/gcc/api/works/estimates/getERPWorksDetails",
             type: "GET",
             data: requestData,
             dataType: "json",
@@ -724,7 +724,7 @@ document.addEventListener("DOMContentLoaded", function () {
     }
 
     function loadScheme() {
-        fetch('/gcc/works/api/estimates/getSchemeList')
+        fetch('/gcc/api/works/estimates/getSchemeList')
             .then(response => response.json())
             .then(data => {
                 let schemeDropdown = document.getElementById('scheme');
@@ -741,7 +741,7 @@ document.addEventListener("DOMContentLoaded", function () {
     }
 
     function loadCategory() {
-        fetch('/gcc/works/api/estimates/getCategoryList')
+        fetch('/gcc/api/works/estimates/getCategoryList')
             .then(response => response.json())
             .then(data => {
                 let categoryDropdown = document.getElementById('category');
@@ -758,7 +758,7 @@ document.addEventListener("DOMContentLoaded", function () {
     }
 
     function loadSubCategory() {
-        fetch('/gcc/works/api/estimates/getSubCategoryList')
+        fetch('/gcc/api/works/estimates/getSubCategoryList')
             .then(response => response.json())
             .then(data => {
                 let subCategoryDropdown = document.getElementById('subcategory');
@@ -775,7 +775,7 @@ document.addEventListener("DOMContentLoaded", function () {
     }
 
     function loadDepartment() {
-        fetch('/gcc/works/api/estimates/getDepartmentList')
+        fetch('/gcc/api/works/estimates/getDepartmentList')
             .then(response => response.json())
             .then(data => {
                 let departmentDropdown = document.getElementById('department');
@@ -792,7 +792,7 @@ document.addEventListener("DOMContentLoaded", function () {
     }
 
     function loadSource() {
-        fetch('/gcc/works/api/estimates/getSourceofFundList')
+        fetch('/gcc/api/works/estimates/getSourceofFundList')
             .then(response => response.json())
             .then(data => {
                 let SourceDropDown = document.getElementById('fundsource');
@@ -809,7 +809,7 @@ document.addEventListener("DOMContentLoaded", function () {
     }
 
     function loadEstCode() {
-        fetch('/gcc/works/api/estimates/getEstimateCode')
+        fetch('/gcc/api/works/estimates/getEstimateCode')
             .then(response => response.json())
             .then(data => {
                 let estCodeDropdown = document.getElementById('estcode');
@@ -877,7 +877,7 @@ document.addEventListener("DOMContentLoaded", function () {
         }
 
         $.ajax({
-            url: "/gcc/works/api/estimates/save",
+            url: "/gcc/api/works/estimates/save",
             type: "POST",
             data: formData,
             processData: false,
diff --git a/src/main/resources/templates/modules/works/erpworkslist.html b/src/main/resources/templates/modules/works/erpworkslist.html
index 59b2ceb..589d903 100644
--- a/src/main/resources/templates/modules/works/erpworkslist.html
+++ b/src/main/resources/templates/modules/works/erpworkslist.html
@@ -131,6 +131,7 @@
                                    
                                     <th>Estimation Amount</th>
                                     <th>Order Value</th>
+                                     <th>Add Works</th>
                                 </tr>
                                 </thead>
                                 <tbody>
@@ -316,7 +317,7 @@
             var oValue = document.getElementById('oValue').value;
             //alert(finYear);
             //alert(oValue);
-        	var apiUrl = '/gcc/works/api/estimates/getFilteredERpWorksListByLogin?loginId='+createdBy+'&finYear='+finYear+'&oValue='+oValue;
+        	var apiUrl = '/gcc/api/works/estimates/getFilteredERpWorksListByLogin?loginId='+createdBy+'&finYear='+finYear+'&oValue='+oValue;
     	    // Return a Promise
     	    return new Promise(function(resolve, reject) {
     	        $.ajax({
@@ -384,6 +385,16 @@
         	                    	<a class="dropdown-item" href="" onclick="return updateUserWorksListBreakup('`+row['estid']+`');" data-animation="true" data-toggle="tooltip" data-placement="top" data-html="true" title="Add/Edit Work Breakup"><i class="ik ik-edit"></i> Update Work tasks</a>-->
         	                    </div>
         	              </div>`;
+        	              
+        	              AddWorksButtonHTML = `
+        	              <div>
+        	                  <button id="addworksbtn"
+        	                          class="btn btn-primary"
+        	                          onclick="return gotopage('${row['estid']}', '${row['sub_category_id']}' ,'${row['estimate_no']}','${row['sub_category']}' );">
+        	                      Add works
+        	                  </button>
+        	              </div>
+        	          `;
 
         	    table.row.add([
         	        rowNum++,
@@ -396,7 +407,8 @@
         	        row['sub_category'],
         	        row['project_name'],
         	        row['estimation_amount'],
-        	        row['est_val_with_oh']
+        	        row['est_val_with_oh'],
+        	        AddWorksButtonHTML
         	    ]);
         	});
 
@@ -408,6 +420,15 @@
             remove_loading(); // remove Loading 
 		}
         
+        function gotopage(estid, subCategoryId,estimate_no,sub_category) {
+       	 var url = "/gcc/works/addworks"
+       	        + "?estid=" + encodeURIComponent(estid)
+       	        + "&sub_category_id=" + encodeURIComponent(subCategoryId)
+       	        + "&estimate_no=" + encodeURIComponent(estimate_no)
+       	        + "&sub_category=" + encodeURIComponent(sub_category);
+
+       	    window.open(url, "_blank");
+       }
         
         function viewUserWorksSummary(estid){
         	$("#viewWorks").modal({
@@ -726,7 +747,7 @@
             formData.set("isiconic", iconicProjectValue);
             
             $.ajax({
-                url: "/gcc/works/api/estimates/updateEstimateWorkDetails",
+                url: "/gcc/api/works/estimates/updateEstimateWorkDetails",
                 type: "POST",
                 contentType: false,
                 processData: false,
diff --git a/src/main/resources/templates/modules/works/erpworkslist_old.html b/src/main/resources/templates/modules/works/erpworkslist_old.html
index 22593b6..93b80cc 100644
--- a/src/main/resources/templates/modules/works/erpworkslist_old.html
+++ b/src/main/resources/templates/modules/works/erpworkslist_old.html
@@ -1356,7 +1356,7 @@
                     });
                 } else {
                     $.ajax({
-                        url: "/gcc/works/api/estimates/getFilteredWorks",
+                        url: "/gcc/api/works/estimates/getFilteredWorks",
                         type: "GET",
                         data: {
                             zone: zone,
@@ -1463,7 +1463,7 @@
         $('#worksDatatable').on('click', 'td:nth-child(2)', function () {
             var estimateNo = $(this).text().trim();
             $.ajax({
-                url: '/gcc/works/api/estimates/fetchERPdetails',
+                url: '/gcc/api/works/estimates/fetchERPdetails',
                 method: 'GET',
                 data: {estimateNo: estimateNo},
                 success: function (response) {
@@ -1786,7 +1786,7 @@
             }
 
             $.ajax({
-                url: "/gcc/works/api/estimates/updateERPEstimate",
+                url: "/gcc/api/works/estimates/updateERPEstimate",
                 type: "POST",
                 contentType: false,
                 processData: false,
@@ -1940,7 +1940,7 @@
         }
 
         function loadScheme() {
-            fetch('/gcc/works/api/estimates/getSchemeList')
+            fetch('/gcc/api/works/estimates/getSchemeList')
                 .then(response => response.json())
                 .then(data => {
                     let schemeDropdown = document.getElementById('erpscheme');
@@ -1957,7 +1957,7 @@
         }
 
         function loadCategory() {
-            fetch('/gcc/works/api/estimates/getCategoryList')
+            fetch('/gcc/api/works/estimates/getCategoryList')
                 .then(response => response.json())
                 .then(data => {
                     let categoryDropdown = document.getElementById('erpcategory');
@@ -1974,7 +1974,7 @@
         }
 
         function loadSubCategory() {
-            fetch('/gcc/works/api/estimates/getSubCategoryList')
+            fetch('/gcc/api/works/estimates/getSubCategoryList')
                 .then(response => response.json())
                 .then(data => {
                     let subCategoryDropdown = document.getElementById('erpsubcategory');
@@ -1991,7 +1991,7 @@
         }
 
         function loadDepartment() {
-            fetch('/gcc/works/api/estimates/getDepartmentList')
+            fetch('/gcc/api/works/estimates/getDepartmentList')
                 .then(response => response.json())
                 .then(data => {
                     let departmentDropdown = document.getElementById('erpdepartment');
@@ -2008,7 +2008,7 @@
         }
 
         function loadSource() {
-            fetch('/gcc/works/api/estimates/getSourceofFundList')
+            fetch('/gcc/api/works/estimates/getSourceofFundList')
                 .then(response => response.json())
                 .then(data => {
                     let SourceDropDown = document.getElementById('erpfundsource');
@@ -2045,7 +2045,7 @@
         }
 
         function loadDepartmentFilter() {
-            fetch('/gcc/works/api/estimates/getDepartmentList')
+            fetch('/gcc/api/works/estimates/getDepartmentList')
                 .then(response => response.json())
                 .then(data => {
                     let departmentDropdown = document.getElementById('departmentf');
@@ -2062,7 +2062,7 @@
         }
 
         function loadSourceFilter() {
-            fetch('/gcc/works/api/estimates/getSourceofFundList')
+            fetch('/gcc/api/works/estimates/getSourceofFundList')
                 .then(response => response.json())
                 .then(data => {
                     let SourceDropDown = document.getElementById('fundsourcef');
@@ -2125,7 +2125,7 @@
 
         function fetchEstimateInformation(estimateCode) {
             $.ajax({
-                url: '/gcc/works/api/estimates/getestimatedetails', // API to fetch employee details
+                url: '/gcc/api/works/estimates/getestimatedetails', // API to fetch employee details
                 type: 'GET',
                 data: {estimateCode: estimateCode}, // Pass EMPLOYEE_CODE as a parameter
                 success: function (response) {
@@ -2255,7 +2255,7 @@
 
         function fetchEstimateDetails(estimateCode) {
             $.ajax({
-                url: '/gcc/works/api/estimates/getestimatedetails', // API to fetch employee details
+                url: '/gcc/api/works/estimates/getestimatedetails', // API to fetch employee details
                 type: 'GET',
                 data: {estimateCode: estimateCode}, // Pass EMPLOYEE_CODE as a parameter
                 success: function (response) {
@@ -2308,7 +2308,7 @@
 
         $(document).ready(function () {
             $.ajax({
-                url: "/gcc/works/api/estimates/reasonlist",
+                url: "/gcc/api/works/estimates/reasonlist",
                 type: "GET",
                 dataType: "json",
                 success: function (response) {
@@ -2422,7 +2422,7 @@
                 console.log("subCategoryId", subCategoryId)
 
                 $.ajax({
-                    url: "/gcc/works/api/estimates/questions", // Your API endpoint
+                    url: "/gcc/api/works/estimates/questions", // Your API endpoint
                     type: "GET",
                     data: {subCatId: subCategoryId},  // Passing sub_cat_id dynamically
                     dataType: "json",
@@ -2684,7 +2684,7 @@
 
             function fetchRelatedQuestions(answerId, parentDiv) {
                 $.ajax({
-                    url: `/gcc/works/api/estimates/answerIdd?answerId=${answerId}`, // Your API URL
+                    url: `/gcc/api/works/estimates/answerIdd?answerId=${answerId}`, // Your API URL
                     type: "GET",
                     dataType: "json",
                     success: function (response) {
@@ -2818,7 +2818,7 @@
             }
 
             $.ajax({
-                url: "/gcc/works/api/estimates/saveErplist",
+                url: "/gcc/api/works/estimates/saveErplist",
                 type: "POST",
                 contentType: "application/json",
                 data: JSON.stringify(selectedData),
@@ -2861,7 +2861,7 @@
 
             // Fetch Saved Data for the Estimate Number
             $.ajax({
-                url: `/gcc/works/api/estimates/fetchErpData?estimateNumber=${encodeURIComponent(estimateNo)}`,
+                url: `/gcc/api/works/estimates/fetchErpData?estimateNumber=${encodeURIComponent(estimateNo)}`,
                 type: "GET",
                 success: function (response) {
                     console.log("response>>>>>>>>>>>>>>", response)
diff --git a/src/main/resources/templates/modules/works/erpworkslist_report.html b/src/main/resources/templates/modules/works/erpworkslist_report.html
index 8c36099..6765a96 100644
--- a/src/main/resources/templates/modules/works/erpworkslist_report.html
+++ b/src/main/resources/templates/modules/works/erpworkslist_report.html
@@ -350,7 +350,7 @@
         /* Get Erp works Data */
         async function get_erp_work_data() {
         	
-        	var apiUrl = '/gcc/works/api/estimates/getFilteredERpWorksListByLogin?loginId='+createdBy;
+        	var apiUrl = '/gcc/api/works/estimates/getFilteredERpWorksListByLogin?loginId='+createdBy;
     	    // Return a Promise
     	    return new Promise(function(resolve, reject) {
     	        $.ajax({
@@ -741,7 +741,7 @@
             formData.set("isiconic", iconicProjectValue);
             
             $.ajax({
-                url: "/gcc/works/api/estimates/updateEstimateWorkDetails",
+                url: "/gcc/api/works/estimates/updateEstimateWorkDetails",
                 type: "POST",
                 contentType: false,
                 processData: false,
diff --git a/src/main/resources/templates/modules/works/non-erp-works-add.html b/src/main/resources/templates/modules/works/non-erp-works-add.html
index 67dddeb..35390b3 100644
--- a/src/main/resources/templates/modules/works/non-erp-works-add.html
+++ b/src/main/resources/templates/modules/works/non-erp-works-add.html
@@ -585,7 +585,7 @@
         }
 
         function loadScheme() {
-            fetch('/gcc/works/api/estimates/getSchemeList')
+            fetch('/gcc/api/works/estimates/getSchemeList')
                 .then(response => response.json())
                 .then(data => {
                     let schemeDropdown = document.getElementById('scheme');
@@ -602,7 +602,7 @@
         }
 
         function loadCategory() {
-            fetch('/gcc/works/api/estimates/getCategoryList')
+            fetch('/gcc/api/works/estimates/getCategoryList')
                 .then(response => response.json())
                 .then(data => {
                     let categoryDropdown = document.getElementById('category');
@@ -619,7 +619,7 @@
         }
 
         function loadSubCategory() {
-            fetch('/gcc/works/api/estimates/getSubCategoryList')
+            fetch('/gcc/api/works/estimates/getSubCategoryList')
                 .then(response => response.json())
                 .then(data => {
                     let subCategoryDropdown = document.getElementById('subcategory');
@@ -636,7 +636,7 @@
         }
 
         function loadDepartment() {
-            fetch('/gcc/works/api/estimates/getDepartmentList')
+            fetch('/gcc/api/works/estimates/getDepartmentList')
                 .then(response => response.json())
                 .then(data => {
                     let departmentDropdown = document.getElementById('department');
@@ -653,7 +653,7 @@
         }
 
         function loadSource() {
-            fetch('/gcc/works/api/estimates/getSourceofFundList')
+            fetch('/gcc/api/works/estimates/getSourceofFundList')
                 .then(response => response.json())
                 .then(data => {
                     let SourceDropDown = document.getElementById('fundsource');
@@ -851,7 +851,7 @@
 
             // Submit the form data using AJAX
             $.ajax({
-                url: "/gcc/works/api/estimates/nonerpForm",
+                url: "/gcc/api/works/estimates/nonerpForm",
                 type: "POST",
                 data: formData,
                 processData: false,
@@ -894,7 +894,7 @@
 
         $(document).ready(function () {
             $.ajax({
-                url: "/gcc/works/api/estimates/reasonlist",
+                url: "/gcc/api/works/estimates/reasonlist",
                 type: "GET",
                 dataType: "json",
                 success: function (response) {
diff --git a/src/main/resources/templates/modules/works/nonerpworkslist.html b/src/main/resources/templates/modules/works/nonerpworkslist.html
index d2e4124..8f8c303 100644
--- a/src/main/resources/templates/modules/works/nonerpworkslist.html
+++ b/src/main/resources/templates/modules/works/nonerpworkslist.html
@@ -213,12 +213,24 @@
                                     <td th:text="${work['sub_category']}"></td>
                                     <td th:text="${work['filenumber']}"></td>
                                     <td th:text="${work['estimation_amount']}"></td>
+                                    
                                     <td>
+									    <button type="button"
+									            class="btn btn-primary btn-sm add-works-btn"
+									            th:data-estid="${work['estid']}"
+									            th:data-subcategory-id="${work['sub_category_id']}"
+									            th:data-estimate-no="${work['estimate_no']}"
+									            th:data-sub-category="${work['sub_category']}">
+									        Add Works
+									    </button>
+									</td>
+                                    
+                                    <!-- <td>
                                         <button class="btn btn-primary btn-sm view-btn"
                                                 th:attr="data-id=${work['estimate_no']}">
                                             Add Works
                                         </button>
-                                    </td>
+                                    </td> -->
                                     <!-- <td>
                                         <button class="btn btn-primary btn-sm btn-view"
                                                 th:attr="data-id=${work['estimate_no']}">
@@ -947,7 +959,7 @@
     /* Get Erp works Data */
     async function get_erp_work_data() {
     	
-    	var apiUrl = '/gcc/works/api/estimates/getFilteredERpWorksList?loginId='+createdBy;
+    	var apiUrl = '/gcc/api/works/estimates/getFilteredERpWorksList?loginId='+createdBy;
 	    // Return a Promise
 	    return new Promise(function(resolve, reject) {
 	        $.ajax({
@@ -1201,7 +1213,7 @@
                     });
                 } else {
                     $.ajax({
-                        url: "/gcc/works/api/estimates/getFilteredWorks",
+                        url: "/gcc/api/works/estimates/getFilteredWorks",
                         type: "GET",
                         data: {
                             zone: zone,
@@ -1308,7 +1320,7 @@
         $('#worksDatatable').on('click', 'td:nth-child(2)', function () {
             var estimateNo = $(this).text().trim();
             $.ajax({
-                url: '/gcc/works/api/estimates/fetchnonerpdetails',
+                url: '/gcc/api/works/estimates/fetchnonerpdetails',
                 method: 'GET',
                 data: {estimateNo: estimateNo},
                 success: function (response) {
@@ -1645,7 +1657,7 @@
             }
 
             $.ajax({
-                url: "/gcc/works/api/estimates/updateEstimate",
+                url: "/gcc/api/works/estimates/updateEstimate",
                 type: "POST",
                 contentType: false,
                 processData: false,
@@ -1866,7 +1878,7 @@
         }
 
         function loadScheme() {
-            fetch('/gcc/works/api/estimates/getSchemeList')
+            fetch('/gcc/api/works/estimates/getSchemeList')
                 .then(response => response.json())
                 .then(data => {
                     let schemeDropdown = document.getElementById('scheme');
@@ -1883,7 +1895,7 @@
         }
 
         function loadCategory() {
-            fetch('/gcc/works/api/estimates/getCategoryList')
+            fetch('/gcc/api/works/estimates/getCategoryList')
                 .then(response => response.json())
                 .then(data => {
                     let categoryDropdown = document.getElementById('category');
@@ -1900,7 +1912,7 @@
         }
 
         function loadSubCategory() {
-            fetch('/gcc/works/api/estimates/getSubCategoryList')
+            fetch('/gcc/api/works/estimates/getSubCategoryList')
                 .then(response => response.json())
                 .then(data => {
                     let subCategoryDropdown = document.getElementById('subcategory');
@@ -1917,7 +1929,7 @@
         }
 
         function loadDepartment() {
-            fetch('/gcc/works/api/estimates/getDepartmentList')
+            fetch('/gcc/api/works/estimates/getDepartmentList')
                 .then(response => response.json())
                 .then(data => {
                     let departmentDropdown = document.getElementById('department');
@@ -1934,7 +1946,7 @@
         }
 
         function loadSource() {
-            fetch('/gcc/works/api/estimates/getSourceofFundList')
+            fetch('/gcc/api/works/estimates/getSourceofFundList')
                 .then(response => response.json())
                 .then(data => {
                     let SourceDropDown = document.getElementById('fundsource');
@@ -1971,7 +1983,7 @@
         }
 
         function loadDepartmentFilter() {
-            fetch('/gcc/works/api/estimates/getDepartmentList')
+            fetch('/gcc/api/works/estimates/getDepartmentList')
                 .then(response => response.json())
                 .then(data => {
                     let departmentDropdown = document.getElementById('departmentf');
@@ -1988,7 +2000,7 @@
         }
 
         function loadSourceFilter() {
-            fetch('/gcc/works/api/estimates/getSourceofFundList')
+            fetch('/gcc/api/works/estimates/getSourceofFundList')
                 .then(response => response.json())
                 .then(data => {
                     let SourceDropDown = document.getElementById('fundsourcef');
@@ -2051,7 +2063,7 @@
 
         function fetchEstimateInformation(estimateCode) {
             $.ajax({
-                url: '/gcc/works/api/estimates/getestimatedetails', // API to fetch employee details
+                url: '/gcc/api/works/estimates/getestimatedetails', // API to fetch employee details
                 type: 'GET',
                 data: {estimateCode: estimateCode}, // Pass EMPLOYEE_CODE as a parameter
                 success: function (response) {
@@ -2181,7 +2193,7 @@
 
         function fetchEstimateDetails(estimateCode) {
             $.ajax({
-                url: '/gcc/works/api/estimates/getestimatedetails', // API to fetch employee details
+                url: '/gcc/api/works/estimates/getestimatedetails', // API to fetch employee details
                 type: 'GET',
                 data: {estimateCode: estimateCode}, // Pass EMPLOYEE_CODE as a parameter
                 success: function (response) {
@@ -2234,7 +2246,7 @@
 
         $(document).ready(function () {
             $.ajax({
-                url: "/gcc/works/api/estimates/reasonlist",
+                url: "/gcc/api/works/estimates/reasonlist",
                 type: "GET",
                 dataType: "json",
                 success: function (response) {
@@ -2324,7 +2336,7 @@
 
                 // First, fetch the sub-category ID using its name
                 $.ajax({
-                    url: "/gcc/works/api/estimates/subcategory/id",
+                    url: "/gcc/api/works/estimates/subcategory/id",
                     //working one
                     type: "GET",
                     data: {name: subCategoryName},
@@ -2346,7 +2358,7 @@
                 console.log("subCategoryId", subCategoryId)
 
                 $.ajax({
-                    url: "/gcc/works/api/estimates/questions", // Your API endpoint
+                    url: "/gcc/api/works/estimates/questions", // Your API endpoint
                     type: "GET",
                     data: {subCatId: subCategoryId},  // Passing sub_cat_id dynamically
                     dataType: "json",
@@ -2486,7 +2498,7 @@
 
             function fetchRelatedQuestions(answerId, parentDiv) {
                 $.ajax({
-                    url: `/gcc/works/api/estimates/answerIdd?answerId=${answerId}`, // Your API URL
+                    url: `/gcc/api/works/estimates/answerIdd?answerId=${answerId}`, // Your API URL
                     type: "GET",
                     dataType: "json",
                     success: function (response) {
@@ -2596,7 +2608,7 @@
             }
 
             $.ajax({
-                url: "/gcc/works/api/estimates/save",
+                url: "/gcc/api/works/estimates/save",
                 type: "POST",
                 contentType: "application/json",
                 data: JSON.stringify(selectedData),
@@ -2626,7 +2638,7 @@
 
             // Fetch Saved Data for the Estimate Number
             $.ajax({
-                url: `/gcc/works/api/estimates/fetch?estimateNumber=${encodeURIComponent(estimateNo)}`,
+                url: `/gcc/api/works/estimates/fetch?estimateNumber=${encodeURIComponent(estimateNo)}`,
                 type: "GET",
                 success: function (response) {
                     console.log("response>>>>>>>>>>>>>>", response)
@@ -2709,6 +2721,33 @@
 
             $("#dynamicCardsViewContainer").html(formHtml);
         }
+        
+        
+        $(document).on("click", ".add-works-btn", function () {
+
+            var estid = $(this).data("estid");
+            var subCategoryId = $(this).data("subcategory-id");
+            var estimateNo = $(this).data("estimate-no");
+            var subCategory = $(this).data("sub-category");
+            
+            console.log(subCategoryId,+","+subCategory);
+
+            gotopage(estid,subCategoryId,estimateNo,subCategory);
+
+        });
+        
+        function gotopage(estid, subCategoryId, estimate_no, sub_category) {
+
+            var url = "/gcc/works/addworks"
+                + "?estid=" + encodeURIComponent(estid)
+                + "&sub_category_id=" + encodeURIComponent(subCategoryId)
+                + "&estimate_no=" + encodeURIComponent(estimate_no)
+                + "&sub_category=" + encodeURIComponent(sub_category);
+
+            window.open(url, "_blank");
+
+            return false;
+        }
 
     </script>
 </body>
diff --git a/src/main/resources/templates/modules/works/project_status_update.html b/src/main/resources/templates/modules/works/project_status_update.html
index c5a338f..3cd984b 100644
--- a/src/main/resources/templates/modules/works/project_status_update.html
+++ b/src/main/resources/templates/modules/works/project_status_update.html
@@ -306,7 +306,7 @@
         async function get_erp_work_data() {
 
         	
-        	var apiUrl = '/gcc/works/api/estimates/getProjectUpdatedList?loginid='+createdBy;
+        	var apiUrl = '/gcc/api/works/estimates/getProjectUpdatedList?loginid='+createdBy;
     	    // Return a Promise
     	    return new Promise(function(resolve, reject) {
     	        $.ajax({
@@ -453,7 +453,7 @@
 		    formData.append("projectfile", projectFile);
             
             $.ajax({
-                url: "/gcc/works/api/estimates/saveProjectStatus",
+                url: "/gcc/api/works/estimates/saveProjectStatus",
                 type: "POST",
                 contentType: false,
                 processData: false,