From 8789a02b646c47446b4b65ef2f64b58488eee68e Mon Sep 17 00:00:00 2001
From: Hariprasath S <113695067+Hariprasath4022@users.noreply.github.com>
Date: Thu, 25 Jun 2026 11:11:48 +0530
Subject: [PATCH] Changes in roadwar register and update form

---
 .../configuration/DataSourceConfig.java       |   15 +-
 .../roadwar/controller/Maincontroller.java    |   15 +
 .../controller/RegisterApiController.java     |   53 +-
 .../roadwar/service/LoginMappingService.java  |   51 +
 .../roadwar/service/RegisterService.java      |  440 +++-
 .../src/main/resources/application.properties |    4 +-
 .../templates/modules/roadwar/regform.html    |  921 +++++--
 .../templates/modules/roadwar/updateform.html | 2206 +++++++++++++----
 8 files changed, 2997 insertions(+), 708 deletions(-)
 create mode 100644 gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/service/LoginMappingService.java

diff --git a/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/configuration/DataSourceConfig.java b/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/configuration/DataSourceConfig.java
index c0fee04e..43f55a13 100644
--- a/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/configuration/DataSourceConfig.java
+++ b/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/configuration/DataSourceConfig.java
@@ -24,8 +24,8 @@ 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";
 
@@ -430,6 +430,17 @@ public class DataSourceConfig {
 		dataSource.setPassword(dbpassword);
 		return dataSource;
 	}
+	
+	//////////////////////////////(For GCC USER) ////////////////////////
+	@Bean(name = "mysqlGCCUserDataSource")
+	public DataSource mysqlGCCUserDataSource() {
+		DriverManagerDataSource dataSource = new DriverManagerDataSource();
+		dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+		dataSource.setUrl("jdbc:mysql://" + host + "/gcc_users");
+		dataSource.setUsername("root");
+		dataSource.setPassword(dbpassword);
+		return dataSource;
+	}
 
 	////////////////////////////// ORACLE ////////////////////////
 	@Bean(name = "oracleDataSource")
diff --git a/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/controller/Maincontroller.java b/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/controller/Maincontroller.java
index 31664053..a00ecb62 100644
--- a/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/controller/Maincontroller.java
+++ b/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/controller/Maincontroller.java
@@ -6,6 +6,7 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import in.gov.chennaicorporation.gccoffice.roadwar.service.LoginMappingService;
 import in.gov.chennaicorporation.gccoffice.service.LoginUserInfo;
 
 @RequestMapping("/gcc/roadwarweb")
@@ -15,11 +16,19 @@ public class Maincontroller {
 	@Autowired
 	private LoginUserInfo loginUserInfo;
 	
+	@Autowired
+	private LoginMappingService loginMappingService;
 	
 	@GetMapping("/regform")
 	public String viewdashboard(Model model) {
 		String LoginUserId = LoginUserInfo.getLoginUserId();
 		model.addAttribute("LoginUserId", LoginUserId);
+		
+		String zone=loginMappingService.getZoneByUserId(LoginUserId);
+		String ward=loginMappingService.getWardByUserId(LoginUserId);
+		
+		model.addAttribute("Loginzone", zone);
+		model.addAttribute("Loginward", ward);
 
 		String UserRole = LoginUserInfo.getUserRole();
 		model.addAttribute("UserRole", UserRole);
@@ -32,6 +41,12 @@ public class Maincontroller {
 	public String updateForm(Model model) {
 		String LoginUserId = LoginUserInfo.getLoginUserId();
 		model.addAttribute("LoginUserId", LoginUserId);
+		
+		String zone=loginMappingService.getZoneByUserId(LoginUserId);
+		String ward=loginMappingService.getWardByUserId(LoginUserId);
+		
+		model.addAttribute("Loginzone", zone);
+		model.addAttribute("Loginward", ward);
 
 		String UserRole = LoginUserInfo.getUserRole();
 		model.addAttribute("UserRole", UserRole);
diff --git a/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/controller/RegisterApiController.java b/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/controller/RegisterApiController.java
index 9c224199..817e8a2f 100644
--- a/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/controller/RegisterApiController.java
+++ b/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/controller/RegisterApiController.java
@@ -102,6 +102,37 @@ public class RegisterApiController {
 	}
 	
 	
+	@GetMapping("/getRoadTypeMaterial")
+	public Map<String, Object> getRoadTypeMaterial() {
+		Map<String, Object> response = new HashMap<>();
+		List<Map<String, Object>> roadTypes = registerService.getRoadTypeMaterial();
+		if (!roadTypes.isEmpty()) {
+			response.put("status", true);
+			response.put("message", "Roadtype Material fetched successfully");
+			response.put("data", roadTypes);
+		} else {
+			response.put("status", false);
+			response.put("message", "No roadtype material found");
+			response.put("data", Collections.emptyList());
+		}
+		return response;
+	}
+	
+	@GetMapping("/getFootpathType")
+	public Map<String, Object> getFootpathType() {
+		Map<String, Object> response = new HashMap<>();
+		List<Map<String, Object>> roadTypes = registerService.getFootpathType();
+		if (!roadTypes.isEmpty()) {
+			response.put("status", true);
+			response.put("message", "Footpath Types fetched successfully");
+			response.put("data", roadTypes);
+		} else {
+			response.put("status", false);
+			response.put("message", "No Footpath Types found");
+			response.put("data", Collections.emptyList());
+		}
+		return response;
+	}	
 	
 	@GetMapping("/getMonthList")
 	public Map<String, Object> getMonthList() {
@@ -146,14 +177,15 @@ public class RegisterApiController {
 	
 	@GetMapping("/getAllRoadWarDetails")
 	public ResponseEntity<?> getAllRoadWarDetails(
+			@RequestParam(required = false) String userid,
 	        @RequestParam(required = false) String zone,
 	        @RequestParam(required = false) String ward,
-	        @RequestParam(required = false) String roadName) {
+	        @RequestParam(required = false) String roadId) {
 
 	    try {
 
 	        List<Map<String, Object>> response =
-	        		registerService.getAllRoadWarDetails(zone, ward, roadName);
+	        		registerService.getAllRoadWarDetails(userid,zone, ward, roadId);
 
 	        return ResponseEntity.ok(response);
 
@@ -190,4 +222,21 @@ public class RegisterApiController {
 	    }
 	}
 	
+	@GetMapping("/checkRoadExists")
+	public Map<String, Object> checkRoadExists(@RequestParam("roadId") Integer roadId) {
+	    return registerService.checkRoadExists(roadId);
+	}
+	
+	@PostMapping("/updateRoadWarDetails")
+	public Map<String, Object> updateRoadWarDetails(@RequestBody Map<String, Object> payload) {
+		return registerService.updateRoadWarDetails(payload);
+	}
+	
+	@PostMapping("/deleteRoadWarDetails")
+	public Map<String, Object> deleteRoadWarDetails(
+	        @RequestParam String refId,@RequestParam String updatedby) {
+
+	    return registerService.deleteRoadWarDetails(refId,updatedby);
+	}
+	
 }
diff --git a/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/service/LoginMappingService.java b/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/service/LoginMappingService.java
new file mode 100644
index 00000000..d8d97b8a
--- /dev/null
+++ b/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/service/LoginMappingService.java
@@ -0,0 +1,51 @@
+package in.gov.chennaicorporation.gccoffice.roadwar.service;
+
+import java.util.Collections;
+
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+@Service
+public class LoginMappingService {
+
+	@Autowired
+	private JdbcTemplate jdbcTemplate;
+	
+	@Autowired
+	public void setDataSource(@Qualifier("mysqlGCCUserDataSource") DataSource dataSource) {
+		this.jdbcTemplate = new JdbcTemplate(dataSource);
+	}
+	
+	public String getZoneByUserId(String userid) {
+
+	    String sql = "SELECT zone FROM user_mapping_details WHERE userid=?";
+
+	    try {
+	        return jdbcTemplate.queryForObject(sql, String.class, userid);
+	    }catch (EmptyResultDataAccessException e) {
+	        return "";
+	    } catch (Exception e) {
+	        e.printStackTrace();
+	        return "";
+	    }
+	}
+	
+	public String getWardByUserId(String userid) {
+
+	    String sql = "SELECT ward FROM user_mapping_details WHERE userid=?";
+
+	    try {
+	        return jdbcTemplate.queryForObject(sql, String.class, userid);
+	    } catch (EmptyResultDataAccessException e) {
+	        return "";
+	    }catch (Exception e) {
+	        e.printStackTrace();
+	        return "";
+	    }
+	}
+}
diff --git a/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/service/RegisterService.java b/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/service/RegisterService.java
index de2705f5..3354e4a5 100644
--- a/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/service/RegisterService.java
+++ b/gcc_officer_portal/src/main/java/in/gov/chennaicorporation/gccoffice/roadwar/service/RegisterService.java
@@ -22,6 +22,7 @@ import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -34,9 +35,7 @@ public class RegisterService {
 	
 	@Autowired
 	private  Environment environment;
-	
-	 
-	
+		 	
 	@Autowired
 	public void setDataSource(@Qualifier("mysqlRoadWarDataSource") DataSource dataSource) {
 		this.jdbcTemplate = new JdbcTemplate(dataSource);
@@ -117,6 +116,27 @@ public class RegisterService {
 	}
 	
 	
+	public List<Map<String, Object>> getRoadTypeMaterial() {
+		String sql = "Select id,roadtype_material from roadtype_material_master where is_active = 1 and is_delete = 0";
+		try {
+			return jdbcTemplate.queryForList(sql);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return Collections.emptyList();
+		}
+	}
+	
+	public List<Map<String, Object>> getFootpathType() {
+		String sql = "Select id,footpath_type_name from footpath_type_master where is_active = 1 and is_delete = 0";
+		try {
+			return jdbcTemplate.queryForList(sql);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return Collections.emptyList();
+		}
+	}
+	
+	
 	public List<Map<String, Object>> getMonthList() {
 		String sql = "SELECT id, month_name FROM month_master WHERE is_active = 1 AND is_delete = 0 ORDER BY id";
 		try {
@@ -151,8 +171,9 @@ public class RegisterService {
 					+ " is_cpipe, cpipe_count, is_rwh, rwh_count, "
 					+ " sewer_length, sewer_size, "
 					+ " is_electric_poles, ep_count, is_hml, culvert_bridge_count, details, "
-					+ " is_busshelter, busshelter_count, is_centermedian, erp_asset_code, cby,road_id) "
-					+ "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+					+ " is_busshelter, busshelter_count, is_centermedian, erp_asset_code, cby,road_id,road_type_material,road_min_width,road_max_width, "
+					+ " hml_count,is_streetlight_poles,streetlight_poles_count,is_mml,mml_count,road_from,road_to,is_footpath,footpath_at) "
+					+ "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 
 			KeyHolder keyHolder = new GeneratedKeyHolder();
 
@@ -198,6 +219,18 @@ public class RegisterService {
 				ps.setObject(37, payload.get("erp_asset_code"));
 				ps.setObject(38, payload.get("cby"));
 				ps.setObject(39, payload.get("road_id"));
+				ps.setObject(40, payload.get("road_type_material"));
+				ps.setObject(41, payload.get("road_min_width"));
+				ps.setObject(42, payload.get("road_max_width"));
+				ps.setObject(43, payload.get("hml_count"));
+				ps.setObject(44, payload.get("is_streetlight_poles"));
+				ps.setObject(45, payload.get("streetlight_poles_count"));
+				ps.setObject(46, payload.get("is_mml"));
+				ps.setObject(47, payload.get("mml_count"));
+				ps.setObject(48, payload.get("roadfrom"));
+				ps.setObject(49, payload.get("roadto"));
+				ps.setObject(50, payload.get("is_footpath"));
+				ps.setObject(51, payload.get("footpathat"));
 				return ps;
 			}, keyHolder);
 
@@ -213,14 +246,15 @@ public class RegisterService {
 
 			if (relayingList != null && !relayingList.isEmpty()) {
 				String insertRelay = "INSERT INTO relaying_details "
-						+ "(road_ref_id, relay_month, relay_year, cr_value, road_type, remarks, cby) "
-						+ "VALUES (?,?,?,?,?,?,?)";
+						+ "(road_ref_id, relay_month, relay_year,road_type_material ,cr_value, road_type, remarks, cby) "
+						+ "VALUES (?,?,?,?,?,?,?,?)";
 
 				for (Map<String, Object> relay : relayingList) {
 					jdbcTemplate.update(insertRelay,
 							refId,
 							relay.get("relay_month"),
 							relay.get("relay_year"),
+							relay.get("road_type_material"),
 							relay.get("cr_value"),
 							relay.get("road_type"),
 							relay.get("remarks"),
@@ -243,16 +277,25 @@ public class RegisterService {
 	
 	
 	public List<Map<String, Object>> getAllRoadWarDetails(
+			String userid,
 	        String zone,
 	        String ward,
-	        String roadName) {
+	        String roadId) {
 
-	    StringBuilder sql = new StringBuilder(" SELECT rdm.*,rtm.road_type as road_type_name  FROM road_details_master rdm " +
+	    StringBuilder sql = new StringBuilder(" SELECT rdm.*,rtm.road_type as road_type_name,rtmm.roadtype_material as roadtype_material_name,ftm.footpath_type_name as footpath_material_name  FROM road_details_master rdm " +
 	    										" LEFT JOIN road_type_master rtm ON rtm.id= rdm.road_type " +
+	    										" LEFT JOIN roadtype_material_master rtmm ON rtmm.id= rdm.road_type_material " +
+	    										" LEFT JOIN footpath_type_master ftm ON ftm.id= rdm.footpath_material " +
 	    										" WHERE 1=1 ");
 
 	    List<Object> params = new ArrayList<>();
 
+	    
+	    if (userid != null && !userid.isEmpty()) {
+	        sql.append(" AND rdm.cby = ?");
+	        params.add(userid);
+	    }
+	    
 	    if (zone != null && !zone.isEmpty()) {
 	        sql.append(" AND rdm.zone = ?");
 	        params.add(zone);
@@ -263,11 +306,11 @@ public class RegisterService {
 	        params.add(ward);
 	    }
 
-	    if (roadName != null && !roadName.isEmpty()) {
-	        sql.append(" AND rdm.road_name = ?");
-	        params.add(roadName);
+	    if (roadId != null && !roadId.isEmpty()) {
+	        sql.append(" AND rdm.road_id = ?");
+	        params.add(roadId);
 	    }
-	    
+
 	    sql.append(" AND rdm.is_active=1 AND rdm.is_delete=0 ");
 
 	    sql.append(" ORDER BY rdm.id DESC");
@@ -283,9 +326,11 @@ public class RegisterService {
 	    try {
 
 	        String sql =
-	                "SELECT rdm.*, rtm.road_type As road_type_name " +
+	                "SELECT rdm.*, rtm.road_type As road_type_name,rtmm.roadtype_material as roadtype_material,ftm.footpath_type_name as footpath_material_name " +
 	                "FROM road_details_master rdm " +
 	                "LEFT JOIN road_type_master rtm ON rtm.id = rdm.road_type " +
+	                "LEFT JOIN roadtype_material_master rtmm ON rtmm.id = rdm.road_type_material " +
+	                "LEFT JOIN footpath_type_master ftm ON ftm.id= rdm.footpath_material " +
 	                "WHERE rdm.ref_id = ? AND rdm.is_active=1 AND rdm.is_delete=0  ";
 
 	        Map<String, Object> road =
@@ -295,10 +340,11 @@ public class RegisterService {
 
 	        List<Map<String, Object>> relayingDetails =
 	                jdbcTemplate.queryForList(
-	                        " SELECT rd.*,mm.month_name,ym.year_name "
+	                        " SELECT rd.*,mm.month_name,ym.year_name,rtmm.roadtype_material "
 	                        + " FROM relaying_details rd "
 	                        + " LEFT JOIN month_master mm on mm.id = rd.relay_month "
 	                        + " LEFT JOIN year_master ym on ym.id = rd.relay_year "
+	                        + " LEFT JOIN roadtype_material_master rtmm on rtmm.id = rd.road_type_material "
 	                        + " WHERE rd.road_ref_id = ? AND rd.is_active=1 AND rd.is_delete=0  ",
 	                        refid);
 
@@ -315,4 +361,368 @@ public class RegisterService {
 	    return result;
 	}
 	
+	public Map<String, Object> checkRoadExists(Integer roadId) {
+
+	    Map<String, Object> response = new HashMap<>();
+
+	    try {
+
+	        String sql = " SELECT COUNT(*) FROM road_details_master "
+	        		
+	                   + " WHERE road_id = ? AND is_active=1 AND is_delete = 0 ";
+
+	        Integer count = jdbcTemplate.queryForObject(
+	                sql,
+	                Integer.class,
+	                roadId
+	        );
+
+	        response.put("status", true);
+	        response.put("exists", count != null && count > 0);
+
+	    } catch (Exception e) {
+
+	        e.printStackTrace();
+
+	        response.put("status", false);
+	        response.put("message", "Error while checking road");
+
+	    }
+
+	    return response;
+	}
+	
+	@Transactional
+	public Map<String, Object> updateRoadWarDetails(Map<String, Object> payload) {
+
+	    Map<String, Object> result = new HashMap<>();
+
+	    try {
+
+	        String refId = String.valueOf(payload.get("ref_id"));
+	        String updatedBy = String.valueOf(payload.get("updated_by"));
+	        
+	        String roadId = String.valueOf(payload.get("road_id"));
+
+	        Integer count = jdbcTemplate.queryForObject(
+	                "SELECT COUNT(*) " +
+	                "FROM road_details_master " +
+	                "WHERE road_id = ? " +
+	                "AND ref_id <> ? " +
+	                "AND is_active = 1 " +
+	                "AND is_delete = 0",
+	                Integer.class,
+	                roadId,
+	                refId
+	        );
+
+	        if (count != null && count > 0) {
+
+	            result.put("status", false);
+	            result.put("message",
+	                    "Selected road is already mapped to another Road War record");
+
+	            return result;
+	        }
+
+
+	        //COPY CURRENT RECORD TO LOG TABLE
+
+	        String logSql =
+	                "INSERT INTO road_details_master_log (" +
+	                "id, zone, ward, road_id, road_name, road_type,road_type_material, highway_ans, " +
+	                "road_length, road_avg_width,road_min_width,road_max_width, road_area, " +
+	                "road_from,road_to,is_footpath,footpath_at, "+
+	                "footpath_material, footpath_length, footpath_width, " +
+	                "footpath_from_location, footpath_to_location, " +
+	                "is_swd, swd_from, swd_to, swd_length, swd_size, " +
+	                "is_scp, scp_count, is_manhole, manhole_count, manhole_location, " +
+	                "is_cpipe, cpipe_count, is_rwh, rwh_count, " +
+	                "sewer_length, sewer_size, is_electric_poles, ep_count, is_hml,hml_count, " +
+	                "is_streetlight_poles,streetlight_poles_count,is_mml,mml_count, "+
+	                "culvert_bridge_count, details, is_busshelter, busshelter_count, " +
+	                "is_centermedian, erp_asset_code, ref_id, cdate, cby, " +
+	                "updated_date, updated_by, is_active, is_delete) " +
+	                "SELECT " +
+	                "id, zone, ward, road_id, road_name, road_type,road_type_material, highway_ans, " +
+	                "road_length, road_avg_width,road_min_width,road_max_width, road_area, " +
+	                "road_from,road_to,is_footpath,footpath_at, "+
+	                "footpath_material, footpath_length, footpath_width, " +
+	                "footpath_from_location, footpath_to_location, " +
+	                "is_swd, swd_from, swd_to, swd_length, swd_size, " +
+	                "is_scp, scp_count, is_manhole, manhole_count, manhole_location, " +
+	                "is_cpipe, cpipe_count, is_rwh, rwh_count, " +
+	                "sewer_length, sewer_size, is_electric_poles, ep_count, is_hml,hml_count, " +
+	                "is_streetlight_poles,streetlight_poles_count,is_mml,mml_count, "+
+	                "culvert_bridge_count, details, is_busshelter, busshelter_count, " +
+	                "is_centermedian, erp_asset_code, ref_id, cdate, cby, " +
+	                "updated_date, updated_by, is_active, is_delete " +
+	                "FROM road_details_master " +
+	                "WHERE ref_id=?";
+
+	        jdbcTemplate.update(logSql, refId);
+
+
+	        // 2. IF SWD = NO CLEAR DEPENDENT VALUES
+
+
+	        String isSwd = (String) payload.get("is_swd");
+
+	        if ("no".equalsIgnoreCase(isSwd)) {
+
+	            payload.put("swd_from", null);
+	            payload.put("swd_to", null);
+	            payload.put("swd_length", null);
+	            payload.put("swd_size", null);
+
+	            payload.put("is_scp", null);
+	            payload.put("scp_count", null);
+
+	            payload.put("is_manhole", null);
+	            payload.put("manhole_count", null);
+	            payload.put("manhole_location", null);
+
+	            payload.put("is_cpipe", null);
+	            payload.put("cpipe_count", null);
+
+	            payload.put("is_rwh", null);
+	            payload.put("rwh_count", null);
+	        }
+
+	        // 3. UPDATE ROAD MASTER
+
+	        String updateSql =
+	                "UPDATE road_details_master SET " +
+	                "zone=?, " +
+	                "ward=?, " +
+	                "road_id=?, " +
+	                "road_name=?, " +
+	                "road_type=?, " +
+	                "road_type_material=?, " +
+	                "road_length=?, " +
+	                "road_avg_width=?, " +
+	                "road_min_width=?, " +
+	                "road_max_width=?, " +
+	                "road_area=?, " +
+	                "road_from=?, "+
+	                "road_to=?, "+
+	                "is_footpath=?, "+
+	                "footpath_at=?, "+
+	                "footpath_material=?, " +
+	                "footpath_length=?, " +
+	                "footpath_width=?, " +
+	                "footpath_from_location=?, " +
+	                "footpath_to_location=?, " +
+	                "is_swd=?, " +
+	                "swd_from=?, " +
+	                "swd_to=?, " +
+	                "swd_length=?, " +
+	                "swd_size=?, " +
+	                "is_scp=?, " +
+	                "scp_count=?, " +
+	                "is_manhole=?, " +
+	                "manhole_count=?, " +
+	                "manhole_location=?, " +
+	                "is_cpipe=?, " +
+	                "cpipe_count=?, " +
+	                "is_rwh=?, " +
+	                "rwh_count=?, " +
+	                "sewer_length=?, " +
+	                "sewer_size=?, " +
+	                "is_electric_poles=?, " +
+	                "ep_count=?, " +
+	                "is_hml=?, " +
+	                "hml_count=?, " +
+	                "is_streetlight_poles=?, " +
+	                "streetlight_poles_count=?, " +
+	                "is_mml=?, " +
+	                "mml_count=?, " +	                
+	                "culvert_bridge_count=?, " +
+	                "details=?, " +
+	                "is_busshelter=?, " +
+	                "busshelter_count=?, " +
+	                "is_centermedian=?, " +
+	                "updated_date=NOW(), " +
+	                "updated_by=? " +
+	                "WHERE ref_id=?";
+
+	        jdbcTemplate.update(updateSql,
+
+	                payload.get("zone"),
+	                payload.get("ward"),
+	                payload.get("road_id"),
+	                payload.get("road_name"),
+	                payload.get("road_type"),
+	                payload.get("road_type_material"),
+
+	                payload.get("road_length"),
+	                payload.get("road_avg_width"),
+	                payload.get("road_min_width"),
+	                payload.get("road_max_width"),
+	                payload.get("road_area"),
+	                payload.get("road_from"),
+	                payload.get("road_to"),
+	                payload.get("is_footpath"),
+	                payload.get("footpath_at"),
+	                
+	                payload.get("footpath_material"),
+	                payload.get("footpath_length"),
+	                payload.get("footpath_width"),
+
+	                payload.get("footpath_from_location"),
+	                payload.get("footpath_to_location"),
+
+	                payload.get("is_swd"),
+	                payload.get("swd_from"),
+	                payload.get("swd_to"),
+	                payload.get("swd_length"),
+	                payload.get("swd_size"),
+
+	                payload.get("is_scp"),
+	                payload.get("scp_count"),
+
+	                payload.get("is_manhole"),
+	                payload.get("manhole_count"),
+	                payload.get("manhole_location"),
+
+	                payload.get("is_cpipe"),
+	                payload.get("cpipe_count"),
+
+	                payload.get("is_rwh"),
+	                payload.get("rwh_count"),
+
+	                payload.get("sewer_length"),
+	                payload.get("sewer_size"),
+
+	                payload.get("is_electric_poles"),
+	                payload.get("ep_count"),
+
+	                payload.get("is_hml"),
+	                payload.get("hml_count"),
+	                payload.get("is_streetlight_poles"),
+	                payload.get("streetlight_poles_count"),
+	                payload.get("is_mml"),
+	                payload.get("mml_count"),
+
+	                payload.get("culvert_bridge_count"),
+	                payload.get("details"),
+
+	                payload.get("is_busshelter"),
+	                payload.get("busshelter_count"),
+
+	                payload.get("is_centermedian"),
+
+	                updatedBy,
+	                refId
+	        );
+
+	        // 4. SOFT DELETE OLD RELAYING RECORDS
+
+	        jdbcTemplate.update(
+	                "UPDATE relaying_details " +
+	                "SET is_active=0, " +
+	                "is_delete=1, " +
+	                "updated_date=NOW(), " +
+	                "updated_by=? " +
+	                "WHERE road_ref_id=? " +
+	                "AND is_active=1",
+	                updatedBy,
+	                refId
+	        );
+
+	        // 5. INSERT NEW RELAYING RECORDS
+
+	    	@SuppressWarnings("unchecked")
+	        List<Map<String, Object>> relays =
+	                (List<Map<String, Object>>) payload.get("relaying_details");
+
+	        String insertRelay =
+	                "INSERT INTO relaying_details " +
+	                "(road_ref_id, relay_month, relay_year,road_type_material, cr_value, road_type, remarks, cby) " +
+	                "VALUES (?,?,?,?,?,?,?,?)";
+
+	        if (relays != null) {
+
+	            for (Map<String, Object> relay : relays) {
+
+	                jdbcTemplate.update(
+	                        insertRelay,
+	                        refId,
+	                        relay.get("relay_month"),
+	                        relay.get("relay_year"),
+	                        relay.get("road_type_material"),
+	                        relay.get("cr_value"),
+	                        relay.get("road_type"),
+	                        relay.get("remarks"),
+	                        updatedBy
+	                );
+	            }
+	        }
+
+	        result.put("status", true);
+	        result.put("message", "Road details updated successfully");
+
+	    } catch (Exception e) {
+
+	        e.printStackTrace();
+
+	        result.put("status", false);
+	        result.put("message", e.getMessage());
+	    }
+
+	    return result;
+	}
+
+
+	public Map<String, Object> deleteRoadWarDetails(String refId, String updatedby) {
+		 Map<String, Object> result = new HashMap<>();
+
+		    try {
+
+		        int roadUpdated = jdbcTemplate.update(
+		                "UPDATE road_details_master " +
+		                "SET is_active=0, " +
+		                "is_delete=1, " +
+		                "updated_by=?, "+
+		                "updated_date=NOW() " +
+		                "WHERE ref_id=? " +
+		                "AND is_active=1",
+		                updatedby,refId
+		        );
+
+		        jdbcTemplate.update(
+		                "UPDATE relaying_details " +
+		                "SET is_active=0, " +
+		                "is_delete=1, " +
+		                "updated_by=?, "+
+		                "updated_date=NOW() " +
+		                "WHERE road_ref_id=? " +
+		                "AND is_active=1",
+		                updatedby,refId
+		        );
+
+		        if (roadUpdated > 0) {
+
+		            result.put("status", true);
+		            result.put("message",
+		                    "Road War details deleted successfully");
+
+		        } else {
+
+		            result.put("status", false);
+		            result.put("message","Record not found");
+		        }
+
+		    } catch (Exception e) {
+
+		        e.printStackTrace();
+
+		        result.put("status", false);
+		        result.put("message",
+		                "Failed to delete Road War details");
+		    }
+
+		    return result;
+	}
+	
 }
diff --git a/gcc_officer_portal/src/main/resources/application.properties b/gcc_officer_portal/src/main/resources/application.properties
index ad06f8ad..376e518b 100644
--- a/gcc_officer_portal/src/main/resources/application.properties
+++ b/gcc_officer_portal/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/gcc_officer_portal/src/main/resources/templates/modules/roadwar/regform.html b/gcc_officer_portal/src/main/resources/templates/modules/roadwar/regform.html
index d1320add..ca2a112d 100644
--- a/gcc_officer_portal/src/main/resources/templates/modules/roadwar/regform.html
+++ b/gcc_officer_portal/src/main/resources/templates/modules/roadwar/regform.html
@@ -52,6 +52,9 @@
 								<div class="card-body">
 									<h5 class="card-title">Road Details</h5>
 									<span th:text="${LoginUserId}" id="userIdSpan" style="display: none;"></span>
+									<span th:text="${Loginzone}" id="zoneSpan" style="display: none;"></span>
+									<span th:text="${Loginward}" id="wardSpan" style="display: none;"></span>
+									
 									<div class="card-block">
 
 										<div class="row">
@@ -59,7 +62,7 @@
 
 
 
-											<div class="col-md-4 mb-3">
+											<div class="col-md-3 mb-3">
 												<label for="zoneDropdown" class="form-label"> Select
 													Zone <span class="text-danger">*</span>
 												</label> <select id="zoneDropdown" class="form-control">
@@ -69,7 +72,7 @@
 
 											</div>
 
-											<div class="col-md-4 mb-3">
+											<div class="col-md-3 mb-3">
 
 												<label for="wardDropdown" class="form-label"> Select
 													Ward <span class="text-danger">*</span>
@@ -80,7 +83,7 @@
 											</div>
 
 
-											<div class="col-md-4 mb-3">
+											<div class="col-md-6 mb-3">
 												<label for="roadDropdown" class="form-label">
 													Name of the Road <span class="text-danger">*</span>
 												</label>
@@ -92,7 +95,7 @@
 
 
 
-											<div class="col-md-4 mb-3">
+											<div class="col-md-3 mb-3">
 												<label for="roadTypeDropdown" class="form-label">
 													Road Type <span class="text-danger">*</span>
 												</label>
@@ -101,49 +104,119 @@
 													<option value="">Select Road Type</option>
 												</select>
 											</div>
+											
+											<div class="col-md-3 mb-3">
+												<label for="roadTypeMaterialDropdown" class="form-label">
+													Roadtype Material <span class="text-danger">*</span>
+												</label>
 
-											<div class="col-md-4 mb-3">
-												<label for="length" class="form-label">Length (m)<span
+												<select id="roadTypeMaterialDropdown" class="form-control">
+													<option value="">Select Roadtype Material</option>
+												</select>
+											</div>
+
+											<div class="col-md-3 mb-3">
+												<label for="length" class="form-label">Length of Road (m)<span
 														class="text-danger">*</span></label>
 												<input type="text" class="form-control decimal-only" id="length"
 													name="length" required="required" placeholder="e.g. 200.5">
 											</div>
-
-
-
-											<div class="col-md-4 mb-3">
-												<label for="averageWidth" class="form-label">Average Width (m)<span
+											
+											<div class="col-md-3 mb-3">
+												<label for="averageWidth" class="form-label">Average Width of Road (m)<span
 														class="text-danger">*</span></label>
 												<input type="text" class="form-control decimal-only" id="averageWidth"
 													name="averageWidth" required="required" placeholder="e.g. 6.5">
 											</div>
 
-
-
-
 											<div class="col-md-4 mb-3">
-												<label for="area" class="form-label">Area (m)<span
+												<label for="area" class="form-label">Area of Road (m<sup>2</sup>)<span
 														class="text-danger">*</span></label>
 												<input type="text" class="form-control decimal-only" id="area"
 													name="area" required="required" placeholder="e.g. 1200.0">
 											</div>
 
+																					
+											<div class="col-md-4 mb-3">
+												<label for="minWidth" class="form-label">Min Width of Road (m)</label>
+												<input type="text" class="form-control decimal-only" id="minWidth"
+													name="minWidth" placeholder="e.g. 1.5">
+											</div>
+											
+											<div class="col-md-4 mb-3">
+												<label for="maxWidth" class="form-label">Max Width of Road (m)</label>
+												<input type="text" class="form-control decimal-only" id="maxWidth"
+													name="maxWidth"  placeholder="e.g. 8.5">
+											</div>
+											
+											<div class="col-md-12 mb-3">
+												<label class="form-label">Road Location</label>
+												<div class="row">
+													<div class="col-md-6">
+														<label for="roadFrom">From</label>
+														<input type="text" class="form-control" id="roadFrom"
+															name="roadFrom">
+													</div>
+
+													<div class="col-md-6">
+														<label for="roadTo">To</label>
+														<input type="text" class="form-control" id="roadTo"
+															name="roadTo">
+													</div>
+												</div>
+												
+											</div>
+											
+											<div class="col-md-4 mb-3">
+											
+												<label class="form-label">
+													Footpath available or Not ?
+													<span class="text-danger">*</span>
+												</label>
+
+												<div>
+													<label class="mr-3">
+														<input type="radio" name="fpAvailable" value="yes">
+														Yes
+													</label>
 
+													<label>
+														<input type="radio" name="fpAvailable" value="no">
+														No
+													</label>
+												</div>
+											
+											</div>
+											</div>
+											
+											<div class="row" id="fpSection" style="display:none;">
+																								
 											<div class="col-md-4 mb-3">
 												<label for="footpathDropdown" class="form-label">
-													Foot Path Material <span class="text-danger">*</span>
+													Footpath Material Type
 												</label>
 
 												<select id="footpathDropdown" class="form-control">
-													<option value="">Select Material</option>
-													<option value="Tar">Tar</option>
-													<option value="Concrete">Concrete</option>
+													<option value="">Select Material</option>												
+												</select>
+											</div>
+											
+											<div class="col-md-4 mb-3">
+												<label for="fpat" class="form-label">Footpath Present at ?
+													
+												</label>
+												<select class="form-control" id="fpat"
+													name="fpat">
+													<option value="">Select</option>
+													<option value="both side">Both Side</option>
+													<option value="single side">Single Side</option>
 												</select>
 											</div>
+											
+											
 
 											<div class="col-md-4 mb-3">
-												<label for="fplength" class="form-label">Length Of Foot Path (m) <span
-														class="text-danger">*</span></label>
+												<label for="fplength" class="form-label">Length of Footpath (m) </label>
 												<input type="text" class="form-control decimal-only" id="fplength"
 													name="fplength" required="required" placeholder="e.g. 180.0">
 											</div>
@@ -151,8 +224,7 @@
 
 
 											<div class="col-md-4 mb-3">
-												<label for="fpwidth" class="form-label">Average Width (m) <span
-														class="text-danger">*</span></label>
+												<label for="fpwidth" class="form-label">Average Width of Footpath (m) </label>
 												<input type="text" class="form-control decimal-only" id="fpwidth"
 													name="fpwidth" required="required" placeholder="e.g. 1.5">
 											</div>
@@ -160,7 +232,7 @@
 
 											<div class="col-md-8 mb-3">
 												<label class="form-label">
-													Foot Path Location <span class="text-danger">*</span>
+													Footpath Location
 												</label>
 
 												<div class="row">
@@ -177,11 +249,15 @@
 													</div>
 												</div>
 											</div>
+											
+											</div>
+											
+											
 
 
 										</div>
 
-									</div>
+									
 
 									<hr>
 
@@ -223,13 +299,13 @@
 													</div>
 
 													<div class="col-md-3 mb-3">
-														<label for="swdlength">length (m)<span class="text-danger">*</span></label>
-														<input type="text" class="form-control" id="swdlength">
+														<label for="swdlength">SWD Length (m)<span class="text-danger">*</span></label>
+														<input type="text" class="form-control decimal-only" id="swdlength">
 													</div>
 
 													<div class="col-md-3 mb-3">
-														<label for="">Size (inches)<span class="text-danger">*</span></label>
-														<input type="text" class="form-control" id="size">
+														<label for="swdsize">SWD Size (feet or cm)<span class="text-danger">*</span></label>
+														<input type="text" class="form-control decimal-only" id="size">
 													</div>
 
 												</div>
@@ -254,14 +330,14 @@
 															</label>
 														</div>
 														<div id="scpSection" style="display:none; margin-top:15px;">
-															<label for="scpCount">Count</label>
-															<input type="text" class="form-control" id="scpCount">
+															<label for="scpCount">Count<span class="text-danger">*</span></label>
+															<input type="text" class="form-control integer-only" id="scpCount">
 														</div>
 													</div>
 
 													<div class="col-md-6 mb-4">
 														<label class="form-label">
-															Man hole Available or Not? <span class="text-danger">*</span>
+															Manhole / Machine hole Available or Not? <span class="text-danger">*</span>
 														</label>
 														<div>
 															<label class="mr-3">
@@ -274,12 +350,12 @@
 														<div id="mhSection" style="display:none; margin-top:15px;">
 															<div class="row">
 																<div class="col-md-6 mb-3">
-																	<label for="mhCount">Count</label>
-																	<input type="text" class="form-control" id="mhCount"
-																		name="mhCount">
+																	<label for="mhCount">Count<span class="text-danger">*</span></label>
+																	<input type="text" class="form-control integer-only" id="mhCount"
+											 							name="mhCount">
 																</div>
 																<div class="col-md-6 mb-3">
-																	<label for="mhType">Man Hole Location
+																	<label for="mhType">Manhole Location
 																		<span class="text-danger">*</span>
 																	</label>
 																	<select class="form-control" id="mhType"
@@ -306,8 +382,8 @@
 															</label>
 														</div>
 														<div id="cpSection" style="display:none; margin-top:15px;">
-															<label for="cpCount">Count</label>
-															<input type="text" class="form-control" id="cpCount">
+															<label for="cpCount">Count<span class="text-danger">*</span></label>
+															<input type="text" class="form-control integer-only" id="cpCount">
 														</div>
 													</div>
 
@@ -325,18 +401,19 @@
 															</label>
 														</div>
 														<div id="rwSection" style="display:none; margin-top:15px;">
-															<label for="rwCount">Count</label>
-															<input type="text" class="form-control" id="rwCount">
+															<label for="rwCount">Count<span class="text-danger">*</span></label>
+															<input type="text" class="form-control integer-only" id="rwCount">
 														</div>
 													</div>
 												</div>
 											</div>
 
-
+											</div>
+											<div class="row">
 												
-													<div class="col-md-6 mb-4">
+													<div class="col-md-4 mb-4">
 														<label class="form-label">
-															Electricity Poles Available or Not?
+															Electricity Poles Available or Not? (TNEB)
 														</label>
 														<div>
 															<label class="mr-3">
@@ -347,12 +424,50 @@
 															</label>
 														</div>
 														<div id="epSection" style="display:none; margin-top:15px;">
-															<label for="epCount">Count</label>
-															<input type="text" class="form-control" id="epCount">
+															<label for="epCount">Count<span class="text-danger">*</span></label>
+															<input type="text" class="form-control integer-only" id="epCount">
+														</div>
+													</div>
+													
+													
+													<div class="col-md-4 mb-4">
+														<label class="form-label">
+															Bus Shelter Available or Not?
+														</label>
+														<div>
+															<label class="mr-3">
+																<input type="radio" name="bsAvailable" value="yes"> Yes
+															</label>
+															<label>
+																<input type="radio" name="bsAvailable" value="no"> No
+															</label>
+														</div>
+														<div id="bsSection" style="display:none; margin-top:15px;">
+															<label for="bsCount">Count<span class="text-danger">*</span></label>
+															<input type="text" class="form-control integer-only" id="bsCount">
 														</div>
 													</div>
 
-													<div class="col-md-6 mb-4">
+
+													<div class="col-md-4 mb-4">
+														<label class="form-label">
+															Street Light Poles Available or Not?
+														</label>
+														<div>
+															<label class="mr-3">
+																<input type="radio" name="slpAvailable" value="yes"> Yes
+															</label>
+															<label>
+																<input type="radio" name="slpAvailable" value="no"> No
+															</label>
+														</div>
+														<div id="slpSection" style="display:none; margin-top:15px;">
+															<label for="slpCount">Count<span class="text-danger">*</span></label>
+															<input type="text" class="form-control integer-only" id="slpCount">
+														</div>
+													</div>
+													
+													<div class="col-md-4 mb-4">
 														<label class="form-label">
 															High Mass Light Available or Not?
 														</label>
@@ -364,27 +479,34 @@
 																<input type="radio" name="hmlAvailable" value="no"> No
 															</label>
 														</div>
+														<div id="hmlSection" style="display:none; margin-top:15px;">
+															<label for="hmlCount">Count<span class="text-danger">*</span></label>
+															<input type="text" class="form-control integer-only" id="hmlCount">
+														</div>
 													</div>
-
-													<div class="col-md-6 mb-4">
+													
+													
+													<div class="col-md-4 mb-4">
 														<label class="form-label">
-															Bus Shelter Available or Not?
+															Mini Mass Light Available or Not?
 														</label>
 														<div>
 															<label class="mr-3">
-																<input type="radio" name="bsAvailable" value="yes"> Yes
+																<input type="radio" name="mmlAvailable" value="yes"> Yes
 															</label>
 															<label>
-																<input type="radio" name="bsAvailable" value="no"> No
+																<input type="radio" name="mmlAvailable" value="no"> No
 															</label>
 														</div>
-														<div id="bsSection" style="display:none; margin-top:15px;">
-															<label for="bsCount">Count</label>
-															<input type="text" class="form-control" id="bsCount">
+														<div id="mmlSection" style="display:none; margin-top:15px;">
+															<label for="mmlCount">Count<span class="text-danger">*</span></label>
+															<input type="text" class="form-control integer-only" id="mmlCount">
 														</div>
 													</div>
 
-													<div class="col-md-6 mb-4">
+													
+
+													<div class="col-md-4 mb-4">
 														<label class="form-label">
 															Center Median Available or Not?
 														</label>
@@ -396,33 +518,30 @@
 																<input type="radio" name="cmAvailable" value="no"> No
 															</label>
 														</div>
-														<!-- <div id="cmSection" style="display:none; margin-top:15px;">
-															<label for="cmCount">Count</label>
-															<input type="text" class="form-control" id="cmCount">
-														</div> -->
-													</div><!-- </div> -->
+														
+													</div>
 												
 											
 											<!-- ═══ end SWD-dependent fields ═══ -->
 
-											<div class="col-md-6 mb-3">
+											<div class="col-md-3 mb-3">
 												<label for="sewerLength" class="form-label">Length Of Sewer (m)
-													<span class="text-danger">*</span></label>
+													</label>
 												<input type="text" class="form-control decimal-only" id="sewerLength"
-													name="sewerLength" required="required" placeholder="e.g. 190.5">
+													name="sewerLength"  placeholder="e.g. 190.5">
 											</div>
 
-											<div class="col-md-6 mb-3">
-												<label for="sewerSize" class="form-label">Size of sewer (inches)
-													<span class="text-danger">*</span></label>
+											<div class="col-md-3 mb-3">
+												<label for="sewerSize" class="form-label">Size of sewer (feet or cm)
+													</label>
 												<input type="text" class="form-control decimal-only" id="sewerSize"
-													name="sewerSize" required="required" placeholder="e.g. 300.0">
+													name="sewerSize"  placeholder="e.g. 300.0">
 											</div>
 
-											<div class="col-md-6 mb-3">
+											<div class="col-md-3 mb-3">
 												<label for="noofcb" class="form-label">No of Culverts &amp;
 													Bridges</label>
-												<input type="text" class="form-control" id="noofcb" name="noofcb">
+												<input type="text" class="form-control integer-only" id="noofcb" name="noofcb">
 											</div>
 
 											<div class="col-md-12 mb-3">
@@ -465,27 +584,37 @@
 														<option value="">Select Year</option>
 													</select>
 												</div>
+												
+												
+												<div class="col-md-3 mb-3">
+													<label class="form-label">
+														Roadtype Material <span class="text-danger">*</span>
+													</label>
+													<select class="form-control r_roadmatDropdown" name="r_roadmat[]">
+														<option value="">Select Material</option>
+													</select>
+												</div>
 
 												<div class="col-md-3 mb-3">
 													<label class="form-label">
-														CR Value
+														Completion Report Value (CR)
 														<span class="text-danger">*</span>
 													</label>
-													<input type="text" class="form-control" name="crValue[]">
+													<input type="text" class="form-control decimal-only" name="crValue[]">
 												</div>
 
 												<div class="col-md-3 mb-3">
 													<label class="form-label">
-														Type/Subgrade box of the road
+														Type/Subgrade base of the road
 														<span class="text-danger">*</span>
 													</label>
 													<input type="text" class="form-control" name="roadType[]">
 												</div>
 
 
-												<div class="col-md-12 mb-3">
+												<div class="col-md-9 mb-3">
 													<label class="form-label">
-														Remarks <span class="text-danger">*</span>
+														Remarks Reg.type of relaying <span class="text-danger">*</span>
 													</label>
 													<textarea class="form-control" name="remarks[]"></textarea>
 												</div>
@@ -553,43 +682,58 @@
 
 	<script type="text/javascript">
 
-		var createdBy = /*[[${LoginUserId}]]*/'';
-
+	let zoneSpan = document.getElementById('zoneSpan').textContent;
+	let wardSpan = document.getElementById('wardSpan').textContent;
+	
 		$(document).ready(function () {
 
 			loadRoadTypes();
+			loadRoadTypeMaterials();
 
+				$.ajax({
+					url: '/gcc/api/roadwarweb/register/getzones',
+					type: 'GET',
+					success: function (response) {
 
-			$.ajax({
-				url: '/gcc/api/roadwarweb/register/getzones',
-				type: 'GET',
-				success: function (response) {
+						$('#zoneDropdown').empty()
+							.append('<option value="">Select Zone</option>');
 
-					$('#zoneDropdown').empty()
-						.append('<option value="">Select Zone</option>');
+						if (response.status) {
 
-					if (response.status) {
+							$.each(response.data, function (index, zone) {
+
+								$('#zoneDropdown').append(
+									'<option value="' + zone.zone_name + '">' +
+									zone.zone_name +
+									'</option>'
+								);
 
-						$.each(response.data, function (index, zone) {
+							});
+							
+							if (zoneSpan) {
 
-							$('#zoneDropdown').append(
-								'<option value="' + zone.zone_name + '">' +
-								zone.zone_name +
-								'</option>'
-							);
+					            $("#zoneDropdown").val(zoneSpan);
 
-						});
+					            $("#zoneDropdown").prop("disabled", true);
 
+					            // Fire zone change event
+					            $("#zoneDropdown").trigger('change');
+					        }
+							
+
+						}
+					},
+					error: function () {
+						alert('Failed to load zones.');
 					}
-				},
-				error: function () {
-					alert('Failed to load zones.');
-				}
-			});
+				});
+			
+			
 
 
 			loadMonths();
 			loadYears();
+			loadRelayRoadMaterials();
 
 			$("#addMoreBtn").click(function () {
 
@@ -605,6 +749,7 @@
 
 				loadMonths(block.find(".monthDropdown"));
 				loadYears(block.find(".yearDropdown"));
+				loadRelayRoadMaterials(block.find(".r_roadmatDropdown"));
 			});
 
 			$(document).on("click", ".removeBlock", function () {
@@ -642,6 +787,16 @@
 								);
 
 							});
+							
+							if (wardSpan) {
+
+		                        $("#wardDropdown").val(wardSpan);
+		                        
+		                        $("#wardDropdown").prop("disabled", true);
+
+		                        // Trigger ward change
+		                        $("#wardDropdown").trigger('change');
+		                    }
 
 						}
 
@@ -653,9 +808,6 @@
 
 			}
 
-
-
-
 		});
 
 
@@ -756,8 +908,72 @@
 				}
 			});
 		}
+		
+		function loadRoadTypeMaterials() {
+			$.ajax({
+				url: '/gcc/api/roadwarweb/register/getRoadTypeMaterial',
+				type: 'GET',
+				success: function (response) {
+
+					if (response.status) {
+
+						let dropdown = $("#roadTypeMaterialDropdown");
+
+						// Clear existing options except default
+						dropdown.empty();
+						dropdown.append('<option value="">Select Roadtype Material</option>');
+
+						$.each(response.data, function (index, item) {
+							dropdown.append(
+								'<option value="' + item.id + '">' +
+								item.roadtype_material +
+								'</option>'
+							);
+						});
+
+					} else {
+						alert(response.message);
+					}
+				},
+				error: function (xhr, status, error) {
+					console.error("Error fetching roadtype materials:", error);
+				}
+			});
+		}
+
+		function loadFootpathMaterialTypes() {
+			$.ajax({
+				url: '/gcc/api/roadwarweb/register/getFootpathType',
+				type: 'GET',
+				success: function (response) {
 
+					if (response.status) {
+
+						let dropdown = $("#footpathDropdown");
+
+						// Clear existing options except default
+						dropdown.empty();
+						dropdown.append('<option value="">Select Type</option>');
+
+						$.each(response.data, function (index, item) {
+							dropdown.append(
+								'<option value="' + item.id + '">' +
+								item.footpath_type_name +
+								'</option>'
+							);
+						});
 
+					} else {
+						alert(response.message);
+					}
+				},
+				error: function (xhr, status, error) {
+					console.error("Error fetching footpath material types:", error);
+				}
+			});
+		}
+		
+		
 		function loadMonths(dropdown = $(".monthDropdown")) {
 
 			$.ajax({
@@ -793,7 +1009,41 @@
 
 		}
 
+		function loadRelayRoadMaterials(dropdown = $(".r_roadmatDropdown")) {
 
+			$.ajax({
+				url: "/gcc/api/roadwarweb/register/getRoadTypeMaterial",
+				type: "GET",
+				success: function (response) {
+
+					if (response.status) {
+
+						dropdown.each(function () {
+
+							let select = $(this);
+
+							select.empty()
+								.append('<option value="">Select Material</option>');
+
+							$.each(response.data, function (i, rrtmat) {
+
+								select.append(
+									`<option value="${rrtmat.id}">
+	                                ${rrtmat.roadtype_material}
+	                             </option>`
+								);
+
+							});
+
+						});
+
+					}
+
+				}
+			});
+
+		}
+		
 		function loadYears(dropdown = $(".yearDropdown")) {
 
 			$.ajax({
@@ -846,6 +1096,17 @@
 				$('#scpSection, #mhSection, #cpSection, #rwSection').hide();
 			}
 		});
+		
+		$(document).on('change', 'input[name="fpAvailable"]', function () {
+
+			if ($(this).val() === 'yes') {
+				$('#fpSection').slideDown();
+				loadFootpathMaterialTypes();
+			} else {
+				$('#fpSection').slideUp();
+				$('#fpSection').find('input, select').val('');
+			}
+		});
 
 
 		$(document).on('change', 'input[name="scpAvailable"]', function () {
@@ -925,20 +1186,16 @@
 			}
 		});
 
-
-
-		/* $(document).on('change', 'input[name="cmAvailable"]', function () {
+		
+		$(document).on('change', 'input[name="slpAvailable"]', function () {
 
 			if ($(this).val() === 'yes') {
-				$('#cmSection').slideDown();
+				$('#slpSection').slideDown();
 			} else {
-				$('#cmSection').slideUp();
-
-				// Optional: clear fields when hidden
-				$('#cmSection').find('input, select').val('');
+				$('#slpSection').slideUp();
+				$('#slpSection').find('input, select').val('');
 			}
-		}); */
-
+		});
 
 		$(document).on('change', 'input[name="hmlAvailable"]', function () {
 
@@ -949,6 +1206,16 @@
 				$('#hmlSection').find('input, select').val('');
 			}
 		});
+		
+		$(document).on('change', 'input[name="mmlAvailable"]', function () {
+
+			if ($(this).val() === 'yes') {
+				$('#mmlSection').slideDown();
+			} else {
+				$('#mmlSection').slideUp();
+				$('#mmlSection').find('input, select').val('');
+			}
+		});
 
 
 		// ── Decimal-only enforcement for (m) and (inches) inputs ────────────────
@@ -970,9 +1237,18 @@
 				$(this).val(v);
 			}, 0);
 		});
+		
+		$(document).on('input', '.integer-only', function () {
+
+		    this.value = this.value.replace(/\D/g, '');
 
+		});
 
 
+		$("#resetBtn").click(function () {
+			location.reload();
+		});
+
 		$("#saveBtn").click(function () {
 			
 			let userId = document.getElementById('userIdSpan').textContent;
@@ -980,16 +1256,34 @@
 			
 			let length = $("#length").val().trim();
 			let avgWidth = $("#averageWidth").val().trim();
+			let minWidth = $("#minWidth").val().trim();
+			let maxWidth = $("#maxWidth").val().trim();
 			let area = $("#area").val().trim();
+									
 			let fpLen = $("#fplength").val().trim();
 			let fpWidth = $("#fpwidth").val().trim();
 			
 			let footpathDropdown =$("#footpathDropdown").val() ;
 			
-			let footpathfrom=$("#footPathFrom").val().trim()
-			let footpathto=$("#footPathTo").val().trim()
+			let footpathfrom=$("#footPathFrom").val().trim();
+			let footpathto=$("#footPathTo").val().trim();
+			
+			let fpVal = $('input[name="fpAvailable"]:checked').val();
+			
 			let swdVal = $('input[name="swdAvailable"]:checked').val();
 			
+			let scpVal = $('input[name="scpAvailable"]:checked').val() || "";
+			let mhVal = $('input[name="mhAvailable"]:checked').val();
+			
+			let cpVal = $('input[name="cpAvailable"]:checked').val();
+			let rwVal = $('input[name="rwAvailable"]:checked').val();
+			
+			let epVal = $('input[name="epAvailable"]:checked').val();
+			let bsVal = $('input[name="bsAvailable"]:checked').val();
+			
+			let hmlVal= $('input[name="hmlAvailable"]:checked').val();
+			let mmlVal= $('input[name="mmlAvailable"]:checked').val();
+			let slpVal= $('input[name="slpAvailable"]:checked').val();
 			
 			let sewerLength=$("#sewerLength").val().trim();
 			let sewerSize=$("#sewerSize").val().trim();
@@ -1021,67 +1315,44 @@
 			    
 			    return;
 			}
-
-			// Road Length
-			
-			 
 			
+			// Road Type Material
+			if (!$("#roadTypeMaterialDropdown").val()) {
+			    Swal.fire("Missing Field", "Please select a Road Type Material.", "warning");
+			    
+			    return;
+			}
+
+			// Road Length						 			
 			if (!length) {
 			    Swal.fire("Missing Field", "Please enter Road Length.", "warning");
 			    return;
 			}
 			
-
-			// Average Width
-			
-			
+			// Average Width					
 			if (!avgWidth) {
 			    Swal.fire("Missing Field", "Please enter Average Width.", "warning");
 			    return;
 			}
 
-			// Area
-			
-			
+			// Area						
 			if (!area) {
 			    Swal.fire("Missing Field", "Please enter Road Area.", "warning");
 			    return;
 			}
-
-			// Footpath Material
-			if (!footpathDropdown || footpathDropdown === "") {
-			    Swal.fire("Missing Field", "Please select Foot Path Material.", "warning");
-			    return;
-			}
-
-			// Footpath Length
-			
+						
+			if (!validate(length, "Road Length")) return;
+			if (!validate(avgWidth, "Average Width")) return;
+			if (!validate(area, "Road Area")) return;
 			
-			if (!fpLen) {
-			    Swal.fire("Missing Field", "Please enter Foot Path Length.", "warning");
+			if (!fpVal) {
+			    Swal.fire("Missing Field", "Please select Footpath Available or Not.", "warning");
 			    return;
 			}
-
-			// Footpath Width
 			
+			if (!validate(fpLen, "Foot Path Length")) return;
+			if (!validate(fpWidth, "Foot Path Width")) return;
 			
-			if (!fpWidth) {
-			    Swal.fire("Missing Field", "Please enter Foot Path Width.", "warning");			    
-			    return;
-			}
-
-			// Footpath From
-			if (!footpathfrom) {
-			    Swal.fire("Missing Field", "Please enter Foot Path From location.", "warning");
-			   
-			    return;
-			}
-
-			// Footpath To
-			if (!footpathto) {
-			    Swal.fire("Missing Field", "Please enter Foot Path To location.", "warning");
-			    return;
-			}
 
 			// SWD Available
 			
@@ -1089,63 +1360,276 @@
 			    Swal.fire("Missing Field", "Please select SWD Available or Not.", "warning");
 			    return;
 			}
-
 			
-			if (!sewerLength) {
-			    Swal.fire("Missing Field", "Please enter Sewer Length.", "warning");
-			    return;
-			}
-
-			// Sewer Size
-			if (!sewerSize) {
-			    Swal.fire("Missing Field", "Please enter Sewer Size.", "warning");
-			    return;
-			}
+			
+			
 			
 			
 			if (swdVal === "yes") {
+				
+				let fromswd =$("#fromswd").val().trim();
+				let toswd=$("#toswd").val().trim();
+				let swdlength=$("#swdlength").val().trim();
+				let swdsize=$("#size").val().trim()
+				
+				
+				
 
-			    if (!$("#fromswd").val().trim()) {
+			    if (!fromswd) {
 			        Swal.fire("Missing Field", "Please enter SWD From location.", "warning");
 			        return;
 			    }
 
-			    if (!$("#toswd").val().trim()) {
+			    if (!toswd) {
 			        Swal.fire("Missing Field", "Please enter SWD To location.", "warning");
 			        return;
 			    }
 
-			    if (!$("#swdlength").val().trim()) {
+			    if (!swdlength) {
 			        Swal.fire("Missing Field", "Please enter SWD Length.", "warning");
 			        return;
 			    }
+			    if (!validate(swdlength, "SWD Length")) return;
+			    
 
-			    if (!$("#size").val().trim()) {
+			    if (!swdsize) {
 			        Swal.fire("Missing Field", "Please enter SWD Size.", "warning");
 			        return;
 			    }
+			    if (!validate(swdsize, "SWD Size")) return;
 
 			    if (!$('input[name="scpAvailable"]:checked').val()) {
 			        Swal.fire("Missing Field", "Please select Slit Catch Pit Available or Not.", "warning");
 			        return;
 			    }
+			    
+			    if(!$('input[name="mhAvailable"]:checked').val()){
+			    	Swal.fire("Missing Field", "Please select Manhole Available or Not.", "warning");
+			        return;			    	
+			    }
+			    
+			    
+			    if(!$('input[name="cpAvailable"]:checked').val()){
+			    	Swal.fire("Missing Field", "Please select ChutPipe Available or Not.", "warning");
+			        return;			    	
+			    }
+			    
+			    if(!$('input[name="rwAvailable"]:checked').val()){
+			    	Swal.fire("Missing Field", "Please select Rain Water Harvesting Available or Not.", "warning");
+			        return;			    	
+			    }
+			    
+			    
+			   
 			}
 			
 			
+			
+			if(scpVal==="yes"){
+				
+				let scpCount =$("#scpCount").val().trim();
+				if (!scpCount) {
+			        Swal.fire("Missing Field", "Please enter Slit catch pit Count.", "warning");
+			        return;
+			    }
+				 if (!validate(scpCount, "Slit catch pit Count")) return;
+			
+			}
+			
+			if(mhVal==="yes"){
+				
+				let mhCount =$("#mhCount").val().trim();
+				let mhType=$("#mhType").val().trim();
+				
+				
+				if (!mhCount) {
+			        Swal.fire("Missing Field", "Please enter mhCount.", "warning");
+			        return;
+			    }
+				
+				if (!validate(mhCount, "Manhole Count")) return;
+				
+				
+				if (!mhType) {
+			        Swal.fire("Missing Field", "Please Select ManHole Location.", "warning");
+			        return;
+			    }
+				
+				
+			}
+			
+			if(cpVal === "yes"){
+				
+				let cpCount =$("#cpCount").val().trim();
+				
+				if (!cpCount) {
+			        Swal.fire("Missing Field", "Please enter ChutPipe Count.", "warning");
+			        return;
+			    }
+				
+				if (!validate(cpCount, "ChutPipe Count")) return;
+				
+			}
 
+			if(rwVal === "yes"){
+				
+				let rwCount =$("#rwCount").val().trim();
+				
+				if (!rwCount) {
+			        Swal.fire("Missing Field", "Please enter Rain Water Harvesting Count.", "warning");
+			        return;
+			    }
+				
+				if (!validate(rwCount, "Rain Water Harvesting Count")) return;
+				
+				
+			}
+			
+			
+			
+			if(epVal === "yes"){
+				
+				let epCount =$("#epCount").val().trim();
+				
+				if (!epCount) {
+			        Swal.fire("Missing Field", "Please enter Electricity Poles Count.", "warning");
+			        return;
+			    }
+				
+				if (!validate(epCount, "Electricity Poles Count")) return;
+				
+				
+			}
+			
+			
+			if(bsVal === "yes"){
+				
+				let bsCount =$("#bsCount").val().trim();
+				
+				if (!bsCount) {
+			        Swal.fire("Missing Field", "Please enter Bus Shelter Count.", "warning");
+			        return;
+			    }				
+				if (!validate(bsCount, "Bus Shelter Count")) return;
+	
+			}
+			
+			if(slpVal === "yes"){
+				
+				let slpCount =$("#slpCount").val().trim();
+				
+				if (!slpCount) {
+			        Swal.fire("Missing Field", "Please enter Street Light Poles Count.", "warning");
+			        return;
+			    }				
+				if (!validate(slpCount, "Street Light Poles Count")) return;
+	
+			}
+			
+			if(hmlVal === "yes"){
+				
+				let hmlCount =$("#hmlCount").val().trim();
+				
+				if (!hmlCount) {
+			        Swal.fire("Missing Field", "Please enter High Mass Light Count.", "warning");
+			        return;
+			    }				
+				if (!validate(hmlCount, "High Mass Light Count")) return;
+	
+			}
+			
+			if(mmlVal === "yes"){
+				
+				let mmlCount =$("#mmlCount").val().trim();
+				
+				if (!mmlCount) {
+			        Swal.fire("Missing Field", "Please enter Mini Mass Light Count.", "warning");
+			        return;
+			    }				
+				if (!validate(mmlCount, "Mini Mass Light Count")) return;
+	
+			}		
+			
+			
+			
+			
+			
+			if (!validate(sewerLength, "Sewer Length")) return;
+			if (!validate(sewerSize, "Sewer Size")) return;
+
+			let noofcb = $("#noofcb").val().trim();
+			if(noofcb){
+				if (!validate(noofcb, "No of Culverts & Bridges ")) return;
+			}
+			
 			let relayingDetails = [];
+			let relayingError = false;
 
 			$("#roadRelayingContainer .relaying-block").each(function () {
 
-				relayingDetails.push({
-					relay_month: $(this).find(".monthDropdown").val(),
-					relay_year: $(this).find(".yearDropdown").val(),
-					cr_value: $(this).find('input[name="crValue[]"]').val(),
-					road_type: $(this).find('input[name="roadType[]"]').val(),
-					remarks: $(this).find('textarea[name="remarks[]"]').val()
-				});
+			    let month = $(this).find(".monthDropdown").val();
+			    let year = $(this).find(".yearDropdown").val();
+			    let rrmtype = $(this).find(".r_roadmatDropdown").val();
+			    let crValue = $(this).find('input[name="crValue[]"]').val().trim();
+			    let roadType = $(this).find('input[name="roadType[]"]').val().trim();
+			    let remarks = $(this).find('textarea[name="remarks[]"]').val().trim();
+
+			    if (!month) {
+			        Swal.fire("Missing Field", "Please select Month of Relaying.", "warning");
+			        relayingError = true;
+			        return false;
+			    }
 
-			}); 
+			    if (!year) {
+			        Swal.fire("Missing Field", "Please select Year of Relaying.", "warning");
+			        relayingError = true;
+			        return false;
+			    }
+			    
+			    if (!rrmtype) {
+			        Swal.fire("Missing Field", "Please select Roadtype material of Relaying.", "warning");
+			        relayingError = true;
+			        return false;
+			    }
+
+			    if (!crValue) {
+			        Swal.fire("Missing Field", "Please enter CR Value.", "warning");
+			        relayingError = true;
+			        return false;
+			    }
+
+			    if (!validate(crValue, "CR Value")) {
+			        relayingError = true;
+			        return false;
+			    }
+			    
+			    
+
+			    if (!roadType) {
+			        Swal.fire("Missing Field", "Please enter Type/Subgrade box of the road.", "warning");
+			        relayingError = true;
+			        return false;
+			    }
+
+			    if (!remarks) {
+			        Swal.fire("Missing Field", "Please enter Remarks.", "warning");
+			        relayingError = true;
+			        return false;
+			    }
+
+			    relayingDetails.push({
+			        relay_month: month,
+			        relay_year: year,
+			        road_type_material:rrmtype,
+			        cr_value: crValue,
+			        road_type: roadType,
+			        remarks: remarks
+			    });
+			});
+
+			if (relayingError) {
+			    return;
+			}
 			
 			console.log("road id>>>>>",$("#roadDropdown").val());
 
@@ -1160,16 +1644,27 @@
     			road_name: $("#roadDropdown option:selected").data("road-name"),
 				road_type: $("#roadTypeDropdown").val(),
 				
+				road_type_material: $("#roadTypeMaterialDropdown").val(),
 
 				road_length: $("#length").val(),
 				road_avg_width: $("#averageWidth").val(),
+								
+				road_min_width: $("#minWidth").val().trim()|| null,
+				road_max_width: $("#maxWidth").val().trim()|| null,
+				
 				road_area: $("#area").val(),
-
-				footpath_material: $("#footpathDropdown").val(),
-				footpath_length: $("#fplength").val(),
-				footpath_width: $("#fpwidth").val(),
-				footpath_from_location: $("#footPathFrom").val(),
-				footpath_to_location: $("#footPathTo").val(),
+				
+				 roadfrom:$("#roadFrom").val().trim()|| null,
+				 roadto:$("#roadTo").val().trim()|| null,
+
+				 is_footpath:$('input[name="fpAvailable"]:checked').val(),
+				 
+				footpath_material: $("#footpathDropdown").val()|| null,
+				footpathat: $("#fpat").val()|| null,
+				footpath_length: $("#fplength").val()|| null,
+				footpath_width: $("#fpwidth").val()|| null,
+				footpath_from_location: $("#footPathFrom").val()|| null,
+				footpath_to_location: $("#footPathTo").val()|| null,
 
 				is_swd: $('input[name="swdAvailable"]:checked').val() || "",
 				swd_from: $('input[name="swdAvailable"]:checked').val() === "yes" ? $("#fromswd").val() : null,
@@ -1178,32 +1673,38 @@
 				swd_size: $('input[name="swdAvailable"]:checked').val() === "yes" ? $("#size").val() : null,
 
 				is_scp: $('input[name="scpAvailable"]:checked').val() || "",
-				scp_count: $('input[name="scpAvailable"]:checked').val() === "yes" ? $("#scpCount").val() : null,
+				scp_count: $('input[name="scpAvailable"]:checked').val() === "yes" ? ($("#scpCount").val().trim() || null) : null,
 
 				is_manhole: $('input[name="mhAvailable"]:checked').val() || "",
-				manhole_count: $('input[name="mhAvailable"]:checked').val() === "yes" ? $("#mhCount").val() : null,
+				manhole_count: $('input[name="mhAvailable"]:checked').val() === "yes" ? ($("#mhCount").val().trim() || null) : null,
 				manhole_location: $('input[name="mhAvailable"]:checked').val() === "yes" ? $("#mhType").val() : null,
 
 				is_cpipe: $('input[name="cpAvailable"]:checked').val() || "",
-				cpipe_count: $('input[name="cpAvailable"]:checked').val() === "yes" ? $("#cpCount").val() : null,
+				cpipe_count: $('input[name="cpAvailable"]:checked').val() === "yes" ? ($("#cpCount").val().trim() || null) : null,
 
 				is_rwh: $('input[name="rwAvailable"]:checked').val() || "",
-				rwh_count: $('input[name="rwAvailable"]:checked').val() === "yes" ? $("#rwCount").val() : null,
+				rwh_count: $('input[name="rwAvailable"]:checked').val() === "yes" ? ($("#rwCount").val().trim() || null) : null,
 
-				sewer_length: $("#sewerLength").val(),
-				sewer_size: $("#sewerSize").val(),
+				sewer_length: $("#sewerLength").val().trim()|| null,
+				sewer_size: $("#sewerSize").val().trim()|| null,
 
 				is_electric_poles: $('input[name="epAvailable"]:checked').val() || "",
-				ep_count: $('input[name="epAvailable"]:checked').val() === "yes" ? $("#epCount").val() : null,
-
+				ep_count: $('input[name="epAvailable"]:checked').val() === "yes" ? ($("#epCount").val().trim() || null) : null,
+						
+				is_streetlight_poles: $('input[name="slpAvailable"]:checked').val() || "",
+				streetlight_poles_count:$('input[name="slpAvailable"]:checked').val() === "yes" ? ($("#slpCount").val().trim() || null) : null,
+						
 				is_hml: $('input[name="hmlAvailable"]:checked').val() || "",
+				hml_count:$('input[name="hmlAvailable"]:checked').val() === "yes" ? ($("#hmlCount").val().trim() || null) : null,
 
-
+				is_mml:$('input[name="mmlAvailable"]:checked').val() || "",
+				mml_count:$('input[name="mmlAvailable"]:checked').val() === "yes" ? ($("#mmlCount").val().trim() || null) : null,
+						
 				culvert_bridge_count: $("#noofcb").val().trim()|| null,
 				details: $("#detailsofcb").val().trim()|| null,
 
 				is_busshelter: $('input[name="bsAvailable"]:checked').val() || "",
-				busshelter_count: $('input[name="bsAvailable"]:checked').val() === "yes" ? $("#bsCount").val() : null,
+				busshelter_count: $('input[name="bsAvailable"]:checked').val() === "yes" ? ($("#bsCount").val().trim() || null) : null,
 
 				is_centermedian: $('input[name="cmAvailable"]:checked').val() || "",
 
@@ -1265,6 +1766,46 @@
 			});
 
 		});
+		
+		
+		$('#roadDropdown').on('change', function () {
+
+		    let roadId = $(this).val();
+
+		    if (!roadId) {
+		        return;
+		    }
+
+		    $.ajax({
+		        url: '/gcc/api/roadwarweb/register/checkRoadExists',
+		        type: 'GET',
+		        data: {
+		            roadId: roadId
+		        },
+		        success: function (response) {
+
+		            if (response.status && response.exists) {
+
+		                Swal.fire({
+		                    icon: 'warning',
+		                    title: 'Already Registered',
+		                    text: 'Selected road already registered.'
+		                });
+
+		                $('#roadDropdown').val('').trigger('change');
+		            }
+		        }
+		    });
+
+		});
+		
+		function validate(value, fieldName) {
+		    if (parseFloat(value) <= 0) {
+		        Swal.fire("Invalid Value", fieldName + " must be greater than 0.", "warning");
+		        return false;
+		    }
+		    return true;
+		}
 
 
 	</script>
diff --git a/gcc_officer_portal/src/main/resources/templates/modules/roadwar/updateform.html b/gcc_officer_portal/src/main/resources/templates/modules/roadwar/updateform.html
index 30fafa2a..a71f071c 100644
--- a/gcc_officer_portal/src/main/resources/templates/modules/roadwar/updateform.html
+++ b/gcc_officer_portal/src/main/resources/templates/modules/roadwar/updateform.html
@@ -7,6 +7,9 @@
 .custom-width1 {
 	width: 30%; /* Adjust the width as needed */
 }
+.custom-width2 {
+	width: 15%; /* Adjust the width as needed */
+}
 #roadWarModal .modal-body {
     max-height: 80vh;  /* Limit the height to 70% of the viewport */
     overflow-y: auto;  /* Enable vertical scrolling */
@@ -56,14 +59,15 @@
 						<div class="col-12">
 							<div class="card">
 								<div class="card-header">
-									<span style="font-size: medium;font-weight: bold;">Reports Filters</span>
+									<span style="font-size: medium;font-weight: bold;"> Filters</span>
+									<span th:text="${LoginUserId}" id="userIdSpan" style="display: none;"></span>
 								</div>
 								<div class="card-body">
 									<div class="row">
 									
 									<div class="col-md-4 mb-3">
 												<label for="zoneDropdown" class="form-label"> Select
-													Zone <span class="text-danger">*</span>
+													Zone 
 												</label> <select id="zoneDropdown" class="form-control">
 													<option value="">Select Zone</option>
 													<!-- Zones will be loaded dynamically -->
@@ -74,7 +78,7 @@
 											<div class="col-md-4 mb-3">
 
 												<label for="wardDropdown" class="form-label"> Select
-													Ward <span class="text-danger">*</span>
+													Ward
 												</label> <select id="wardDropdown" class="form-control">
 													<option value="">Select Ward</option>
 													<!-- Wards will be loaded based on selected zone -->
@@ -84,7 +88,7 @@
 
 											<div class="col-md-4 mb-3">
 												<label for="roadDropdown" class="form-label">
-													Name of the Road <span class="text-danger">*</span>
+													Name of the Road 
 												</label>
 
 												<select id="roadDropdown" class="form-control">
@@ -110,7 +114,7 @@
 			         <div class="col-md-12">
 							<div class="card">
 							<div class="card-header">
-								<span style="font-size: medium;font-weight: bold;">Reports List</span>
+								<span style="font-size: medium;font-weight: bold;">Road war List</span>
 							</div>
 							<div class="card-body">
 								<div class="table-responsive" >
@@ -120,18 +124,16 @@
 											<tr role="row">
 
 												<th class="text-center no-sort">S.No</th>
-												<th class="text-center">Zone</th>
-												<th class="text-center">Ward</th>
-												<th class="text-center custom-width1">Road Name</th>
-												<th class="text-center">Road Type</th>
-												<th class="text-center">Road Length(m)</th>
-												<th class="text-center">Road Average Width(m)</th>
-												<th class="text-center">Area(m)</th>
-												<th class="text-center">Foot Path Material</th>
-												<th class="text-center">Foot Path Length(m)</th>
-												<th class="text-center">Foot Path Width(m)</th>	
+												<th class="text-center no-sort">Zone</th>
+												<th class="text-center no-sort">Ward</th>
+												<th class="text-center custom-width1 no-sort">Road Name</th>
+												<th class="text-center custom-width2 no-sort">Road Type</th>
+												<th class="text-center custom-width2 no-sort">Road Length(m)</th>
+												<th class="text-center custom-width2 no-sort">Road Average Width(m)</th>
+												<th class="text-center custom-width2 no-sort">Area(m<sup>2</sup>)</th>	
 												
-												<th class="text-center">Action</th>
+												<th class="text-center no-sort">Update</th>
+												<th class="text-center no-sort">Delete</th>
 											</tr>
 										</thead>
 										<tbody>
@@ -175,7 +177,7 @@
         <div class="modal-content">
 
             <div class="modal-header">
-                <h5 class="modal-title">
+                <h5 class="modal-title" id="titleModalLabel">
                     Road War Details
                 </h5>
 
@@ -187,91 +189,161 @@
             </div>
 
             <div class="modal-body">
-			<h5 class="modal-title">Road Details</h5>
+			<h5>Road Details</h5>
                 <div class="row">
 
                     <div class="col-md-3 mb-3">
                         <label class="form-label">Zone<span class="text-danger">*</span></label>
-                        <input type="text"
-                               id="view_zone"
-                               class="form-control">
+                        <select id="view_zone" class="form-control">
+						<option value="">Select Zone</option>
+						
+					</select>
                     </div>
 
                     <div class="col-md-3 mb-3">
-                        <label class="form-label">Ward</label>
-                        <input type="text"
-                               id="view_ward"
-                               class="form-control">
+                        <label class="form-label">Ward<span class="text-danger">*</span></label>
+                         <select id="view_ward" class="form-control">
+						<option value="">Select ward</option>
+						</select>
                     </div>
 
                     <div class="col-md-6 mb-3">
-                        <label class="form-label">Road Name</label>
-                        <input type="text"
-                               id="view_road_name"
-                               class="form-control">
+                        <label class="form-label">Name of the Road<span class="text-danger">*</span></label>
+                        <select id="view_road_name" class="form-control">
+													<option value="">Select Road</option>
+												</select>
                     </div>
 
                     <div class="col-md-3 mb-3">
-                        <label class="form-label">Road Type</label>
-                        <input type="text"
-                               id="view_road_type"
-                               class="form-control">
+                        <label class="form-label">Road Type<span class="text-danger">*</span></label>
+                          <select id="view_road_type" class="form-control">
+								<option value="">Select Road Type</option>
+							</select>
+                    </div>
+                    
+                    <div class="col-md-3 mb-3">
+                        <label class="form-label">Roadtype Material<span class="text-danger">*</span></label>
+                          <select id="view_roadtype_material" class="form-control">
+								<option value="">Select Roadtype material</option>
+						  </select>
                     </div>
 
                     <div class="col-md-3 mb-3">
-                        <label class="form-label">Road Length (m)</label>
+                        <label class="form-label">Length of Road (m)<span class="text-danger">*</span></label>
                         <input type="text"
                                id="view_road_length"
-                               class="form-control">
+                               class="form-control decimal-only">
                     </div>
-
+                    
                     <div class="col-md-3 mb-3">
-                        <label class="form-label">Average Width (m)</label>
+                        <label class="form-label">Average Width of Road (m)<span class="text-danger">*</span></label>
                         <input type="text"
                                id="view_road_avg_width"
-                               class="form-control" >
+                               class="form-control decimal-only" >
                     </div>
-
-                    <div class="col-md-3 mb-3">
-                        <label class="form-label">Area (m)</label>
+                    
+                    <div class="col-md-4 mb-3">
+                        <label class="form-label">Area of Road (m<sup>2</sup>)<span class="text-danger">*</span></label>
                         <input type="text"
                                id="view_road_area"
-                               class="form-control" >
+                               class="form-control decimal-only" >
+                    </div>
+
+                    
+                    
+                    <div class="col-md-4 mb-3">
+                        <label class="form-label">Min Width of Road (m)</label>
+                        <input type="text"
+                               id="view_road_min_width"
+                               class="form-control decimal-only" >
+                    </div>
+                    
+                    <div class="col-md-4 mb-3">
+                        <label class="form-label">Max Width of Road (m)</label>
+                        <input type="text"
+                               id="view_road_max_width"
+                               class="form-control decimal-only" >
                     </div>
 
-                    <div class="col-md-2 mb-3">
+                     <div class="col-md-12 mb-3">                   
+                     	<label class="form-label">Road Location</label>
+							<div class="row">
+								<div class="col-md-6">
+									<label for="view_roadFrom">From</label>
+									<input type="text" class="form-control" id="view_roadFrom"
+										name="view_roadFrom">
+								</div>
+	
+								<div class="col-md-6">
+									<label for="view_roadTo">To</label>
+									<input type="text" class="form-control" id="view_roadTo"
+										name="view_roadTo">
+								</div>
+							</div>                    
+                     </div>
+                     
+                     <div class="col-md-4 mb-3">
+											
+						<label class="form-label">
+							Footpath available or Not ?
+							<span class="text-danger">*</span>
+						</label>
+
+						<div>
+							<label class="mr-3">
+								<input type="radio" name="view_fpAvailable" value="yes">
+								Yes
+							</label>
+
+							<label>
+								<input type="radio" name="view_fpAvailable" value="no">
+								No
+							</label>
+						</div>
+					
+					</div>
+					
+					</div>
+											
+					<div class="row" id="fpSection" style="display:none;">
+
+                    <div class="col-md-3 mb-3">
                         <label class="form-label">Footpath Material</label>
-                        <!-- <input type="text"
-                               id="view_footpath_material"
-                               class="form-control" > -->
                           <select id="view_footpath_material" class="form-control">
-								<option value="">Select Material</option>
-								<option value="Tar">Tar</option>
-								<option value="Concrete">Concrete</option>
+								<option value="">Select Material</option>								
 							</select>
                     </div>
+                    
+                    <div class="col-md-3 mb-3">
+						<label for="view_fpat" class="form-label">Footpath Present at ?</label>
+						<select class="form-control" id="view_fpat" name="view_fpat">
+							<option value="">Select</option>
+							<option value="both side">Both Side</option>
+							<option value="single side">Single Side</option>
+						</select>
+					</div>
 
-                    <div class="col-md-2 mb-3">
-                        <label class="form-label">Footpath Length (m)</label>
+                    <div class="col-md-3 mb-3">
+                        <label class="form-label">Length of Footpath (m)</label>
                         <input type="text"
                                id="view_footpath_length"
-                               class="form-control" >
+                               class="form-control decimal-only" >
                     </div>
                     
-                    <div class="col-md-2 mb-3">
+                    <div class="col-md-3 mb-3">
 						    <label for="view_fpwidth" class="form-label">
-						        Average Width (m)
+						        Average Width of Footpath(m)
 						    </label>
 						
 						    <input type="text"
-						           class="form-control"
+						           class="form-control decimal-only"
 						           id="view_fpwidth" >
 						</div>
 						
-									<div class="col-md-6 mb-3">
+									<div class="col-md-12 mb-3">
 									
 									    <label class="form-label">
-									        Foot Path Location
+									        FootPath Location
 									    </label>
 									
 									    <div class="row">
@@ -299,12 +371,12 @@
                 		</div>
                 		
                 		<hr>
-                		
+                		<h5>SWD Details</h5>
                 		<div class="row">
 
 						    <div class="col-md-6 mb-3">
 						        <label class="form-label">
-						            SWD Available or Not?
+						            SWD Available or Not?<span class="text-danger">*</span>
 						        </label>
 						
 						        <div>
@@ -331,30 +403,30 @@
 						        <div class="row">
 						
 						            <div class="col-md-3 mb-3">
-						                <label>From</label>
+						                <label>From<span class="text-danger">*</span></label>
 						                <input type="text"
 						                       class="form-control"
 						                       id="update_fromswd">
 						            </div>
 						
 						            <div class="col-md-3 mb-3">
-						                <label>To</label>
+						                <label>To<span class="text-danger">*</span></label>
 						                <input type="text"
 						                       class="form-control"
 						                       id="update_toswd">
 						            </div>
 						
 						            <div class="col-md-3 mb-3">
-						                <label>Length (m)</label>
+						                <label>SWD Length (m)<span class="text-danger">*</span></label>
 						                <input type="text"
-						                       class="form-control"
+						                       class="form-control decimal-only"
 						                       id="update_swdlength">
 						            </div>
 						
 						            <div class="col-md-3 mb-3">
-						                <label>Size (inches)</label>
+						                <label>SWD Size (feet or cm)<span class="text-danger">*</span></label>
 						                <input type="text"
-						                       class="form-control"
+						                       class="form-control decimal-only"
 						                       id="update_size">
 						            </div>
 						
@@ -372,10 +444,10 @@
 						
 						        <!-- SCP -->
 						
-						        <div class="col-md-6 mb-4">
+						        <div class="col-md-4 mb-4">
 						
 						            <label class="form-label">
-						                Slit Catch Pit Available or Not?
+						                Slit Catch Pit Available or Not?<span class="text-danger">*</span>
 						            </label>
 						
 						            <div>
@@ -396,169 +468,177 @@
 						
 						            </div>
 						
-						            <div id="update_scpSection"
+						            <div class="col-md-6" id="update_scpSection"
 						                 style="display:none;margin-top:15px;">
 						
-						                <label>Count</label>
+						                <label>Count<span class="text-danger">*</span></label>
 						
 						                <input type="text"
-						                       class="form-control"
+						                       class="form-control integer-only"
 						                       id="update_scpCount">
 						
 						            </div>
 						
 						        </div>
+						        
+						        
+						        <!-- CHUT PIPE -->
 						
-						        <!-- MANHOLE -->
-						
-						        <div class="col-md-6 mb-4">
+						        <div class="col-md-4 mb-4">
 						
 						            <label class="form-label">
-						                Man Hole Available or Not?
+						                Chut Pipe Available or Not?<span class="text-danger">*</span>
 						            </label>
 						
 						            <div>
 						
 						                <label class="mr-3">
 						                    <input type="radio"
-						                           name="update_mhAvailable"
+						                           name="update_cpAvailable"
 						                           value="yes">
 						                    Yes
 						                </label>
 						
 						                <label>
 						                    <input type="radio"
-						                           name="update_mhAvailable"
+						                           name="update_cpAvailable"
 						                           value="no">
 						                    No
 						                </label>
 						
 						            </div>
 						
-						            <div id="update_mhSection"
+						            <div class="col-md-6" id="update_cpSection"
 						                 style="display:none;margin-top:15px;">
 						
-						                <div class="row">
-						
-						                    <div class="col-md-6">
-						                        <label>Count</label>
-						
-						                        <input type="text"
-						                               class="form-control"
-						                               id="update_mhCount">
-						                    </div>
-						
-						                    <div class="col-md-6">
-						                        <label>Location</label>
-						
-						                        <select class="form-control"
-						                                id="update_mhType">
-						
-						                            <option value="">
-						                                Select Location
-						                            </option>
-						
-						                            <option value="both side">
-						                                Both Side
-						                            </option>
-						
-						                            <option value="single side">
-						                                Single Side
-						                            </option>
+						                <label>Count<span class="text-danger">*</span></label>
 						
-						                        </select>
-						
-						                    </div>
-						
-						                </div>
+						                <input type="text"
+						                       class="form-control integer-only"
+						                       id="update_cpCount">
 						
 						            </div>
 						
 						        </div>
 						
-						        <!-- CHUT PIPE -->
+						        <!-- RWH -->
 						
-						        <div class="col-md-6 mb-4">
+						        <div class="col-md-4 mb-4">
 						
 						            <label class="form-label">
-						                Chut Pipe Available or Not?
+						                Rain Water Harvesting Available or Not?<span class="text-danger">*</span>
 						            </label>
 						
 						            <div>
 						
 						                <label class="mr-3">
 						                    <input type="radio"
-						                           name="update_cpAvailable"
+						                           name="update_rwAvailable"
 						                           value="yes">
 						                    Yes
 						                </label>
 						
 						                <label>
 						                    <input type="radio"
-						                           name="update_cpAvailable"
+						                           name="update_rwAvailable"
 						                           value="no">
 						                    No
 						                </label>
 						
 						            </div>
 						
-						            <div id="update_cpSection"
+						            <div class="col-md-6" id="update_rwSection"
 						                 style="display:none;margin-top:15px;">
 						
-						                <label>Count</label>
+						                <label>Count<span class="text-danger">*</span></label>
 						
 						                <input type="text"
-						                       class="form-control"
-						                       id="update_cpCount">
+						                       class="form-control integer-only"
+						                       id="update_rwCount">
 						
 						            </div>
 						
 						        </div>
 						
-						        <!-- RWH -->
+						        <!-- MANHOLE -->
 						
 						        <div class="col-md-6 mb-4">
 						
 						            <label class="form-label">
-						                Rain Water Harvesting Available or Not?
+						                Manhole / Machine hole Available or Not?<span class="text-danger">*</span>
 						            </label>
 						
 						            <div>
 						
 						                <label class="mr-3">
 						                    <input type="radio"
-						                           name="update_rwAvailable"
+						                           name="update_mhAvailable"
 						                           value="yes">
 						                    Yes
 						                </label>
 						
 						                <label>
 						                    <input type="radio"
-						                           name="update_rwAvailable"
+						                           name="update_mhAvailable"
 						                           value="no">
 						                    No
 						                </label>
 						
 						            </div>
 						
-						            <div id="update_rwSection"
+						            <div id="update_mhSection"
 						                 style="display:none;margin-top:15px;">
 						
-						                <label>Count</label>
+						                <div class="row">
 						
-						                <input type="text"
-						                       class="form-control"
-						                       id="update_rwCount">
+						                    <div class="col-md-6">
+						                        <label>Count<span class="text-danger">*</span></label>
+						
+						                        <input type="text"
+						                               class="form-control integer-only"
+						                               id="update_mhCount">
+						                    </div>
+						
+						                    <div class="col-md-6">
+						                        <label>Location<span class="text-danger">*</span></label>
+						
+						                        <select class="form-control"
+						                                id="update_mhType">
+						
+						                            <option value="">
+						                                Select Location
+						                            </option>
+						
+						                            <option value="both side">
+						                                Both Side
+						                            </option>
+						
+						                            <option value="single side">
+						                                Single Side
+						                            </option>
+						
+						                        </select>
+						
+						                    </div>
+						
+						                </div>
 						
 						            </div>
 						
 						        </div>
-        
-        
-						   <div class="col-md-6 mb-4">
+						
+						               						   
+							</div>
+
+					</div>
+					
+					
+					<div class="row">
+					
+						<div class="col-md-3 mb-4">
 						
 						    <label class="form-label">
-						        Electricity Pole Available or Not?
+						        Electricity Pole Available or Not? (TNEB)
 						    </label>
 						
 						    <div>
@@ -577,44 +657,21 @@
 						        </label>
 						    </div>
 						
-						    <div id="update_epSection"
+						    <div class="col-md-6" id="update_epSection"
 						         style="display:none;margin-top:15px;">
 						
-						        <label>Count</label>
+						        <label>Count<span class="text-danger">*</span></label>
 						
 						        <input type="text"
-						               class="form-control"
+						               class="form-control integer-only"
 						               id="update_epCount">
 						
 						    </div>
 						
 						</div>
+												
 						
-						<div class="col-md-6 mb-4">
-
-						    <label class="form-label">
-						        High Mass Light Available or Not?
-						    </label>
-						
-						    <div>
-						        <label class="mr-3">
-						            <input type="radio"
-						                   name="update_hmlAvailable"
-						                   value="yes">
-						            Yes
-						        </label>
-						
-						        <label>
-						            <input type="radio"
-						                   name="update_hmlAvailable"
-						                   value="no">
-						            No
-						        </label>
-						    </div>
-						
-						</div>
-						
-						<div class="col-md-6 mb-4">
+						<div class="col-md-3 mb-4">
 
 							    <label class="form-label">
 							        Bus Shelter Available or Not?
@@ -636,21 +693,81 @@
 							        </label>
 							    </div>
 							
-							    <div id="update_bsSection"
+							    <div class="col-md-6" id="update_bsSection"
 							         style="display:none;margin-top:15px;">
 							
-							        <label>Count</label>
+							        <label>Count<span class="text-danger">*</span></label>
 							
 							        <input type="text"
-							               class="form-control"
+							               class="form-control integer-only"
 							               id="update_bsCount">
 							
 							    </div>
 							
 							</div>
 							
+							<div class="col-md-3 mb-4">
+							    <label class="form-label"> Street Light Poles Available or Not?</label>							
+							    <div>
+							        <label class="mr-3">
+							            <input type="radio" name="update_slpAvailable" value="yes">Yes
+							        </label>							
+							        <label>
+							            <input type="radio" name="update_slpAvailable" value="no">No
+							        </label>
+							    </div>
+							
+							    <div class="col-md-6" id="update_slpSection" style="display:none;margin-top:15px;">
+							
+							        <label>Count<span class="text-danger">*</span></label>
+							
+							        <input type="text" class="form-control integer-only" id="update_slpCount">							
+							    </div>							
+							</div>
+							
+						<div class="col-md-3 mb-4">
+
+						    <label class="form-label">High Mass Light Available or Not?</label>
+						
+						    <div>
+						        <label class="mr-3">
+						            <input type="radio" name="update_hmlAvailable"value="yes">Yes
+						        </label>
+						
+						        <label>
+						            <input type="radio" name="update_hmlAvailable" value="no">No
+						        </label>
+						    </div>
+						    <div class="col-md-6" id="update_hmlSection" style="display:none;margin-top:15px;">
+							
+							        <label>Count<span class="text-danger">*</span></label>
+							
+							        <input type="text" class="form-control integer-only" id="update_hmlCount">							
+							    </div>
+						
+						</div>
+						
+						
+						<div class="col-md-3 mb-4">
+							    <label class="form-label">Mini Mass Light Available or Not?</label>							
+							    <div>
+							        <label class="mr-3">
+							            <input type="radio" name="update_mmlAvailable" value="yes">Yes</label>							
+							        <label>
+							            <input type="radio" name="update_mmlAvailable" value="no">No
+							        </label>
+							    </div>
+							
+							    <div class="col-md-6" id="update_mmlSection" style="display:none;margin-top:15px;">
+							
+							        <label>Count<span class="text-danger">*</span></label>
+							
+							        <input type="text" class="form-control integer-only" id="update_mmlCount">							
+							    </div>							
+							</div>
+							
 							
-							<div class="col-md-6 mb-4">
+							<div class="col-md-3 mb-4">
 
 							    <label class="form-label">
 							        Center Median Available or Not?
@@ -671,22 +788,11 @@
 							            No
 							        </label>
 							    </div>
-							
-							   <!--  <div id="update_cmSection"
-							         style="display:none;margin-top:15px;">
-							
-							        <label>Count</label>
-							
-							        <input type="text"
-							               class="form-control"
-							               id="update_cmCount">
-							
-							    </div> -->
-							
-							</div>
+														 							
 							</div>
-
+					
 					</div>
+					
 							
 							<div class="row">
 							
@@ -696,17 +802,17 @@
 									    </label>
 									
 									    <input type="text"
-									           class="form-control"
+									           class="form-control decimal-only"
 									           id="update_sewerLength">
 									</div>
 									
 									<div class="col-md-4 mb-3">
 									    <label class="form-label">
-									        Size of Sewer (inches)
+									        Size of Sewer (feet or cm)
 									    </label>
 									
 									    <input type="text"
-									           class="form-control"
+									           class="form-control decimal-only"
 									           id="update_sewerSize">
 									</div>
 									
@@ -716,7 +822,7 @@
 									    </label>
 									
 									    <input type="text"
-									           class="form-control"
+									           class="form-control integer-only"
 									           id="update_noofcb">
 									</div>
 									
@@ -778,35 +884,8 @@
 	
 	let monthList = [];
 	let yearList = [];
-	
-	function loadMonthMaster() {
-
-	    return $.ajax({
-	        url: "/gcc/api/roadwarweb/register/getMonthList",
-	        type: "GET",
-	        success: function(response) {
-
-	            if (response.status) {
-	                monthList = response.data;
-	            }
-	        }
-	    });
-	}
-
-	function loadYearMaster() {
-
-	    return $.ajax({
-	        url: "/gcc/api/roadwarweb/register/getYearList",
-	        type: "GET",
-	        success: function(response) {
+	let roadtypeMaterialList = [];
 
-	            if (response.status) {
-	                yearList = response.data;
-	            }
-	        }
-	    });
-	}
-	
 	$(document).ready(function () {
 		
 		var table = $('#ReportDatatable').DataTable({
@@ -856,7 +935,7 @@
             autoWidth: true,
             responsive: false,
             searching: true,
-            select: false,
+            select: true,
             processing: true
         });
 		
@@ -887,180 +966,561 @@
 				alert('Failed to load zones.');
 			}
 		});
-		
-		
-		$("#resetBtn").click(function () {
-		    location.reload();
-		});
-		
-		
+
 		loadRoadWarDetails();
 		
 		
-		
-		$(document).on('click', '.viewBtn', function () {
-			
-			 const refId = $(this).data('refid');
-
-			    console.log("Ref Id = " + refId);
-			    loadMonthMaster();
-			    loadYearMaster();
-			    fetchRoadWarDetails(refId);
-
-   		});	
-		
 	});
 	
 	
-	$('input[name="update_swdAvailable"]').change(function () {
-
-	    if ($(this).val() === 'yes') {
-
-	        $("#update_swdSection").show();
-	        $("#update_swdDependentFields").show();
+	$(document).on('input', '.decimal-only', function () {
 
-	    } else {
+	    this.value = this.value
+	        .replace(/[^0-9.]/g, '')
+	        .replace(/(\..*)\./g, '$1');
 
-	        $("#update_swdSection").hide();
-	        $("#update_swdDependentFields").hide();
+	});
+	
+	$(document).on('input', '.integer-only', function () {
 
-	        $("#update_fromswd").val('');
-	        $("#update_toswd").val('');
-	        $("#update_swdlength").val('');
-	        $("#update_size").val('');
+	    this.value = this.value.replace(/\D/g, '');
 
-	        $('input[name="update_scpAvailable"]').prop('checked', false);
-	        $('input[name="update_mhAvailable"]').prop('checked', false);
-	        $('input[name="update_cpAvailable"]').prop('checked', false);
-	        $('input[name="update_rwAvailable"]').prop('checked', false);
-	        
-	        $('input[name="update_epAvailable"]').prop('checked', false);
-	        $('input[name="update_bsAvailable"]').prop('checked', false);
-	        $('input[name="update_cmAvailable"]').prop('checked', false);
-	        $('input[name="update_hmlAvailable"]').prop('checked', false);
-	        
+	});
+	
+	
+	function loadZonesInModal(){
+		$.ajax({
+			url: '/gcc/api/roadwarweb/register/getzones',
+			type: 'GET',
+			success: function (response) {
 
-	        $("#update_scpSection").hide();
-	        $("#update_mhSection").hide();
-	        $("#update_cpSection").hide();
-	        $("#update_rwSection").hide();
-	        $("#update_epSection").hide();
-	        $("#update_bsSection").hide();
-	        $("#update_cmSection").hide();
-	        $("#update_hmlSection").hide();
-
-	        $("#update_scpCount").val('');
-	        $("#update_mhCount").val('');
-	        $("#update_mhType").val('');
-	        $("#update_cpCount").val('');
-	        $("#update_rwCount").val('');
-	        $("#update_epCount").val('');
-	        $("#update_bsCount").val('');
-	        $("#update_cmCount").val('');
-	        $("#update_hmlCount").val('');
-	    }
+				$('#view_zone').empty()
+					.append('<option value="">Select Zone</option>');
+
+				if (response.status) {
+
+					$.each(response.data, function (index, zone) {
+
+						$('#view_zone').append(
+							'<option value="' + zone.zone_name + '">' +
+							zone.zone_name +
+							'</option>'
+						);
+
+					});
+
+				}
+			},
+			error: function () {
+				alert('Failed to load zones in modal.');
+			}
+		});
+	}
+	
+	$('#view_zone').change(function () {
 
+	    let zone = $(this).val();
+
+	    // Clear ward
+	    $('#view_ward').empty()
+	        .append('<option value="">Select Ward</option>');
+
+	    // Clear road
+	    $('#view_road_name').empty()
+	        .append('<option value="">Select Road</option>');
+
+	    if (zone) {
+	        loadWards(zone);
+	    }
 	});
 	
+	$('#view_ward').change(function () {
+
+	    let ward = $(this).val();
+
+	    // Clear road
+	    $('#view_road_name').empty()
+	        .append('<option value="">Select Road</option>');
+
+	    if (ward) {
+	        loadRoads(ward);
+	    }
+	});
 	
-	 $('input[name="update_scpAvailable"]').change(function () {
+	function loadWards(zone, selectedWard = null) {
 
-	        if ($(this).val() === 'yes') {
-	            $("#update_scpSection").show();
-	        } else {
-	            $("#update_scpSection").hide();
-	            $("#update_scpCount").val('');
-	        }
+	    $.ajax({
+	        url: '/gcc/api/roadwarweb/register/getwardbyzone',
+	        type: 'GET',
+	        data: { zone: zone },
 
-	    });
-	 
-	 
-	 $('input[name="update_mhAvailable"]').change(function () {
-
-	        if ($(this).val() === 'yes') {
-	            $("#update_mhSection").show();
-	        } else {
-	            $("#update_mhSection").hide();
-	            $("#update_mhCount").val('');
-	            $("#update_mhType").val('');
-	        }
+	        success: function (response) {
 
-	    });
-	 
-	 
-	 $('input[name="update_cpAvailable"]').change(function () {
+	            $('#view_ward').empty()
+	                .append('<option value="">Select Ward</option>');
 
-	        if ($(this).val() === 'yes') {
-	            $("#update_cpSection").show();
-	        } else {
-	            $("#update_cpSection").hide();
-	            $("#update_cpCount").val('');
-	            
-	        }
+	            if (response.status) {
 
-	    });
-	 
-	 
-	 $('input[name="update_rwAvailable"]').change(function () {
+	                $.each(response.data, function (index, ward) {
 
-	        if ($(this).val() === 'yes') {
-	            $("#update_rwSection").show();
-	        } else {
-	            $("#update_rwSection").hide();
-	            $("#update_rwCount").val('');
-	            
-	        }
+	                    $('#view_ward').append(
+	                        `<option value="${ward.ward_name}">
+	                            ${ward.ward_name}
+	                        </option>`
+	                    );
 
-	    });
-	 
-	 
-	 
-	 $('input[name="update_epAvailable"]').change(function () {
+	                });
 
-	        if ($(this).val() === 'yes') {
-	            $("#update_epSection").show();
-	        } else {
-	            $("#update_epSection").hide();
-	            $("#update_epCount").val('');
-	            
+	                if (selectedWard) {
+	                    $('#view_ward').val(selectedWard);
+	                }
+	            }
 	        }
+	    });
+	}
+	
+	function loadRoads(ward, selectedRoad = null) {
+
+	    $.ajax({
+	        url: '/gcc/api/roadwarweb/register/getRoadNamesByWard',
+	        type: 'GET',
+	        data: { ward: ward },
+
+	        success: function (response) {
+
+	            $('#view_road_name').empty()
+	                .append('<option value="">Select Road</option>');
+
+	            if (response.status) {
+
+	                $.each(response.data, function (index, road) {
+
+	                    $('#view_road_name').append(	                        
+	                        $('<option>', {
+							value: road.road_id,
+							text:  road.road_name
+						}).attr('data-road-name', road.road_name)
+	                    );
+
+	                });
+	                
+	                
 
+	                if (selectedRoad) {
+	                    $('#view_road_name').val(selectedRoad);
+	                }
+	                	                
+	            }
+	        }
 	    });
-	 
-	 
-	 $('input[name="update_bsAvailable"]').change(function () {
+	}
+	
+	function loadFootpathTypeMaterials() {
+		$.ajax({
+			url: '/gcc/api/roadwarweb/register/getFootpathType',
+			type: 'GET',
+			success: function (response) {
 
-	        if ($(this).val() === 'yes') {
-	            $("#update_bsSection").show();
-	        } else {
-	            $("#update_bsSection").hide();
-	            $("#update_bsCount").val('');
-	            
+				if (response.status) {
+
+					let dropdown = $("#view_footpath_material");
+
+					// Clear existing options except default
+					dropdown.empty();
+					dropdown.append('<option value="">Select material</option>');
+
+					$.each(response.data, function (index, item) {
+						dropdown.append(
+							'<option value="' + item.id + '">' +
+							item.footpath_type_name +
+							'</option>'
+						);
+					});
+
+				} else {
+					alert(response.message);
+				}
+			},
+			error: function (xhr, status, error) {
+				console.error("Error fetching footpath type materials:", error);
+			}
+		});
+	}
+	
+	function loadRoadTypeMaterials() {
+		$.ajax({
+			url: '/gcc/api/roadwarweb/register/getRoadTypeMaterial',
+			type: 'GET',
+			success: function (response) {
+
+				if (response.status) {
+
+					let dropdown = $("#view_roadtype_material");
+
+					// Clear existing options except default
+					dropdown.empty();
+					dropdown.append('<option value="">Select Roadtype material</option>');
+
+					$.each(response.data, function (index, item) {
+						dropdown.append(
+							'<option value="' + item.id + '">' +
+							item.roadtype_material +
+							'</option>'
+						);
+					});
+
+				} else {
+					alert(response.message);
+				}
+			},
+			error: function (xhr, status, error) {
+				console.error("Error fetching roadtype materials:", error);
+			}
+		});
+	}
+	
+	function loadRoadTypes() {
+		$.ajax({
+			url: '/gcc/api/roadwarweb/register/getRoadType',
+			type: 'GET',
+			success: function (response) {
+
+				if (response.status) {
+
+					let dropdown = $("#view_road_type");
+
+					// Clear existing options except default
+					dropdown.empty();
+					dropdown.append('<option value="">Select Road Type</option>');
+
+					$.each(response.data, function (index, item) {
+						dropdown.append(
+							'<option value="' + item.id + '">' +
+							item.roadType +
+							'</option>'
+						);
+					});
+
+				} else {
+					alert(response.message);
+				}
+			},
+			error: function (xhr, status, error) {
+				console.error("Error fetching road types:", error);
+			}
+		});
+	}
+	
+	function loadMonthMaster() {
+
+	    return $.ajax({
+	        url: "/gcc/api/roadwarweb/register/getMonthList",
+	        type: "GET",
+	        success: function(response) {
+
+	            if (response.status) {
+	                monthList = response.data;
+	            }
 	        }
+	    });
+	}
+
+	function loadYearMaster() {
+
+	    return $.ajax({
+	        url: "/gcc/api/roadwarweb/register/getYearList",
+	        type: "GET",
+	        success: function(response) {
 
+	            if (response.status) {
+	                yearList = response.data;
+	            }
+	        }
 	    });
-	 
-	 
-	 
-	 $('input[name="update_cmAvailable"]').change(function () {
+	}
+	
+	function loadRelayRoadtypeMaterial(){
+		
+		
+		return $.ajax({
+	        url: "/gcc/api/roadwarweb/register/getRoadTypeMaterial",
+	        type: "GET",
+	        success: function(response) {
 
-	        if ($(this).val() === 'yes') {
-	            $("#update_cmSection").show();
-	        } else {
-	            $("#update_cmSection").hide();
-	            $("#update_cmCount").val('');
-	            
+	            if (response.status) {
+	            	roadtypeMaterialList = response.data;
+	            }
 	        }
+	    });
+	}
+	
+	$("#resetBtn").click(function () {
+	    location.reload();
+	});
+	
+	
+	$(document).on('click', '.viewBtn', function () {
+		
+		 const refId = $(this).data('refid');
+
+		    console.log("Ref Id = " + refId);
+		    loadMonthMaster();
+		    loadYearMaster();
+		    loadRelayRoadtypeMaterial();
+		    loadRoadTypes();
+		    loadRoadTypeMaterials();
+		    loadZonesInModal();
+		    loadFootpathTypeMaterials();
+		    fetchRoadWarDetails(refId);
+
+		});
+	
+	$(document).on('click', '.deleteBtn', function () {
+
+	    const refId = $(this).data('refid');
+	    let deleteby = document.getElementById('userIdSpan').textContent;
+
+	    Swal.fire({
+	        title: 'Are you sure?',
+	        text: 'Do you want to delete this Road War record?',
+	        icon: 'warning',
+	        showCancelButton: true,
+	        confirmButtonText: 'Yes, Delete',
+	        cancelButtonText: 'Cancel',
+	        confirmButtonColor: '#d33'
+	    }).then((result) => {
+
+	        if (result.isConfirmed) {
+
+	            $.ajax({
+
+	                url: '/gcc/api/roadwarweb/register/deleteRoadWarDetails',
+	                type: 'POST',
+
+	                data: {
+	                    refId: refId,
+	                    updatedby:deleteby
+	                },
 
+	                beforeSend: function () {
+	                    $("#pageLoader").show();
+	                },
+
+	                success: function (response) {
+
+	                    if (response.status) {
+
+	                        Swal.fire(
+	                            'Deleted!',
+	                            response.message,
+	                            'success'
+	                        );
+
+	                        loadRoadWarDetails();
+
+	                    } else {
+
+	                        Swal.fire(
+	                            'Error',
+	                            response.message,
+	                            'error'
+	                        );
+	                    }
+	                },
+
+	                error: function () {
+
+	                    Swal.fire(
+	                        'Error',
+	                        'Failed to delete record',
+	                        'error'
+	                    );
+	                },
+
+	                complete: function () {
+	                    $("#pageLoader").hide();
+	                }
+	            });
+	        }
 	    });
+	});
+	
+	document.querySelectorAll('input[name="view_fpAvailable"]').forEach(radio => {
+        radio.addEventListener('change', function () {         
+            if (this.value === 'yes') {
+            	$("#fpSection").show();
+            } else {
+            	$("#fpSection").hide();
+            	$('#fpSection').find('input, select').val('');
+            }
+        });
+    });
+	
+	document.querySelectorAll('input[name="update_swdAvailable"]').forEach(radio => {
+        radio.addEventListener('change', function () {
+           
+            if (this.value === 'yes') {
+            	
+            	$("#update_swdSection").show();
+    	        $("#update_swdDependentFields").show();
+    	        
+    	        $("#update_fromswd").val('');
+    	        $("#update_toswd").val('');
+    	        $("#update_swdlength").val('');
+    	        $("#update_size").val('');
+    	        
+    	        $('input[name="update_scpAvailable"]').prop('checked', false);
+    	        $('input[name="update_mhAvailable"]').prop('checked', false);
+    	        $('input[name="update_cpAvailable"]').prop('checked', false);
+    	        $('input[name="update_rwAvailable"]').prop('checked', false);
+    	        
+    	        $("#update_scpSection").hide();
+    	        $("#update_mhSection").hide();
+    	        $("#update_cpSection").hide();
+    	        $("#update_rwSection").hide();
+    	        
+    	        $("#update_scpCount").val('');
+    	        $("#update_mhCount").val('');
+    	        $("#update_mhType").val('');
+    	        $("#update_cpCount").val('');
+    	        $("#update_rwCount").val('');
+            	 
+            }if (this.value === 'no') {
+            	
+            	$("#update_swdSection").hide();
+    	        $("#update_swdDependentFields").hide();
+    	        
+    	        
+    	        $("#update_fromswd").val('');
+    	        $("#update_toswd").val('');
+    	        $("#update_swdlength").val('');
+    	        $("#update_size").val('');
+    	        
+    	        $('input[name="update_scpAvailable"]').prop('checked', false);
+    	        $('input[name="update_mhAvailable"]').prop('checked', false);
+    	        $('input[name="update_cpAvailable"]').prop('checked', false);
+    	        $('input[name="update_rwAvailable"]').prop('checked', false);
+    	        
+    	        $("#update_scpCount").val('');
+    	        $("#update_mhCount").val('');
+    	        $("#update_mhType").val('');
+    	        $("#update_cpCount").val('');
+    	        $("#update_rwCount").val('');
+            }
+        });
+    });
 	
 	
+	document.querySelectorAll('input[name="update_scpAvailable"]').forEach(radio => {
+        radio.addEventListener('change', function () {         
+            if (this.value === 'yes') {
+            	$("#update_scpSection").show();
+            } else {
+            	$("#update_scpSection").hide();
+	            $("#update_scpCount").val('');
+            }
+        });
+    });
+	
+	document.querySelectorAll('input[name="update_mhAvailable"]').forEach(radio => {
+        radio.addEventListener('change', function () {         
+            if (this.value === 'yes') {
+            	$("#update_mhSection").show();
+            } else {
+            	 $("#update_mhSection").hide();
+ 	            $("#update_mhCount").val('');
+ 	            $("#update_mhType").val('');
+            }
+        });
+    });
+	
+	document.querySelectorAll('input[name="update_cpAvailable"]').forEach(radio => {
+        radio.addEventListener('change', function () {         
+            if (this.value === 'yes') {
+            	$("#update_cpSection").show();
+            } else {
+            	 $("#update_cpSection").hide();
+ 	            $("#update_cpCount").val('');
+            }
+        });
+    });
+
+	document.querySelectorAll('input[name="update_rwAvailable"]').forEach(radio => {
+        radio.addEventListener('change', function () {         
+            if (this.value === 'yes') {
+            	$("#update_rwSection").show();
+            } else {
+            	$("#update_rwSection").hide();
+	            $("#update_rwCount").val('');
+            }
+        });
+    });
+	
+	document.querySelectorAll('input[name="update_epAvailable"]').forEach(radio => {
+        radio.addEventListener('change', function () {         
+            if (this.value === 'yes') {
+            	$("#update_epSection").show();
+            } 
+            else {
+            	 $("#update_epSection").hide();
+ 	            $("#update_epCount").val('');
+            }
+        });
+    });	
+	 
+	document.querySelectorAll('input[name="update_bsAvailable"]').forEach(radio => {
+        radio.addEventListener('change', function () {         
+            if (this.value === 'yes') {
+            	 $("#update_bsSection").show();
+            } else {
+            	$("#update_bsSection").hide();
+	            $("#update_bsCount").val('');
+            }
+        });
+    });	
+	
+	document.querySelectorAll('input[name="update_slpAvailable"]').forEach(radio => {
+        radio.addEventListener('change', function () {         
+            if (this.value === 'yes') {
+            	 $("#update_slpSection").show();
+            } else {
+            	$("#update_slpSection").hide();
+	            $("#update_slpCount").val('');
+            }
+        });
+    });	
+	
+	document.querySelectorAll('input[name="update_hmlAvailable"]').forEach(radio => {
+        radio.addEventListener('change', function () {         
+            if (this.value === 'yes') {
+            	 $("#update_hmlSection").show();
+            } else {
+            	$("#update_hmlSection").hide();
+	            $("#update_hmlCount").val('');
+            }
+        });
+    });
+
+	document.querySelectorAll('input[name="update_mmlAvailable"]').forEach(radio => {
+        radio.addEventListener('change', function () {         
+            if (this.value === 'yes') {
+            	 $("#update_mmlSection").show();
+            } else {
+            	$("#update_mmlSection").hide();
+	            $("#update_mmlCount").val('');
+            }
+        });
+    });
+		
 	$('#zoneDropdown').change(function () {
 
 		let zone = $(this).val();
 
 		$('#wardDropdown').empty()
 			.append('<option value="">Select Ward</option>');
+		
+		$('#roadDropdown').empty()
+		.append('<option value="">Select Road</option>');
 
 		if (zone) {
 
@@ -1127,7 +1587,7 @@
 
 							$('#roadDropdown').append(
 								$('<option>', {
-									value: road.road_name,
+									value: road.road_id,
 									text: road.road_name
 								})
 							);
@@ -1171,10 +1631,12 @@
 	
 	
 	function loadRoadWarDetails() {
+		
+		let cby = document.getElementById('userIdSpan').textContent;
 
 	    let zone = $("#zoneDropdown").val();
 	    let ward = $("#wardDropdown").val();
-	    let roadName = $("#roadDropdown").val();
+	    let roadId = $("#roadDropdown").val();
 
 	    $("#pageLoader").show();
 
@@ -1184,62 +1646,119 @@
 	        type: "GET",
 
 	        data: {
+	        	userid:cby,
 	            zone: zone,
 	            ward: ward,
-	            roadName: roadName
+	            roadId: roadId
 	        },
 
 	        success: function (response) {
-
-	            let tbody = $("#ReportDatatable tbody");
-
-	            tbody.empty();
-
-	            if (response.length > 0) {
-
-	                $.each(response, function (index, item) {
-
-	                    tbody.append(`
-	                    		 <tr class="text-center">
-	                            <td>${index + 1}</td>
-	                            <td>${item.zone || ''}</td>
-	                            <td>${item.ward || ''}</td>
-	                            <td>${item.road_name || ''}</td>
-	                            <td>${item.road_type_name || ''}</td>
-	                            <td>${item.road_length || ''}</td>
-	                            <td>${item.road_avg_width || ''}</td>
-	                            <td>${item.road_area || ''}</td>
-	                            <td>${item.footpath_material || ''}</td>
-	                            <td>${item.footpath_length || ''}</td>
-	                            <td>${item.footpath_width || ''}</td>
-	                            
-	                            <td>
-	                            <button class="btn btn-primary btn-sm viewBtn"
-	                                    data-refid="${item.ref_id}">
-	                                View
-	                            </button>
-	                        </td>
-	                        
-	                        </tr>
-	                    `);
-
-	                });
-
-	            } else {
-
-	                tbody.append(`
-	                    <tr>
-	                        <td colspan="11" class="text-center">
-	                            No Records Found
-	                        </td>
-	                    </tr>
-	                `);
-	            }
+	        	
+	        	let tableData = Array.isArray(response) ? response : [];
+	        	
+	        	if (Array.isArray(response) && response.length > 0) {
+    	            let table = $('#ReportDatatable').DataTable({
+    	                destroy: true,
+    	                searching: true,
+    	                autoWidth: true,           	                
+    	                paging: true,
+    	                info: true,
+    	                data: tableData,           	                
+    	                columns: [
+    	                    { 
+    	                        data: null, 
+    	                        render: (data, type, row, meta) => meta.row + 1, 
+    	                        className: 'text-center' 
+    	                    },
+    	                    { data: 'zone', defaultContent: '-', className: 'text-center' },
+    	                    { data: 'ward', defaultContent: '-', className: 'text-center' },
+    	                    { data: 'road_name', defaultContent: '-', className: 'text-center' },
+    	                    { data: 'road_type_name', defaultContent: '-', className: 'text-center' },
+    	                    
+    	                    { data: 'road_length', defaultContent: '-', className: 'text-center' },
+    	                    { data: 'road_avg_width', defaultContent: '-', className: 'text-center' },
+    	                    { data: 'road_area', defaultContent: '-', className: 'text-center' },
+    	                    
+    	                    { 
+    	                        data: 'ref_id', 
+    	                        render: function(data) {
+    	                            return `<button type="button" class="btn btn-primary btn-sm viewBtn"  data-refid="${data}">Update</button>`;
+    	                        }, 
+    	                        className: 'text-center' 
+    	                    },
+    	                    { 
+    	                        data: 'ref_id', 
+    	                        render: function(data) {
+    	                            return `<button type="button" class="btn btn-warning btn-sm deleteBtn"  data-refid="${data}">Delete</button>`;
+    	                        }, 
+    	                        className: 'text-center' 
+    	                    }
+    	                    
+    	                      
+    	                ],
+    	                dom: 'Bfrtip',
+    	                buttons: [
+     		                  {
+     		                      extend: 'pageLength',
+     		                      className: 'btn btn-warning'
+     		                  },
+     		                  {
+     		                      title: 'Data export',
+     		                      extend: 'copyHtml5',
+     		                      text: 'Copy',
+     		                      className: 'btn btn-secondary',
+     		                      id: 'copyBtn'
+     		                  },
+     		                  {
+     		                      extend: 'excelHtml5',
+     		                      text: 'Excel',
+     		                      className: 'btn btn-secondary',
+     		                      id: 'excelBtn'
+     		                  },
+     		                  {
+     		                      extend: 'csvHtml5',
+     		                      text: 'CSV',
+     		                      className: 'btn btn-secondary',
+     		                      id: 'csvBtn'
+     		                  },
+     		                  {
+     		                      extend: 'pdfHtml5',
+     		                      text: 'PDF',
+     		                      className: 'btn btn-secondary',
+     		                      id: 'pdfBtn'
+     		                  }
+     		              ],
+     		             columnDefs: [
+     		                { targets: 'no-sort', orderable: false }
+     		            ],
+     		            lengthMenu: [
+     		                [50, 100, 200, 500, -1],
+     		                ['50 rows', '100 rows', '200 rows', 'Show all']
+     		            ],
+     		            scrollY: '80vh',
+     		            scrollX: true,   	      		            
+     		       		responsive: false,
+               		    searching: true,
+               		 language: {
+                         emptyTable: "No Records Found"
+                     }
+               	
+     		            });
+    	        }
+	            
+	            setTimeout(function () {
+	                $('#ReportDatatable').DataTable().columns.adjust();
+	            }, 100);
+	            
 	        },
 
 	        error: function () {
 
-	            alert("Failed to load data");
+	        	Swal.fire(
+	                    'Error',
+	                    'Failed to load Road War details',
+	                    'error'
+	                );
 
 	        },
 
@@ -1271,132 +1790,156 @@
 	            console.log(response);
 
 	            $("#view_zone").val(response.zone);
-	            $("#view_ward").val(response.ward);
-	            $("#view_road_name").val(response.road_name);
-	            $("#view_road_type").val(response.road_type_name);
+
+		         // Load wards
+		         loadWards(response.zone, response.ward);
+	
+		         // Load roads after wards loaded
+		         setTimeout(function () {
+	
+		             loadRoads(
+		                 response.ward,
+		                 response.road_id
+		             );
+	
+		         }, 300);
+/* 	            $("#view_ward").val(response.ward);
+	            $("#view_road_name").val(response.road_name); */
+	            $("#view_road_type").val(response.road_type);
+	            $("#view_roadtype_material").val(response.road_type_material);
 	            $("#view_road_length").val(response.road_length);
 	            $("#view_road_avg_width").val(response.road_avg_width);
-	            $("#view_road_area").val(response.road_area);
-	            $("#view_footpath_material").val(response.footpath_material);
-	            $("#view_footpath_length").val(response.footpath_length);
 	            
+	            $("#view_road_min_width").val(response.road_min_width);
+	            $("#view_road_max_width").val(response.road_max_width);
 	            
-	            $("#view_fpwidth").val(response.footpath_width);
-
-	            $("#view_footPathFrom")
-	                .val(response.footpath_from_location);
-
-	            $("#view_footPathTo")
-	                .val(response.footpath_to_location);
+	            $("#view_road_area").val(response.road_area);
+	            $("#view_roadFrom").val(response.road_from);
+	            $("#view_roadTo").val(response.road_to);
+	            	           	            
 	            
+	            if(response.is_footpath === 'yes'){
+	            	$('input[name="view_fpAvailable"][value="' + response.is_footpath + '"]').prop('checked', true);
+
+
+		            $("#view_footpath_material").val(response.footpath_material);
+		            $("#view_fpat").val(response.footpath_at);
+		            $("#view_footpath_length").val(response.footpath_length);	            	            
+		            $("#view_fpwidth").val(response.footpath_width);
+		            $("#view_footPathFrom").val(response.footpath_from_location);
+		            $("#view_footPathTo").val(response.footpath_to_location);
+		            
+	            	$("#fpSection").show();
+	            }
+	            else{
+	            	$('input[name="view_fpAvailable"][value="' + response.is_footpath + '"]').prop('checked', true);
+	            	$("#fpSection").hide();
+	            }
 	            
 	            if(response.is_swd === 'yes'){
+	            	
+	            	$('input[name="update_swdAvailable"][value="' + response.is_swd + '"]').prop('checked', true);
 
-	                $('input[name="update_swdAvailable"][value="yes"]')
-	                    .prop('checked', true);
-
-	                $("#update_swdSection").show();
-	                $("#update_swdDependentFields").show();
+	                
+	               
 
 	                $("#update_fromswd").val(response.swd_from);
 	                $("#update_toswd").val(response.swd_to);
 	                $("#update_swdlength").val(response.swd_length);
 	                $("#update_size").val(response.swd_size);
+	                
+	                $("#update_swdSection").show();
+	                
+	                if(response.is_scp && response.is_scp.toLowerCase() === 'yes'){
 
-	            }else{
+		            		    $('input[name="update_scpAvailable"][value="yes"]')
+		            		        .prop('checked', true);
 
-	                $('input[name="update_swdAvailable"][value="no"]')
-	                    .prop('checked', true);
+		            		    $('#update_scpSection').show();
 
-	                $("#update_swdSection").hide();
-	                $("#update_swdDependentFields").hide();
-	            }
-	            
-	            
-	            
-	            if(response.is_scp &&
-	            		   response.is_scp.toLowerCase() === 'yes'){
-
-	            		    $('input[name="update_scpAvailable"][value="yes"]')
-	            		        .prop('checked', true);
-
-	            		    $('#update_scpSection').show();
+		            		    $('#update_scpCount')
+		            		        .val(response.scp_count);
 
-	            		    $('#update_scpCount')
-	            		        .val(response.scp_count);
+		            }
+	                else
+	                {
+	                	$('input[name="update_scpAvailable"][value="no"]')
+        		        .prop('checked', true);
 
-	            		}else{
+        		    	$('#update_scpSection').hide();
+	                }
+	                
+	                if(response.is_manhole && response.is_manhole.toLowerCase() === 'yes'){
 
-	            		    $('input[name="update_scpAvailable"][value="no"]')
-	            		        .prop('checked', true);
-
-	            		    $('#update_scpSection').hide();
-	            		}
-	            
-	            
-	            if(response.is_manhole &&
-	            		   response.is_manhole.toLowerCase() === 'yes'){
+            		    $('input[name="update_mhAvailable"][value="yes"]')
+            		        .prop('checked', true);
 
-	            		    $('input[name="update_mhAvailable"][value="yes"]')
-	            		        .prop('checked', true);
+            		    $('#update_mhSection').show();
 
-	            		    $('#update_mhSection').show();
+            		    $('#update_mhCount')
+            		        .val(response.manhole_count);
 
-	            		    $('#update_mhCount')
-	            		        .val(response.manhole_count);
+            		    $('#update_mhType')
+            		        .val(response.manhole_location);
 
-	            		    $('#update_mhType')
-	            		        .val(response.manhole_location);
+            		}else{
 
-	            		}else{
+            		    $('input[name="update_mhAvailable"][value="no"]')
+            		        .prop('checked', true);
+            		               		    
+            		    $('#update_mhSection').hide();
+            		}
+	                
+	                if(response.is_cpipe === 'yes'){
 
-	            		    $('input[name="update_mhAvailable"][value="no"]')
-	            		        .prop('checked', true);
-	            		}
+		                $('input[name="update_cpAvailable"][value="yes"]')
+		                    .prop('checked', true);
 
-	            
-	        
+		                $('#update_cpSection').show();
 
-	            if(response.is_cpipe === 'yes'){
+		                $('#update_cpCount')
+		                    .val(response.cpipe_count);
 
-	                $('input[name="update_cpAvailable"][value="yes"]')
-	                    .prop('checked', true);
+		            }else{
 
-	                $('#update_cpSection').show();
+		                $('input[name="update_cpAvailable"][value="no"]')
+		                    .prop('checked', true);
 
-	                $('#update_cpCount')
-	                    .val(response.cpipe_count);
+		                $('#update_cpSection').hide();
+		            }
 
-	            }else{
 
-	                $('input[name="update_cpAvailable"][value="no"]')
-	                    .prop('checked', true);
+		            
 
-	                $('#update_cpSection').hide();
-	            }
+		            if(response.is_rwh === 'yes'){
 
+		                $('input[name="update_rwAvailable"][value="yes"]')
+		                    .prop('checked', true);
 
-	            
+		                $('#update_rwSection').show();
 
-	            if(response.is_rwh === 'yes'){
+		                $('#update_rwCount')
+		                    .val(response.rwh_count);
 
-	                $('input[name="update_rwAvailable"][value="yes"]')
-	                    .prop('checked', true);
+		            }else{
 
-	                $('#update_rwSection').show();
+		                $('input[name="update_rwAvailable"][value="no"]')
+		                    .prop('checked', true);
 
-	                $('#update_rwCount')
-	                    .val(response.rwh_count);
+		                $('#update_rwSection').hide();
+		            }
+	                
+	                $("#update_swdDependentFields").show();
 
 	            }else{
 
-	                $('input[name="update_rwAvailable"][value="no"]')
-	                    .prop('checked', true);
+	            	$('input[name="update_swdAvailable"][value="' + response.is_swd + '"]').prop('checked', true);
 
-	                $('#update_rwSection').hide();
+	                $("#update_swdSection").hide();
+	                $("#update_swdDependentFields").hide();
 	            }
 	            
-	            
+
 	            if(response.is_electric_poles === 'yes'){
 
 	                $('input[name="update_epAvailable"][value="yes"]')
@@ -1407,13 +1950,18 @@
 	                $('#update_epCount')
 	                    .val(response.ep_count);
 
-	            }else{
+	            }
+	            else if(response.is_electric_poles === 'no'){
 
 	                $('input[name="update_epAvailable"][value="no"]')
 	                    .prop('checked', true);
 
 	                $('#update_epSection').hide();
 	            }
+	            else{
+	            	$('input[name="update_epAvailable"]').prop('checked', false);
+	            	$('#update_epSection').hide();
+	            }
 	            
 	            
 	         // HIGH MASS LIGHT
@@ -1422,11 +1970,22 @@
 
 	                $('input[name="update_hmlAvailable"][value="yes"]')
 	                    .prop('checked', true);
+	                
+	                $('#update_hmlSection').show();
 
-	            }else{
+	                $('#update_hmlCount')
+	                    .val(response.hml_count);
+
+	            }
+	            else if(response.is_hml === 'no'){
 
 	                $('input[name="update_hmlAvailable"][value="no"]')
 	                    .prop('checked', true);
+	                $('#update_hmlSection').hide();
+	            }
+	            else{
+	            	$('input[name="update_hmlAvailable"]').prop('checked', false);
+	            	$('#update_hmlSection').hide();
 	            }
 
 
@@ -1442,13 +2001,69 @@
 	                $('#update_bsCount')
 	                    .val(response.busshelter_count);
 
-	            }else{
+	            }
+	            else if(response.is_busshelter === 'no'){
 
 	                $('input[name="update_bsAvailable"][value="no"]')
 	                    .prop('checked', true);
 
 	                $('#update_bsSection').hide();
 	            }
+	            
+	            else{
+	            	$('input[name="update_bsAvailable"]').prop('checked', false);
+	            	$('#update_bsSection').hide();
+	            }
+
+	            // streetlight poles
+	            if(response.is_streetlight_poles === 'yes'){
+
+	                $('input[name="update_slpAvailable"][value="yes"]')
+	                    .prop('checked', true);
+
+	                $('#update_slpSection').show();
+
+	                $('#update_slpCount')
+	                    .val(response.streetlight_poles_count);
+
+	            }
+	            else if(response.is_streetlight_poles === 'no'){
+
+	                $('input[name="update_slpAvailable"][value="no"]')
+	                    .prop('checked', true);
+
+	                $('#update_slpSection').hide();
+	            }
+	            
+	            else{
+	            	$('input[name="update_slpAvailable"]').prop('checked', false);
+	            	$('#update_slpSection').hide();
+	            }
+	            
+	         // mini mass light
+	            if(response.is_mml === 'yes'){
+
+	                $('input[name="update_mmlAvailable"][value="yes"]')
+	                    .prop('checked', true);
+
+	                $('#update_mmlSection').show();
+
+	                $('#update_mmlCount')
+	                    .val(response.mml_count);
+
+	            }
+	            else if(response.is_mml === 'no'){
+
+	                $('input[name="update_mmlAvailable"][value="no"]')
+	                    .prop('checked', true);
+
+	                $('#update_mmlSection').hide();
+	            }
+	            
+	            else{
+	            	$('input[name="update_mmlAvailable"]').prop('checked', false);
+	            	$('#update_mmlSection').hide();
+	            }
 
 
 	            // CENTER MEDIAN
@@ -1458,17 +2073,15 @@
 	                $('input[name="update_cmAvailable"][value="yes"]')
 	                    .prop('checked', true);
 
-	                /* $('#update_cmSection').show(); */
-
-	                $('#update_cmCount')
-	                    .val(response.cm_count);
-
-	            }else{
+	            }
+	            else if(response.is_centermedian === 'no'){
 
 	                $('input[name="update_cmAvailable"][value="no"]')
 	                    .prop('checked', true);
 
-	                /* $('#update_cmSection').hide(); */
+	            }
+	            else{
+	            	$('input[name="update_cmAvailable"]').prop('checked', false);
 	            }
 	            
 	            
@@ -1479,13 +2092,19 @@
 		        $("#update_sewerSize")
 		            .val(response.sewer_size);
 	
-		        $("#update_noofcb")
-		            .val(response.culvert_bridge_count);
-	
-		        $("#update_detailsofcb")
-		            .val(response.details);
-	            
-	            
+		        if(response.culvert_bridge_count){
+		        	$("#update_noofcb").val(response.culvert_bridge_count);
+		        }
+		        else{
+		        	$("#update_noofcb").val('');
+		        }
+		        
+		        if(response.culvert_bridge_count){
+		        	$("#update_detailsofcb").val(response.details);
+		        }
+		        else{
+		        	$("#update_detailsofcb").val('');
+		        }
 	            
 		        let container = $("#relayingContainer");
 		        container.empty();
@@ -1499,6 +2118,8 @@
 
 		            });
 		        }
+		        
+		        $('#titleModalLabel').text(`Road War Details - ${response.ref_id}`);
 
 	            $("#roadWarModal").modal("show");
 
@@ -1563,37 +2184,56 @@
 	            </option>`;
 	    });
 
+	    let relayRoadMaterialOptions='<option value="">Select Material</option>';
+	    
+	    roadtypeMaterialList.forEach(roadtype => {
+	    	relayRoadMaterialOptions +=`
+	    		<option value = "${roadtype.id}" 
+	    		 ${roadtype.id == item.road_type_material ? 'selected' : ''}>
+	    		 ${roadtype.roadtype_material}
+	    		</option>
+	    	`;
+	    });
+	    
 	    return `
 	        <div class="relay-block border p-3 mb-3">
 
 	            <div class="row">
 
-	                <div class="col-md-3">
-	                    <label>Month</label>
+	                <div class="col-md-2">
+	                    <label>Month of relaying<span class="text-danger">*</span></label>
 
 	                    <select class="form-control relay_month">
 	                        ${monthOptions}
 	                    </select>
 	                </div>
 
-	                <div class="col-md-3">
-	                    <label>Year</label>
+	                <div class="col-md-2">
+	                    <label>Year of relaying<span class="text-danger">*</span></label>
 
 	                    <select class="form-control relay_year">
 	                        ${yearOptions}
 	                    </select>
 	                </div>
+	                
+	                <div class="col-md-2">
+	                    <label>Roadtype Material<span class="text-danger">*</span></label>
+	
+	                    <select class="form-control relay_roadtype_material">
+	                        ${relayRoadMaterialOptions}
+	                    </select>
+                	</div>
 
 	                <div class="col-md-3">
-	                    <label>CR Value</label>
+	                    <label>Completion Report Value (CR)<span class="text-danger">*</span></label>
 
 	                    <input type="text"
-	                           class="form-control cr_value"
+	                           class="form-control cr_value decimal-only"
 	                           value="${item.cr_value || ''}">
 	                </div>
 
 	                <div class="col-md-3">
-	                    <label>Road Type</label>
+	                    <label>Type/subgrade base of the road<span class="text-danger">*</span></label>
 
 	                    <input type="text"
 	                           class="form-control road_type"
@@ -1601,7 +2241,7 @@
 	                </div>
 
 	                <div class="col-md-12 mt-3">
-	                    <label>Remarks</label>
+	                    <label>Remarks Reg.type of relaying<span class="text-danger">*</span></label>
 
 	                    <textarea class="form-control remarks">${item.remarks || ''}</textarea>
 	                </div>
@@ -1626,6 +2266,578 @@
 
 	});
 	
+	function validateRelayingDetails() {
+
+	    let isValid = true;
+
+	    $('.relay-block').each(function(index) {
+
+	        let rowNo = index + 1;
+
+	        let month = $(this).find('.relay_month').val();
+	        let year = $(this).find('.relay_year').val();
+	        let roadtype_material = $(this).find('.relay_roadtype_material').val();
+	        let crValue = $(this).find('.cr_value').val();
+	        let roadType = $(this).find('.road_type').val();
+	        let remarks = $(this).find('.remarks').val();
+
+	        if (!month) {
+
+	            Swal.fire(
+	                'Warning',
+	                'Select Month of Relaying in Set ' + rowNo +' in Relaying Details',
+	                'warning'
+	            );
+
+	            isValid = false;
+	            return false;
+	        }
+
+	        if (!year) {
+
+	            Swal.fire(
+	                'Warning',
+	                'Select Year of Relaying in Set ' + rowNo+' in Relaying Details',
+	                'warning'
+	            );
+
+	            isValid = false;
+	            return false;
+	        }
+	        
+	        if (!roadtype_material) {
+
+	            Swal.fire(
+	                'Warning',
+	                'Select Roadtype material in Set ' + rowNo+' in Relaying Details',
+	                'warning'
+	            );
+
+	            isValid = false;
+	            return false;
+	        }
+
+	        if (!validatePositiveNumber(
+	                crValue,
+	                'CR Value in Set ' + rowNo
+	        )) {
+
+	            isValid = false;
+	            return false;
+	        }
+
+	        if ($.trim(roadType) === '') {
+
+	            Swal.fire(
+	                'Warning',
+	                'Enter Type/Subgrade Base of the Road in Set ' + rowNo+' in Relaying Details',
+	                'warning'
+	            );
+
+	            isValid = false;
+	            return false;
+	        }
+
+	        if ($.trim(remarks) === '') {
+
+	            Swal.fire(
+	                'Warning',
+	                'Enter Remarks in Set ' + rowNo+' in Relaying Details',
+	                'warning'
+	            );
+
+	            isValid = false;
+	            return false;
+	        }
+
+	    });
+
+	    return isValid;
+	}
+	
+	
+	
+	
+	function validatePositiveNumber(value, fieldName) {
+
+	    if (
+	        value === '' ||
+	        value === null ||
+	        Number(value) <= 0
+	    ) {
+
+	        Swal.fire(
+	            'Warning',
+	            fieldName + ' must be valid number or greater than 0',
+	            'warning'
+	        );
+
+	        return false;
+	    }
+
+	    return true;
+	}
+	
+	function getRelayingDetails() {
+
+	    let relays = [];
+
+	    $('.relay-block').each(function () {
+
+	        relays.push({
+
+	            relay_month:
+	                $(this).find('.relay_month').val(),
+
+	            relay_year:
+	                $(this).find('.relay_year').val(),
+	                
+	            road_type_material:
+		            $(this).find('.relay_roadtype_material').val(),
+
+	            cr_value:
+	                $(this).find('.cr_value').val(),
+
+	            road_type:
+	                $(this).find('.road_type').val(),
+
+	            remarks:
+	                $(this).find('.remarks').val()
+
+	        });
+
+	    });
+
+	    return relays;
+	}
+	
+	$('#btnUpdateRoadWar').click(function () {
+		
+		let userId = document.getElementById('userIdSpan').textContent;
+
+	    let refId =
+	        $('#titleModalLabel')
+	        .text()
+	        .replace('Road War Details - ', '')
+	        .trim();
+
+	    if ($('#view_zone').val() === '') {
+	        Swal.fire('Warning','Select Zone','warning');
+	        return;
+	    }
+
+	    if ($('#view_ward').val() === '') {
+	        Swal.fire('Warning','Select Ward','warning');
+	        return;
+	    }
+
+	    if ($('#view_road_name').val() === '') {
+	        Swal.fire('Warning','Select Road','warning');
+	        return;
+	    }
+	    
+	    if ($('#view_road_type').val() === '') {
+	        Swal.fire('Warning','Select Road Type','warning');
+	        return;
+	    }
+	    
+	    if ($('#view_roadtype_material').val() === '') {
+	        Swal.fire('Warning','Select Roadtype Material','warning');
+	        return;
+	    }
+	    	    
+
+	    if (!validatePositiveNumber(
+	            $('#view_road_length').val(),
+	            'Road Length'
+	    )) return;
+
+	    if (!validatePositiveNumber(
+	            $('#view_road_avg_width').val(),
+	            'Road Average Width'
+	    )) return;
+
+	    if (!validatePositiveNumber(
+	            $('#view_road_area').val(),
+	            'Road Area'
+	    )) return;
+	    
+	    
+	    if (!$('input[name="view_fpAvailable"]:checked').length) {
+
+	        Swal.fire(
+	            'Warning',
+	            'Select Footpath Available or not',
+	            'warning'
+	        );
+
+	        return;
+	    }
+	    
+	    let flcount = $('#view_footpath_length').val().trim();
+
+	    if (flcount !== '' &&(isNaN(flcount) ||parseFloat(flcount) <= 0)) 
+	    {
+
+	        Swal.fire(
+	            'Warning',
+	            'Footpath Length must be greater than 0',
+	            'warning'
+	        );
+
+	        return;
+	    }
+	    
+	    let fwcount = $('#view_fpwidth').val().trim();
+
+	    if (fwcount !== '' &&(isNaN(fwcount) ||parseFloat(fwcount) <= 0)) 
+	    {
+
+	        Swal.fire(
+	            'Warning',
+	            'Footpath Width must be greater than 0',
+	            'warning'
+	        );
+
+	        return;
+	    }
+	    
+	    if (!$('input[name="update_swdAvailable"]:checked').length) {
+
+	        Swal.fire(
+	            'Warning',
+	            'Select SWD Available or not',
+	            'warning'
+	        );
+
+	        return;
+	    }
+	    
+	    if($('input[name="update_swdAvailable"]:checked').val() === 'yes'){
+
+ 	       	if ($('#update_fromswd').val() === '') {
+ 		        Swal.fire('Warning','Enter SWD From Location','warning');
+ 		        return;
+ 		    }
+	 	    if ($('#update_toswd').val() === '') {
+			    Swal.fire('Warning','Enter SWD To Location','warning');
+			    return;
+	    	}
+	 	   if (!validatePositiveNumber(
+		            $('#update_swdlength').val(),
+		            'SWD Length'
+		    )) return;
+	 	  if (!validatePositiveNumber(
+		            $('#update_size').val(),
+		            'SWD Size'
+		    )) return;
+	 	  
+	 	 if (!$('input[name="update_scpAvailable"]:checked').length) {
+
+		        Swal.fire(
+		            'Warning',
+		            'Select Slit Catch Pit Available or Not',
+		            'warning'
+		        );
+
+		        return;
+		    }
+	 	 
+	 	if (!$('input[name="update_cpAvailable"]:checked').length) {
+
+	        Swal.fire(
+	            'Warning',
+	            'Select Chut Pipe Available or Not',
+	            'warning'
+	        );
+
+	        return;
+	    }
+	 	if (!$('input[name="update_rwAvailable"]:checked').length) {
+
+	        Swal.fire(
+	            'Warning',
+	            'Select Rain Water Harvesting Available or Not',
+	            'warning'
+	        );
+
+	        return;
+	    }
+	 	if (!$('input[name="update_mhAvailable"]:checked').length) {
+
+	        Swal.fire(
+	            'Warning',
+	            'Select Manhole Available or Not',
+	            'warning'
+	        );
+
+	        return;
+	    }
+	 	   
+	    }
+	    
+	    if($('input[name="update_scpAvailable"]:checked').val() === 'yes'){
+	    	if ($('#update_scpCount').val().trim() === '') {
+		        Swal.fire('Warning','Enter Slit Catch Pit Count','warning');
+		        return;
+		    }
+	    }
+	    
+	    if($('input[name="update_cpAvailable"]:checked').val() === 'yes'){
+	    	if ($('#update_cpCount').val().trim() === '') {
+		        Swal.fire('Warning','Enter Chut Pipe Count','warning');
+		        return;
+		    }
+	    }
+	    
+	    if($('input[name="update_rwAvailable"]:checked').val() === 'yes'){
+	    	if ($('#update_rwCount').val().trim() === '') {
+		        Swal.fire('Warning','Enter Rain Water Harvesting Count','warning');
+		        return;
+		    }
+	    }
+	    
+	    if($('input[name="update_mhAvailable"]:checked').val() === 'yes'){
+	    	if ($('#update_mhCount').val().trim() === '') {
+		        Swal.fire('Warning','Enter Manhole Count','warning');
+		        return;
+		    }
+	    	
+	    	if ($('#update_mhType').val() === '') {
+		        Swal.fire('Warning','Select Manhole location type','warning');
+		        return;
+		    }
+	    }
+	    
+	    if($('input[name="update_epAvailable"]:checked').val() === 'yes'){
+	    	if ($('#update_epCount').val().trim() === '') {
+		        Swal.fire('Warning','Enter Electricity Pole Count','warning');
+		        return;
+		    }
+	    }
+	    
+	    if($('input[name="update_bsAvailable"]:checked').val() === 'yes'){
+	    	if ($('#update_bsCount').val().trim() === '') {
+		        Swal.fire('Warning','Enter Bus Shelter Count','warning');
+		        return;
+		    }
+	    }
+	    
+	    if($('input[name="update_slpAvailable"]:checked').val() === 'yes'){
+	    	if ($('#update_slpCount').val().trim() === '') {
+		        Swal.fire('Warning','Enter Street Light Poles Count','warning');
+		        return;
+		    }
+	    }
+	    
+	    if($('input[name="update_hmlAvailable"]:checked').val() === 'yes'){
+	    	if ($('#update_hmlCount').val().trim() === '') {
+		        Swal.fire('Warning','Enter High Mass Light Count','warning');
+		        return;
+		    }
+	    }
+	    
+	    if($('input[name="update_mmlAvailable"]:checked').val() === 'yes'){
+	    	if ($('#update_mmlCount').val().trim() === '') {
+		        Swal.fire('Warning','Enter Mini Mass Light Count','warning');
+		        return;
+		    }
+	    }
+	    
+	    
+	    let cbCount = $('#update_noofcb').val().trim();
+
+	    if (cbCount !== '' && (!/^[1-9]\d*$/.test(cbCount))) {
+
+	        Swal.fire(
+	            'Warning',
+	            'No. of Culvert/Bridge must be a positive number and should not start with 0',
+	            'warning'
+	        );
+
+	        return;
+	    }
+	    
+	    if (!validateRelayingDetails()) {
+	        return;
+	    }
+
+	    let payload = {
+
+	        ref_id: refId,
+
+	        zone: $('#view_zone').val(),
+
+	        ward: $('#view_ward').val(),
+
+	        road_name: $('#view_road_name option:selected').text(),
+
+	        road_id: $('#view_road_name').val(),
+
+	        road_type: $('#view_road_type').val(),
+	        
+	        road_type_material: $('#view_roadtype_material').val(),
+	        road_length: $('#view_road_length').val(),
+	        road_avg_width:$('#view_road_avg_width').val(),
+	            
+	        road_min_width:$('#view_road_min_width').val()|| null,
+	        road_max_width:$('#view_road_max_width').val()|| null,
+
+	        road_area:$('#view_road_area').val(),
+	        
+	        road_from:$('#view_roadFrom').val()|| null,
+	        road_to:$('#view_roadTo').val()|| null,
+	        
+	        is_footpath:$('input[name="view_fpAvailable"]:checked').val(),
+
+	        footpath_material:$('#view_footpath_material').val()|| null,
+	        footpath_at:$('#view_fpat').val()|| null,
+	        footpath_length:$('#view_footpath_length').val()|| null,
+	        footpath_width:$('#view_fpwidth').val()|| null,
+	        footpath_from_location:$('#view_footPathFrom').val()|| null,
+	        footpath_to_location:$('#view_footPathTo').val()|| null,
+
+	        is_swd:
+	            $('input[name="update_swdAvailable"]:checked').val(),
+
+	        swd_from:
+	            $('#update_fromswd').val()|| null,
+
+	        swd_to:
+	            $('#update_toswd').val()|| null,
+
+	        swd_length:
+	            $('#update_swdlength').val()|| null,
+
+	        swd_size:
+	            $('#update_size').val()|| null,
+
+	        is_scp:
+	            $('input[name="update_scpAvailable"]:checked').val()|| null,
+
+	        scp_count:
+	            $('#update_scpCount').val()|| null,
+
+	        is_manhole:
+	            $('input[name="update_mhAvailable"]:checked').val()|| null,
+
+	        manhole_count:
+	            $('#update_mhCount').val()|| null,
+
+	        manhole_location:
+	            $('#update_mhType').val()|| null,
+
+	        is_cpipe:
+	            $('input[name="update_cpAvailable"]:checked').val()|| null,
+
+	        cpipe_count:
+	            $('#update_cpCount').val()|| null,
+
+	        is_rwh:
+	            $('input[name="update_rwAvailable"]:checked').val()|| null,
+
+	        rwh_count:
+	            $('#update_rwCount').val()|| null,
+
+	        is_electric_poles:
+	            $('input[name="update_epAvailable"]:checked').val()|| null,
+
+	        ep_count:
+	            $('#update_epCount').val()|| null,
+	            
+	        is_streetlight_poles:$('input[name="update_slpAvailable"]:checked').val()|| null,
+	        streetlight_poles_count:$('#update_slpCount').val()|| null,
+
+	        is_hml:$('input[name="update_hmlAvailable"]:checked').val()|| null,
+	        hml_count:$('#update_hmlCount').val()|| null,
+
+	        is_mml:$('input[name="update_mmlAvailable"]:checked').val()|| null,
+	        mml_count:$('#update_mmlCount').val()|| null,	        
+	        
+	        is_busshelter:
+	            $('input[name="update_bsAvailable"]:checked').val()|| null,
+
+	        busshelter_count:
+	            $('#update_bsCount').val()|| null,
+
+	        is_centermedian:
+	            $('input[name="update_cmAvailable"]:checked').val()|| null,
+
+	        sewer_length:
+	            $('#update_sewerLength').val()|| null,
+
+	        sewer_size:
+	            $('#update_sewerSize').val()|| null,
+
+	        culvert_bridge_count:
+	            $('#update_noofcb').val()|| null,
+
+	        details:
+	            $('#update_detailsofcb').val()|| null,
+
+	        updated_by: userId,
+
+	        relaying_details:
+	            getRelayingDetails()
+
+	    };
+
+	    console.log(payload);
+
+	    $.ajax({
+
+	        url:
+	            '/gcc/api/roadwarweb/register/updateRoadWarDetails',
+
+	        type: 'POST',
+
+	        contentType: 'application/json',
+
+	        data: JSON.stringify(payload),
+
+	        beforeSend: function () {
+	            $("#pageLoader").show();
+	        },
+
+	        success: function (response) {
+
+	            if (response.status) {
+
+	                Swal.fire(
+	                    'Success',
+	                    response.message,
+	                    'success'
+	                );
+
+	                $('#roadWarModal').modal('hide');
+
+	                loadRoadWarDetails();
+
+	            } else {
+
+	                Swal.fire(
+	                    'Error',
+	                    response.message,
+	                    'error'
+	                );
+	            }
+	        },
+
+	        error: function () {
+
+	            Swal.fire(
+	                'Error',
+	                'Failed to update record',
+	                'error'
+	            );
+	        },
+
+	        complete: function () {
+	            $("#pageLoader").hide();
+	        }
+	    }); 
+
+	});
 	</script>