updated files

backend/pensioner/controller/DepartmentMainController.java

@@ -1,6 +1,7 @@
 package in.gov.chennaicorporation.gccoffice.pensioner.controller;
 
 import java.util.List;
+
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;

backend/pensioner/controller/FileClosingApiController.java

@@ -1,6 +1,7 @@
 package in.gov.chennaicorporation.gccoffice.pensioner.controller;
 
 import java.util.List;
+
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;

backend/pensioner/controller/FileClosingMainController.java

@@ -1,6 +1,7 @@
 package in.gov.chennaicorporation.gccoffice.pensioner.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
+
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;

backend/pensioner/controller/NewEntryAPIController.java

@@ -1,6 +1,7 @@
 package in.gov.chennaicorporation.gccoffice.pensioner.controller;
 
 import java.time.LocalDate;
+
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 import java.util.HashMap;
@@ -109,7 +110,7 @@ public class NewEntryAPIController {
 	    	    
 	    Map<String, Object> datalist = newEntryService.fetchEmplyeeDetails(formattedFromDate, formattedToDate, deptId);
 	    System.out.println("datalist="+datalist);
-	    List<Map<String, Object>> emps= newEntryService.getRegisteredEmps(deptId,file_category);
+	    List<String> emps= newEntryService.getRegisteredEmps(deptId,file_category);
 	    
 	 // Format the dates for frontend in "yyyy-MM-dd"
 	    DateTimeFormatter frontendFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
@@ -119,9 +120,7 @@ public class NewEntryAPIController {
 	    response.put("toDate", frontendToDate);
 	    
 	 // Extract emp_no values from emps
-	    Set<String> empNos = emps.stream()
-	                             .map(emp -> (String) emp.get("emp_no"))
-	                             .collect(Collectors.toSet());
+	  //  Set<String> empNos = emps.stream().map(emp -> (String) emp.get("emp_no")).collect(Collectors.toSet());
 
 	    //System.out.println("rrrrrrrrrrrr");
 	    if (datalist.containsKey("list") && datalist.get("list") instanceof List) {
@@ -135,7 +134,7 @@ public class NewEntryAPIController {
 		    	//System.out.println("ttttttttttttt");
 		        // Filter the datalist "list" to exclude matching EMPLOYEE_CODE values
 		        List<Map<String, Object>> filteredList = ((List<Map<String, Object>>) datalist.get("list")).stream()
-		                .filter(employee -> !empNos.contains(employee.get("EMPLOYEE_CODE")))
+		                .filter(employee -> !emps.contains(employee.get("EMPLOYEE_CODE")))
 		                .collect(Collectors.toList());
 
 		        if (filteredList.isEmpty()) {

backend/pensioner/controller/PendencyAutoConversionApiController.java

@@ -1,6 +1,8 @@
 package in.gov.chennaicorporation.gccoffice.pensioner.controller;
 
 import java.time.LocalDate;
+
+
 import java.time.Period;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;

backend/pensioner/controller/PensionerMainController.java

@@ -1,6 +1,7 @@
 package in.gov.chennaicorporation.gccoffice.pensioner.controller;
 
 import java.util.List;
+
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;

backend/pensioner/scheduler/PendencyAutoConversionScheduler.java

@@ -13,6 +13,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import in.gov.chennaicorporation.gccoffice.pensioner.service.PendencyAutoConversionService;
+import in.gov.chennaicorporation.gccoffice.pensioner.service.ReceivedDeptProvisionalService;
 
 @Component
 public class PendencyAutoConversionScheduler {
@@ -21,6 +22,9 @@ public class PendencyAutoConversionScheduler {
 	 @Autowired
 	    private PendencyAutoConversionService pendencyAutoConversionService;
 	    
+	    @Autowired
+		public ReceivedDeptProvisionalService ReceivedDeptProvisionalservice;
+
 	    /**
 	     * Scheduled method that runs every 60 seconds to process auto-conversion tasks.
 	     */
@@ -88,6 +92,45 @@ public class PendencyAutoConversionScheduler {
 
 	        List<Map<String, Object>> details = pendencyAutoConversionService.getPendencyUpdatingDuration();
 	        
+	        List<Map<String, Object>> prdetails = pendencyAutoConversionService.getProvisionalNoPendingDuration();
+	        if(!prdetails.isEmpty()) {
+	        	
+	        	for (Map<String, Object> prdetail : prdetails) {
+	        		String tempId1 = prdetail.get("temp_id") != null ? String.valueOf(prdetail.get("temp_id")) : null;
+	                String retirementDateStr1 = prdetail.get("retirement_date") != null ? String.valueOf(prdetail.get("retirement_date")) : null;
+	                
+	                try {
+	                    // Convert retirement_date to LocalDate
+	                    DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+	                    LocalDate startDate1 = LocalDate.parse(retirementDateStr1, formatter);
+	                    LocalDate endDate1 = LocalDate.now();
+	                    
+	                    System.out.printf("Processing Temp ID: %s | Start Date: %s | End Date: %s%n", tempId1, startDate1, endDate1);
+	                    
+	                    String updateDuration1 = pendencyAutoConversionService.calculatePendingDuration(startDate1, endDate1);
+	                    System.out.println("Updated Duration: " + updateDuration1);
+	                    
+	                    boolean isUpdated1 = pendencyAutoConversionService.updatePendingDurationforPR(updateDuration1, tempId1);
+	                    
+	                    if (isUpdated1) {
+	                        successfulUpdates.add(tempId1);
+	                        String filemovedby=pendencyAutoConversionService.getFileMovedByTempId(tempId1);
+	                        List<Map<String, Object>> empDetails=pendencyAutoConversionService.fetchEmployeeDetails(tempId1);
+	                        boolean historySaved = ReceivedDeptProvisionalservice.savehistory(empDetails, filemovedby);
+	                        if (!historySaved) {
+	                            System.out.println("Failed to save prno history for tempId: " + tempId1);
+	                        }
+	                    } else {
+	                        failedUpdates.add(tempId1);
+	                    }
+
+	                }
+	                catch (Exception e) {
+	                    System.err.println("Error parsing retirement_date for tempId " + tempId1 + ": " + e.getMessage());
+	                }
+	        	}
+	        	
+	        }
 	        if(!details.isEmpty()) {
 
 	        for (Map<String, Object> tempIdMap : details) {
@@ -97,7 +140,7 @@ public class PendencyAutoConversionScheduler {
 	         // Corrected parsing for file_category
 	            int fileCat = tempIdMap.get("file_category") != null ? Integer.parseInt(tempIdMap.get("file_category").toString()) : null;
 	            
-            if(fileCat==3) {
+	            if(fileCat==3 || fileCat==5) {
 	            	
 	            	if (retirementDateStr != null && !retirementDateStr.trim().isEmpty()) {
 	                    try {
@@ -164,9 +207,6 @@ public class PendencyAutoConversionScheduler {
 	                }
 	            }
 	                       
-            
-            
-            
 	        }
 	        response.put("status", "Success");
 	        response.put("message", "Pendency duration updated");

backend/pensioner/service/DepartmentReceivedService.java

@@ -159,7 +159,7 @@ public class DepartmentReceivedService {
 		
     	// Define the SQL query
 		String sql = "SELECT CASE " +
-                     "WHEN gpf = 'yes' AND spfgs = 'yes' AND private_affairs = 'yes' AND dcrg = 'yes' THEN true " +
+                "WHEN (gpf = 'yes' OR gpf = '90') AND spfgs = 'yes' AND private_affairs = 'yes' AND dcrg = 'yes' THEN true " +
                 "ELSE false END AS allYes " +
                 "FROM zone_benefits " +
                 "WHERE temp_id = ?";

backend/pensioner/service/DeptPartiallyCompService.java

@@ -315,7 +315,7 @@ public class DeptPartiallyCompService {
     	// Define the SQL query
         String sql = "SELECT \r\n"
         		+ "    CASE \r\n"
-        		+ "        WHEN zb.gpf = 'yes'  AND zb.spfgs = 'yes' AND zb.private_affairs = 'yes' AND zb.dcrg = 'yes' \r\n"
+        		+ "       WHEN (zb.gpf = 'yes' OR zb.gpf = '90') AND zb.spfgs = 'yes' AND zb.private_affairs = 'yes' AND zb.dcrg = 'yes' \r\n"
         		+ "         AND pb.benefit_pension = 'yes' AND pb.benefit_dcrg = 'yes'  THEN 1  ELSE 0  \r\n"
         		+ "    END AS allYes \r\n"
         		+ "FROM zone_benefits AS zb\r\n"
@@ -342,7 +342,7 @@ public class DeptPartiallyCompService {
     	// Define the SQL query
         String sql = "SELECT \r\n"
         		+ "    CASE \r\n"
-        		+ "    WHEN zb.gpf = 'yes'  AND zb.spfgs = 'yes' AND zb.private_affairs = 'yes' AND zb.dcrg = 'yes' \r\n"
+        		+ "    WHEN (zb.gpf = 'yes' OR zb.gpf = '90')  AND zb.spfgs = 'yes' AND zb.private_affairs = 'yes' AND zb.dcrg = 'yes' \r\n"
         		+ "    THEN 1  ELSE 0  \r\n"
         		+ "    END AS allYes\r\n"
         		+ "FROM zone_benefits AS zb\r\n"        		

backend/pensioner/service/FileClosingService.java

@@ -23,6 +23,8 @@ public class FileClosingService {
 	@Autowired
 	private JdbcTemplate jdbcTemplate;
 	
+	
+	
 	 private RestTemplate restTemplate;
 	    private ObjectMapper objectMapper;
 	    @Autowired
@@ -48,7 +50,7 @@ public class FileClosingService {
 		  
 		  String sql = "SELECT * " +                 
                   "FROM pensioner_details pd " +
-                  "where pd.file_category=1 and pd.file_status < 11 and pd.temp_id = ? and pd.is_closed=0 " ;
+                  "where pd.file_category=1 and pd.file_status <= 8 and pd.temp_id = ? and pd.is_closed=0 " ;
         
 
 			System.out.println("outside");
@@ -104,11 +106,14 @@ public class FileClosingService {
 		
           
           int deptId = Integer.parseInt(dept_Id);
-          int filestatus=12;
-          
+          int filestatus=getFileStatus.getFileStatus12Id();
+          if (filestatus == 0) {
+              System.out.println("File status not found. Aborting insertion.");
+              return false;
+          } 
           // Update file_status in pensioner_details
-          String updateQuery = "update pensioner_details set service_death=?,file_moved_date=?,remarks=?,updated_date= CURRENT_TIMESTAMP,is_closed=1 WHERE temp_id = ? LIMIT 1";
-          int rowsUpdated = jdbcTemplate.update(updateQuery,serviceDeath,dateToAudit, remarks,tempId);
+          String updateQuery = "update pensioner_details set file_status=?,service_death=?,file_moved_date=?,remarks=?,updated_date= CURRENT_TIMESTAMP,is_closed=1 WHERE temp_id = ? LIMIT 1";
+          int rowsUpdated = jdbcTemplate.update(updateQuery,filestatus,serviceDeath,dateToAudit, remarks,tempId);
           
           
           System.out.println("Rows inserted in pd:"+rowsUpdated);
@@ -177,11 +182,9 @@ public class FileClosingService {
 	  
 	  	public List<Map<String, Object>> fetchClosingEmployee() {		  
 		  
-		  System.out.println("inside");
-		  
 		  String sql = "SELECT * " +                 
                   "FROM pensioner_details pd " +
-                  "where pd.file_category=1 and pd.file_status < 11 and pd.is_closed=1 ";
+                  "where pd.file_category=1 and pd.is_closed=1 ";
         
 			  
 	    	return jdbcTemplate.queryForList(sql);

backend/pensioner/service/NewEntryService.java

@@ -1,6 +1,7 @@
 package in.gov.chennaicorporation.gccoffice.pensioner.service;
 
 import java.text.ParseException;
+
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -427,20 +428,15 @@ public class NewEntryService {
         }
 
     
-	public List<Map<String, Object>> getRegisteredEmps(Integer deptId,Integer file_category) {
-		String query="select distinct emp_no from pensioner_details where dept_id=?";
+    public List<String> getRegisteredEmps(Integer deptId, Integer file_category) {
+        String query = "SELECT DISTINCT emp_no FROM pensioner_details WHERE dept_id=? " +
+                       "UNION ALL " +
+                       "SELECT DISTINCT emp_no FROM cps_pensioner_details WHERE dept_id=?";
         
-		List<Map<String, Object>>emps= jdbcTemplate.queryForList(query,deptId);
+        List<String> emps = jdbcTemplate.queryForList(query, String.class, deptId, deptId);
         System.out.println("emps====" + emps);
-		if(emps.isEmpty())
-		{
-			return Collections.emptyList();
-		}
-		else
-		{
-			return emps;
-		}
 
+        return emps; 
     }
 	
 	public Integer getRetirementFileCategoryId() {
@@ -841,7 +837,7 @@ public class NewEntryService {
 	    
 	  public boolean doesEmployeeExistRPR(String empCode) {
 	        String sql = "SELECT COUNT(*) FROM ( " +
-	                     "  SELECT emp_no FROM pensioner_details WHERE emp_no = ? AND file_category IN (1,2,3,4,5,6) " +
+	                     "  SELECT emp_no FROM pensioner_details WHERE emp_no = ? AND file_category IN (1,2,3,4,5) " +
 	                     "  UNION ALL " +
 	                     "  SELECT emp_no FROM cps_pensioner_details WHERE emp_no = ? AND file_category IN (6) " +
 	                     ") AS combined";
@@ -851,15 +847,59 @@ public class NewEntryService {
 	    }
 	    
 	    
+//	    public boolean doesEmployeeExist(String empCode) {
+//	    	
+//	        String sql = "SELECT COUNT(*) FROM ( " +
+//	                     "  SELECT emp_no  FROM pensioner_details WHERE emp_no = ? AND file_category IN (1,3,5) "+
+//	                    		 "  UNION ALL " +
+//	    	                     "  SELECT emp_no FROM cps_pensioner_details WHERE emp_no = ? AND file_category IN (6) " +
+//	    	                     ") AS combined";
+//	        // Note: Pass empCode twice since there are two placeholders.
+//	        Integer count = jdbcTemplate.queryForObject(sql,Integer.class,empCode,empCode);
+//	        System.out.println("count<<<<<<<<<<<"+count);
+//	        return count != null && count > 0;
+//	    }
+//	    
+//	    
+//	    public boolean doesEmployeeExistgis(String empCode) {
+//	        String sql = "SELECT COUNT(*) FROM ( " +
+//	                     "  SELECT emp_no FROM pensioner_details WHERE emp_no = ? AND file_category IN (1,2,3,5,6) " +
+//	                     "  UNION ALL " +
+//	                     "  SELECT emp_no FROM cps_pensioner_details WHERE emp_no = ? AND file_category IN (6) " +
+//	                     ") AS combined";
+//	        // Note: Pass empCode twice since there are two placeholders.
+//	        Integer count = jdbcTemplate.queryForObject(sql, Integer.class,empCode,empCode);
+//	        return count != null && count > 0;
+//	    }
+//	    
+//	    
+//        public boolean doesEmployeeExistfp(String empCode) {
+//	    	
+//	        String sql = "SELECT COUNT(*) FROM ( " +
+//	        
+//	                     "  SELECT emp_no FROM pensioner_details WHERE emp_no = ? AND file_category IN (1,2,3,5) AND is_closed IN (0)" +
+//	                     "  UNION ALL " +
+//	                     
+//	                     "  SELECT emp_no FROM cps_pensioner_details WHERE emp_no = ? AND file_category IN (6) " +
+//	                     ") AS combined";
+//	        
+//	        // Note: Pass empCode twice since there are two placeholders.
+//	        Integer count = jdbcTemplate.queryForObject(sql, Integer.class,empCode,empCode);
+//	        return count != null && count > 0;
+//	    }
+	    
+	  
 	  public boolean doesEmployeeExist(String empCode) {
 	    	
 	        String sql = "SELECT COUNT(*) FROM ( " +
-	                     "  SELECT emp_no  FROM pensioner_details WHERE emp_no = ? AND file_category IN (1,3,5) "+
+	                     "  SELECT emp_no  FROM pensioner_details WHERE emp_no = ? AND file_category IN (3,4,5) "+
+	                    		 "  UNION ALL " +
+	                    		 "  SELECT emp_no  FROM pensioner_details WHERE emp_no = ? AND file_category IN (1) AND is_closed=0 "+
 	                    		 "  UNION ALL " +
 	    	                     "  SELECT emp_no FROM cps_pensioner_details WHERE emp_no = ? AND file_category IN (6) " +
 	    	                     ") AS combined";
 	        // Note: Pass empCode twice since there are two placeholders.
-	        Integer count = jdbcTemplate.queryForObject(sql,Integer.class,empCode,empCode);
+	        Integer count = jdbcTemplate.queryForObject(sql,Integer.class,empCode,empCode,empCode);
 	        System.out.println("count<<<<<<<<<<<"+count);
 	        return count != null && count > 0;
 	    }
@@ -867,7 +907,7 @@ public class NewEntryService {
 	    
 	    public boolean doesEmployeeExistgis(String empCode) {
 	        String sql = "SELECT COUNT(*) FROM ( " +
-	                     "  SELECT emp_no FROM pensioner_details WHERE emp_no = ? AND file_category IN (1,2,3,5,6) " +
+	                     "  SELECT emp_no FROM pensioner_details WHERE emp_no = ? AND file_category IN (1,2,3,5) " +
 	                     "  UNION ALL " +
 	                     "  SELECT emp_no FROM cps_pensioner_details WHERE emp_no = ? AND file_category IN (6) " +
 	                     ") AS combined";
@@ -892,5 +932,4 @@ public class NewEntryService {
 	        return count != null && count > 0;
 	    }
 
-
 }

backend/pensioner/service/PendencyAutoConversionService.java

@@ -107,7 +107,7 @@ public class PendencyAutoConversionService {
 	            String remarks = "Auto_Conversion";
 	            int fileCategory = 3;
 	            String pendingDuration = "yes";
-            String reasonForPending = "Retirement Date Crossed while file in Auditing";
+	            String reasonForPending = "Retirement Date Crossed while file in Processing";
 
 	            String updateQuery = "UPDATE pensioner_details SET reason_for_pending=?, pending_duration=?, file_category=?, file_moved_date=?, remarks=?, updated_date=CURRENT_TIMESTAMP WHERE temp_id=?";
 	            int rowsUpdated = jdbcTemplate.update(updateQuery, reasonForPending, pendingDuration, fileCategory, formattedDate, remarks, tempId);
@@ -120,14 +120,14 @@ public class PendencyAutoConversionService {
 	        }
 	    }
 
-    private List<Map<String, Object>> fetchEmployeeDetails(String tempId) {
+	    public List<Map<String, Object>> fetchEmployeeDetails(String tempId) {
 	        String sql = "SELECT * FROM pensioner_details WHERE temp_id=?";
 	        return jdbcTemplate.queryForList(sql, tempId);
 	    }
 
 	    
 	    @Transactional
-    private boolean saveHistory(List<Map<String, Object>> empDetails, String fileMovedBy) {
+	    public boolean saveHistory(List<Map<String, Object>> empDetails, String fileMovedBy) {
 	        try {
 	            String empInsertQuery = "INSERT INTO pensioner_details_history (emp_no, emp_name, dept_name, designation, type_of_retirement, " +
 	                    "retirement_date, retirement_class, file_moved_date, remarks, file_category, file_status, " +
@@ -174,8 +174,8 @@ public class PendencyAutoConversionService {
 	        }
 	    }
 
-    private String getFileMovedByTempId(String tempId) {
-        String sql = "SELECT file_moved_by FROM pensioner_details_history WHERE temp_id=? ORDER BY created_date ASC LIMIT 1";
+	    public String getFileMovedByTempId(String tempId) {
+	        String sql = "SELECT file_moved_by FROM pensioner_details_history WHERE temp_id=? ORDER BY created_date DESC LIMIT 1";
 	        return jdbcTemplate.queryForObject(sql, String.class, tempId);
 	    }
 
@@ -223,13 +223,22 @@ public class PendencyAutoConversionService {
 		
 		public List<Map<String, Object>> getPendencyUpdatingDuration(){
 			
-		String sqlQuery = "SELECT * FROM pensioner_details WHERE file_category IN (2,3) AND pending_duration='yes' AND file_status < 11";
+			String sqlQuery = "SELECT * FROM pensioner_details WHERE file_category IN (2,3,5) AND (pending_duration = 'yes' OR pending_duration = 'Yes') AND file_status < 11";
 		    List<Map<String, Object>> details = jdbcTemplate.queryForList(sqlQuery);
 		    
 		    return details;
 	    
 		}
 		
+		public List<Map<String, Object>> getProvisionalNoPendingDuration(){
+			
+			String sqlQuery = "SELECT * FROM pensioner_details WHERE file_category IN (5) AND (pending_duration = 'no' OR pending_duration = 'No') AND file_status < 11 AND retirement_date < curdate()";
+		    List<Map<String, Object>> prdetails = jdbcTemplate.queryForList(sqlQuery);
+		    
+		    return prdetails;
+	    
+		}
+		
 		public String calculatePendingDuration(LocalDate startDate, LocalDate endDate) {
 	        Period period = Period.between(startDate, endDate);
 
@@ -253,6 +262,13 @@ public class PendencyAutoConversionService {
 	        return rowsUpdated > 0;
 	    }
 	    
+	    public boolean updatePendingDurationforPR(String updateDuration1, String tempId1) {
+	        String sqlQuery = "UPDATE pensioner_details SET pending_duration='Yes',reason_for_pending=? WHERE temp_id=?";
+	        int rowsUpdated = jdbcTemplate.update(sqlQuery, updateDuration1, tempId1);
+	        System.out.println("Updating for PR No Temp ID: " + tempId1 + " | Rows Updated: " + rowsUpdated);
+	        return rowsUpdated > 0;
+	    }
+
 	    // New method to get the count of pending pensioners
 	    public int getPendingPensionersCount() {
 	        String sqlQuery = "SELECT COUNT(*) FROM pensioner_details WHERE file_category=3 AND pending_duration='yes' AND file_status < 11";

backend/pensioner/service/ReportApiService.java

@@ -230,6 +230,102 @@ public class ReportApiService {
 	 
 	 
 
+//	 public List<Map<String, Object>> getReportDatapension(String startDate, String endDate, String fileCategoryId) {
+//		    String sql = "SELECT dm.dept_id, " +
+//		                 "       dm.dept_name AS dept_name,  " +
+//
+//		                 // Audit Pending Count
+//		                 "       (SELECT COUNT(*) FROM pensioner_details pd " +
+//		                 "        WHERE pd.file_status IN (1,3) AND pd.dept_id = dm.dept_id " +
+//		                 "        AND pd.is_closed = 0 " +  // Added condition
+//		                 "        AND ( ? IS NULL OR pd.file_category = ? ) " +
+//		                 "        AND DATE(pd.created_date) BETWEEN DATE(?) AND DATE(?)) AS audit_pending, " +
+//
+//		                 // Department Pending Count
+//		                 "       (SELECT COUNT(*) FROM pensioner_details pd " +
+//		                 "        WHERE pd.file_status IN (2,5,6,9) AND pd.dept_id = dm.dept_id " +
+//		                 "        AND pd.is_closed = 0 " +  // Added condition
+//		                 "        AND ( ? IS NULL OR pd.file_category = ? ) " +
+//		                 "        AND DATE(pd.created_date) BETWEEN DATE(?) AND DATE(?))  AS department_pending, " +
+//
+//		                 // Pension Pending Count
+//		                 "       (SELECT COUNT(*) FROM pensioner_details pd " +
+//		                 "        WHERE pd.file_status IN (4,7,8,10) AND pd.dept_id = dm.dept_id " +
+//		                 "        AND pd.is_closed = 0 " +  // Added condition
+//		                 "        AND ( ? IS NULL OR pd.file_category = ? ) " +
+//		                 "        AND DATE(pd.created_date) BETWEEN DATE(?) AND DATE(?)) AS pension_pending, " +
+//
+//		                 // Completed Count
+//		                 "       (SELECT COUNT(*) FROM pensioner_details pd " +
+//		                 "        WHERE pd.file_status = 11 AND pd.dept_id = dm.dept_id " +
+//		                 "        AND pd.is_closed = 0 " +  // Added condition
+//		                 "        AND ( ? IS NULL OR pd.file_category = ? ) " +
+//		                 "        AND DATE(pd.created_date) BETWEEN DATE(?) AND DATE(?)) " +
+//		                 "        + " +
+//		                 "       (SELECT COUNT(*) FROM cps_pensioner_details cps " +
+//		                 "        WHERE cps.file_status = 11 AND cps.dept_id = dm.dept_id " +		               
+//		                 "        AND ( ? IS NULL OR cps.file_category = ? ) " +
+//		                 "        AND DATE(cps.created_date) BETWEEN DATE(?) AND DATE(?)) AS completed, " +
+//
+//		                 // Total Files Count
+//		                 "       (SELECT COUNT(*) pensioner_details pd " +
+//		                 "        WHERE pd.dept_id = dm.dept_id " +
+//		                 "        AND pd.is_closed = 0 " +  // Added condition
+//		                 "        AND ( ? IS NULL OR pd.file_category = ? ) " +
+//		                 "        AND DATE(pd.created_date) BETWEEN DATE(?) AND DATE(?)) " +
+//		                 "        + " +
+//		                 "       (SELECT COUNT(*) FROM cps_pensioner_details cps " +
+//		                 "        WHERE cps.dept_id = dm.dept_id " +
+//		                 "        AND ( ? IS NULL OR cps.file_category = ? ) " +
+//		                 "        AND DATE(cps.created_date) BETWEEN DATE(?) AND DATE(?)) AS total_files " +
+//
+//		                 "FROM department_master dm " +
+//		                 "ORDER BY dm.dept_id";
+//
+//		    System.out.println("Executing SQL: " + sql);
+//
+//		    List<Object> params = new ArrayList<>();
+//
+//		    // Adding parameters explicitly without a loop
+//		    params.add(fileCategoryId != null && !fileCategoryId.isEmpty() ? fileCategoryId : null); 
+//		    params.add(fileCategoryId);
+//		    params.add(startDate);
+//		    params.add(endDate);
+//
+//		    params.add(fileCategoryId != null && !fileCategoryId.isEmpty() ? fileCategoryId : null); 
+//		    params.add(fileCategoryId);
+//		    params.add(startDate);
+//		    params.add(endDate);
+//
+//		    params.add(fileCategoryId != null && !fileCategoryId.isEmpty() ? fileCategoryId : null); 
+//		    params.add(fileCategoryId);
+//		    params.add(startDate);
+//		    params.add(endDate);
+//
+//		    params.add(fileCategoryId != null && !fileCategoryId.isEmpty() ? fileCategoryId : null); 
+//		    params.add(fileCategoryId);
+//		    params.add(startDate);
+//		    params.add(endDate);
+//
+//		    params.add(fileCategoryId != null && !fileCategoryId.isEmpty() ? fileCategoryId : null); 
+//		    params.add(fileCategoryId);
+//		    params.add(startDate);
+//		    params.add(endDate);
+//
+//		    params.add(fileCategoryId != null && !fileCategoryId.isEmpty() ? fileCategoryId : null); 
+//		    params.add(fileCategoryId);
+//		    params.add(startDate);
+//		    params.add(endDate);
+//
+//		    params.add(fileCategoryId != null && !fileCategoryId.isEmpty() ? fileCategoryId : null); 
+//		    params.add(fileCategoryId);
+//		    params.add(startDate);
+//		    params.add(endDate);
+//
+//		    return jdbcTemplate.queryForList(sql, params.toArray());
+//		}
+	 
+	 
 	 public List<Map<String, Object>> getReportDatapension(String startDate, String endDate, String fileCategoryId) {
 		    String sql = "SELECT dm.dept_id, " +
 		                 "       dm.dept_name AS dept_name, " +
@@ -237,28 +333,28 @@ public class ReportApiService {
 		                 // Audit Pending Count
 		                 "       (SELECT COUNT(*) FROM pensioner_details pd " +
 		                 "        WHERE pd.file_status IN (1,3) AND pd.dept_id = dm.dept_id " +
-		                 "        AND pd.is_closed = 0 " +  // Added condition
+		                 "        AND pd.is_closed = 0 " +
 		                 "        AND ( ? IS NULL OR pd.file_category = ? ) " +
 		                 "        AND DATE(pd.created_date) BETWEEN DATE(?) AND DATE(?)) AS audit_pending, " +
 
 		                 // Department Pending Count
 		                 "       (SELECT COUNT(*) FROM pensioner_details pd " +
 		                 "        WHERE pd.file_status IN (2,5,6,9) AND pd.dept_id = dm.dept_id " +
-		                 "        AND pd.is_closed = 0 " +  // Added condition
+		                 "        AND pd.is_closed = 0 " +
 		                 "        AND ( ? IS NULL OR pd.file_category = ? ) " +
 		                 "        AND DATE(pd.created_date) BETWEEN DATE(?) AND DATE(?))  AS department_pending, " +
 
 		                 // Pension Pending Count
 		                 "       (SELECT COUNT(*) FROM pensioner_details pd " +
 		                 "        WHERE pd.file_status IN (4,7,8,10) AND pd.dept_id = dm.dept_id " +
-		                 "        AND pd.is_closed = 0 " +  // Added condition
+		                 "        AND pd.is_closed = 0 " +
 		                 "        AND ( ? IS NULL OR pd.file_category = ? ) " +
 		                 "        AND DATE(pd.created_date) BETWEEN DATE(?) AND DATE(?)) AS pension_pending, " +
 
 		                 // Completed Count
 		                 "       (SELECT COUNT(*) FROM pensioner_details pd " +
 		                 "        WHERE pd.file_status = 11 AND pd.dept_id = dm.dept_id " +
-		                 "        AND pd.is_closed = 0 " +  // Added condition
+		                 "        AND pd.is_closed = 0 " +
 		                 "        AND ( ? IS NULL OR pd.file_category = ? ) " +
 		                 "        AND DATE(pd.created_date) BETWEEN DATE(?) AND DATE(?)) " +
 		                 "        + " +
@@ -268,9 +364,9 @@ public class ReportApiService {
 		                 "        AND DATE(cps.created_date) BETWEEN DATE(?) AND DATE(?)) AS completed, " +
 
 		                 // Total Files Count
-		                 "       (SELECT COUNT(*) pensioner_details pd " +
+		                 "       (SELECT COUNT(*) FROM pensioner_details pd " + // Fixed Syntax
 		                 "        WHERE pd.dept_id = dm.dept_id " +
-		                 "        AND pd.is_closed = 0 " +  // Added condition
+		                 "        AND pd.is_closed = 0 " +
 		                 "        AND ( ? IS NULL OR pd.file_category = ? ) " +
 		                 "        AND DATE(pd.created_date) BETWEEN DATE(?) AND DATE(?)) " +
 		                 "        + " +
@@ -286,46 +382,18 @@ public class ReportApiService {
 
 		    List<Object> params = new ArrayList<>();
 
-		    // Adding parameters explicitly without a loop
-		    params.add(fileCategoryId != null && !fileCategoryId.isEmpty() ? fileCategoryId : null); 
-		    params.add(fileCategoryId);
-		    params.add(startDate);
-		    params.add(endDate);
-
-		    params.add(fileCategoryId != null && !fileCategoryId.isEmpty() ? fileCategoryId : null); 
-		    params.add(fileCategoryId);
-		    params.add(startDate);
-		    params.add(endDate);
-
-		    params.add(fileCategoryId != null && !fileCategoryId.isEmpty() ? fileCategoryId : null); 
-		    params.add(fileCategoryId);
-		    params.add(startDate);
-		    params.add(endDate);
-
-		    params.add(fileCategoryId != null && !fileCategoryId.isEmpty() ? fileCategoryId : null); 
-		    params.add(fileCategoryId);
-		    params.add(startDate);
-		    params.add(endDate);
-
-		    params.add(fileCategoryId != null && !fileCategoryId.isEmpty() ? fileCategoryId : null); 
-		    params.add(fileCategoryId);
-		    params.add(startDate);
-		    params.add(endDate);
-
-		    params.add(fileCategoryId != null && !fileCategoryId.isEmpty() ? fileCategoryId : null); 
-		    params.add(fileCategoryId);
-		    params.add(startDate);
-		    params.add(endDate);
-
+		    for (int i = 0; i < 7; i++) {
 		        params.add(fileCategoryId != null && !fileCategoryId.isEmpty() ? fileCategoryId : null); 
 		        params.add(fileCategoryId);
 		        params.add(startDate);
 		        params.add(endDate);
+		    }
 
 		    return jdbcTemplate.queryForList(sql, params.toArray());
 		}
 
 
+	 
 //		 public List<Map<String, Object>> getReportDetailspension(String startDate, String endDate, List<String> deptIds, Integer fileCatId, List<String> fileStatus) {
 //			    String sql = "";
 //			    List<Object> params = new ArrayList<>();

frontend/pensioner/department/audit/familypension.html

@@ -93,7 +93,7 @@
     cursor: pointer; /* Change cursor to hand symbol */
 }
 
-#returnretrieddetailsModal .modal-body{
+#returnfamilypensiondetailsModal .modal-body{
 	max-height:80vh;
 	overflow-y:auto; 
 }
@@ -275,7 +275,7 @@ margin-top: 10px;
 							<!--  Modal Box -->   
 	 
 			<div class="modal fade" id="returnfamilypensiondetailsModal" tabindex="-1" role="dialog" aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-			    <div class="modal-dialog modal-xl"  role="document">
+			    <div class="modal-dialog modal-lg"  role="document">
 			        <div class="modal-content">
 			            <div class="modal-header">
 			                <h5 class="modal-title" id="detailsModalLabel">
@@ -340,7 +340,8 @@ margin-top: 10px;
 			                    <!-- While in Service Death -->
 			                    <div class="col-md-6">
 			                        <label for="servicedeath" class="form-label fw-bold">While in Service Death  </label>
-			                        <input type="text" id="servicedeath" class="form-control" readonly>
+			                       <!--  <input type="text" id="servicedeath" class="form-control" readonly> -->
+			                         <input type="date" id="servicedeath"  class="form-control" readonly>
 			                    </div>
 			                    
 			                     <!-- Relationship of Deceased -->
@@ -364,7 +365,7 @@ margin-top: 10px;
 			                    <!-- Remarks -->
 			                    <div class="col-md-12">
 			                        <label for="remarks_modal" class="form-label fw-bold">Comments/Remarks  </label>
-			                        <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea>
+			                        <textarea id="remarks_modal" class="form-control" rows="4" readonly></textarea>
 			                    </div>
 			                    
 			                    
@@ -393,7 +394,7 @@ margin-top: 10px;
 					                    
 					            <div class="col-md-12">
 					                        <label for="remarks" class="form-label fw-bold">Comments/Remarks<span class="text-danger">*</span></label>
-					                        <textarea id="remarks" class="form-control"  rows="4" placeholder="Enter your remarks here"></textarea>
+					                        <textarea id="remarks" class="form-control"  rows="4" ></textarea>
 					               </div>
 					               
 					               
@@ -475,7 +476,7 @@ margin-top: 10px;
         
         // Set the value of the input field to the current date (in DD-MM-YYYY format for display)
         document.getElementById("datefile").value = formattedDateDisplay;
-
+        document.getElementById("servicedeath").value = formattedDateDisplay;
 
     });
   

frontend/pensioner/department/audit/pendency.html

@@ -93,7 +93,7 @@
     cursor: pointer; /* Change cursor to hand symbol */
 }
 
-#returnretrieddetailsModal .modal-body{
+#returnpendencydetailsModal .modal-body{
 	max-height:80vh;
 	overflow-y:auto; 
 }
@@ -270,7 +270,7 @@ margin-top: 10px;
 							<!--  Modal Box -->   
 	 
 			<div class="modal fade" id="returnpendencydetailsModal" tabindex="-1" role="dialog" aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-			    <div class="modal-dialog modal-xl"  role="document">
+			    <div class="modal-dialog modal-lg"  role="document">
 			        <div class="modal-content">
 			            <div class="modal-header">
 			                <h5 class="modal-title" id="detailsModalLabel">
@@ -356,7 +356,7 @@ margin-top: 10px;
 			                    <!-- Remarks -->
 			                    <div class="col-md-12">
 			                        <label for="remarks_modal" class="form-label fw-bold">Comments/Remarks</label>
-			                        <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea>
+			                        <textarea id="remarks_modal" class="form-control" rows="4" readonly></textarea>
 			                    </div>
 			                    
 			                    

frontend/pensioner/department/audit/retirement.html

@@ -275,7 +275,7 @@ margin-top: 10px;
 			                    <!-- Remarks -->
 			                    <div class="col-md-12">
 			                        <label for="remarks_modal" class="form-label fw-bold">Comments/Remarks  <span class="text-danger">*</span></label>
-			                        <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea>
+			                        <textarea id="remarks_modal" class="form-control" rows="4"  readonly></textarea>
 			                    </div>
 			                    
 			                    <!-- new -->
@@ -372,7 +372,7 @@ margin-top: 10px;
 	document.getElementById("submitbutton").addEventListener("click", function () {
 	    // Clear the inputs in the receivedcard section
 	    //$('#datefile').val('');
-	    $('#remarks').val('');
+	    //$('#remarks').val('');
 	    
 	    // Make the receivedcard section visible
 	    document.getElementById("receivedcard").style.display = "block";

frontend/pensioner/department/closedList.html

@@ -351,7 +351,7 @@ margin-top: 10px;
 			                    </div>
 			                    
 						</div>
-						
+						<div id="zbcard">
 						<hr>
 						
 						<p style="font-weight: bold;font-size: medium;text-decoration: underline;">Zone Benefits</p>	
@@ -448,10 +448,13 @@ margin-top: 10px;
 							</div>
 						</div>
 						
+						</div>
 						
 						<hr>
 						
-						<p style="font-weight: bold;font-size: medium;text-decoration: underline;">Pension Benefits</p>	
+						
+						
+						<!-- <p style="font-weight: bold;font-size: medium;text-decoration: underline;">Pension Benefits</p>	
 						<div class="row" id="sec3">
 	                   		<div class="col-md-4 mt-2 mb-2">
 	                   			<label for="pensionNumber" class="form-label">Pension Number</label>
@@ -480,7 +483,7 @@ margin-top: 10px;
 						        </div>						        
 						    </div>
 						    						    						    
-						    <!-- Placeholder for dynamically added input -->
+						    Placeholder for dynamically added input
 						    <div id="PbAmountDiv" class="mt-3" style="display: none;">
 						        <label for="benefit_pension_amount" class="form-label">Enter Pensions Benefit Amount</label>
 						        <input type="number" id="benefit_pension_amount" class="form-control" placeholder="Enter Pensions Benefit Amount" min="1" oninput="validatePositiveNumber(this)">
@@ -501,7 +504,7 @@ margin-top: 10px;
 						        </div>						        
 						    </div>
 						    						    						    
-						    <!-- Placeholder for dynamically added input -->
+						    Placeholder for dynamically added input
 						    <div id="dcrgAmountDiv" class="mt-3" style="display: none;">
 						        <label for="benefit_dcrg_amount" class="form-label">Enter Benefit DCRG Amount</label>
 						        <input type="number" id="benefit_dcrg_amount" class="form-control" placeholder="Enter Pensions Benefit DCRG Amount" min="1" oninput="validatePositiveNumber(this)">
@@ -522,13 +525,13 @@ margin-top: 10px;
 						        </div>						        
 						    </div>
 						    						    						    
-						    <!-- Placeholder for dynamically added input -->
+						    Placeholder for dynamically added input
 						    <div id="CommutationAmountDiv" class="mt-3" style="display: none;">
 						        <label for="benefit_commutation_amount" class="form-label">Enter Benefit Commutation Amount</label>
 						        <input type="number" id="benefit_commutation_amount" class="form-control" placeholder="Enter Pensions Benefit Commutation Amount" min="1" oninput="validatePositiveNumber(this)">
 						    </div>
 						</div>
-						</div>
+						</div> -->
 						
 						     <!-- file history -->
 
@@ -659,7 +662,7 @@ margin-top: 10px;
                     <td class="text-center">${audit.emp_name || 'N/A'}</td>
                     <td class="text-center">${audit.dept_name || 'N/A'}</td>
                     <td class="text-center">${audit.designation || 'N/A'}</td>
-                    <td class="text-center">${audit.file_moved_date ? formatDate(audit.file_moved_date) : 'N/A'}</td>
+                    <td class="text-center">${audit.file_moved_date ? formatDate(audit.file_moved_date,'dd-MM-yyyy' ) : 'N/A'}</td>
                     <td class="text-center">
                         <button class="btn btn-primary btn-sm view-btn" data-temp-id="${audit.temp_id}">
                             View
@@ -677,13 +680,26 @@ margin-top: 10px;
         initializeDataTable();
     }
 
-    function formatDate(dateString) {
-        if (!dateString) return 'N/A';
-        let date = new Date(dateString);
-        return date.toISOString().split('T')[0]; // Format: YYYY-MM-DD
-    }
+   
  });
 
+	 function formatDate(dateString, format = 'dd-MM-yyyy') {
+	        if (!dateString) return 'N/A';
+
+	        // Handle case where date might have time part (e.g., "2024-05-31 00:00:00.0")
+	        let parts = dateString.split(' ')[0].split('-'); // Extract only the date part
+	        if (parts.length !== 3) return 'N/A';
+
+	        let [year, month, day] = parts; // Assuming date format is "YYYY-MM-DD"
+	        
+	        if (format === 'dd-MM-yyyy') {
+	            return `${day}-${month}-${year}`;
+	        } else if (format === 'MM-dd-yyyy') {
+	            return `${month}-${day}-${year}`;
+	        } else {
+	            return dateString; // Default case (return original format)
+	        }
+	    }
 
 	//model function
 	 function fetchEmployeeDetails(tempId) {
@@ -718,7 +734,11 @@ margin-top: 10px;
 	 	                
 	 	             //zone benefits fields
 	 	                
-		 	               
+	 	             if(employeeDetails.gpf === null){
+	 	            	$('#zbcard').hide();
+	 	             }
+	 	             else{
+	 	            	$('#zbcard').show();
 	 	            	 if (employeeDetails.gpf === 'yes') {
 		                     $('#gpfYes').prop('checked', true); // Disable radio
 		                     $('#gpfNo').prop('disabled', true);
@@ -796,8 +816,11 @@ margin-top: 10px;
 		                     $('#dcrgYes').prop('disabled', true);
 		             			                     
 		                 }	
+	 	             }
+		 	               
+		                
                        
-                       $('#pensionNumber').val(employeeDetails.pension_number).prop('readonly',true);
+                      /*  $('#pensionNumber').val(employeeDetails.pension_number).prop('readonly',true);
                        $('#ledgerNumber').val(employeeDetails.ledger_number).prop('readonly',true);
                        
                        $('input[name="benefit_pension"][value="' + employeeDetails.benefit_pension + '"]').prop('checked', true);
@@ -862,7 +885,7 @@ margin-top: 10px;
 
 	                    // Trigger the save function and pass the value
 	                    saveEntryDetails(tempId,employeeNo);
-	        		});
+	        		}); */
 	                   
 	            } else {
 	                Swal.fire({
@@ -891,7 +914,7 @@ margin-top: 10px;
    	 	$(document).on('click', '.view-btn', function () {
    		 const empCode = $(this).data('id'); // Fetch `data-id` value
    		 const tempId = $(this).data('temp-id'); // Fetch `data-temp-id` value
-   		    console.log("empCode====="+empCode);
+   		    //console.log("empCode====="+empCode);
    		   console.log("tempId====="+tempId);
    		    // Hide the receivedcard section before showing the modal
    	        $("#receivedcard").hide();
@@ -1046,7 +1069,7 @@ margin-top: 10px;
 
 	 
 
-		document.addEventListener("DOMContentLoaded", function() {
+/* 		document.addEventListener("DOMContentLoaded", function() {
 	        // Get today's date
 	        const today = new Date();
 	        
@@ -1063,10 +1086,10 @@ margin-top: 10px;
 	        document.getElementById("datefilereceived").value = formattedDateDisplay;
 	        document.getElementById("datefileyes").value = formattedDateDisplay;
 	        
-	    });
+	    }); */
 	  
 	  
-	function convertDateFormat(dateString) {
+/* 	function convertDateFormat(dateString) {
 	    if (!dateString) return '';
 	    let [day, month, year] = dateString.split('-');
 	    return `${year}-${month}-${day}`;
@@ -1123,7 +1146,7 @@ margin-top: 10px;
  	            console.error('Error:', xhr.responseText);
  	        }
  	    });  
- 	}
+ 	} */
 	
 	</script>
 

frontend/pensioner/department/completed/contributorypensionscheme.html

@@ -210,7 +210,7 @@ margin-top: 10px;
 					        <div class="card">
 					            <div class="card-block">
 					            <h5 style="font-weight:bold;"><span th:text="${deptname}" id="deptname"></span>&nbsp;Department</h5>
-					                <h5 style="font-weight:bold;">Completed Contributory Pension Scheme</h5>
+					                <h5 style="font-weight:bold;">Completed - Contributory Pension Scheme</h5>
 					                <h5 style="font-weight:bold;"><span th:text="${deptId}" id="deptId" style="display:none"></span></h5>
 					                <span th:text="${userId}" id="userId" style="display:none"></span>
 					                <div id="completedCPSTable">

frontend/pensioner/department/completed/familypension.html

@@ -334,7 +334,7 @@ margin-top: 10px;
 			                    <!-- While in Service Death -->
 			                    <div class="col-md-6">
 			                        <label for="servicedeath" class="form-label fw-bold">While in Service Death </label>
-			                        <input type="text" id="servicedeath" class="form-control" readonly>
+			                        <input type="date" id="servicedeath" class="form-control" readonly>
 			                    </div>
 			                    
 			                     <!-- Relationship of Deceased -->
@@ -598,6 +598,25 @@ margin-top: 10px;
         processing: false
     });
 	
+	
+    document.addEventListener("DOMContentLoaded", function() {
+        // Get today's date
+        const today = new Date();
+        
+        // Format the date as DD-MM-YYYY for display
+        const day = String(today.getDate()).padStart(2, '0');
+        const month = String(today.getMonth() + 1).padStart(2, '0'); // Months are 0-based
+        const year = today.getFullYear();
+        
+        // Combine into DD-MM-YYYY format for display
+        const formattedDateDisplay = `${day}-${month}-${year}`;
+        
+        // Set the value of the input field to the current date (in DD-MM-YYYY format for display)
+        //document.getElementById("datefile").value = formattedDateDisplay;
+        document.getElementById("servicedeath").value = formattedDateDisplay;
+
+    });
+
   //model function
 	 function fetchEmployeeDetails(tempId) {
 	 	    $.ajax({

frontend/pensioner/department/fileclosing.html

@@ -381,6 +381,7 @@ margin-top: 10px;
 			                    
 						</div>
 						
+						<div id="showZoneBenefit">
 						<hr>
 						
 						<p style="font-weight: bold;font-size: medium;text-decoration: underline;">Zone Benefits</p>	
@@ -477,11 +478,12 @@ margin-top: 10px;
 							</div>
 						</div>
 						
+						</div>
 						
-						<hr>
 						
-						<p style="font-weight: bold;font-size: medium;text-decoration: underline;">Pension Benefits</p>	
-						<div class="row" id="sec3">
+						
+						<!-- <p style="font-weight: bold;font-size: medium;text-decoration: underline;">Pension Benefits</p>	 -->
+						<!-- <div class="row" id="sec3">
 	                   		<div class="col-md-4 mt-2 mb-2">
 	                   			<label for="pensionNumber" class="form-label">Pension Number</label>
 						        <input type="number" id="pensionNumber" class="form-control" placeholder="Enter Employee Pension Number" >
@@ -491,9 +493,9 @@ margin-top: 10px;
 	                   			<label for="ledgerNumber" class="form-label">Ledger Number</label>
 						        <input type="number" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number">
 	                   		</div>	
-	                   		</div>
+	                   		</div> -->
 	                   		
-	                   		<div class="row mt-2">
+	                   		<!-- <div class="row mt-2">
 	                   		
 	                   		<div class="col-md-4  mb-2">
 						    <label class="form-label fw-bold">Sanctions Pensions Benefit-Pension</label>
@@ -509,7 +511,7 @@ margin-top: 10px;
 						        </div>						        
 						    </div>
 						    						    						    
-						    <!-- Placeholder for dynamically added input -->
+						    Placeholder for dynamically added input
 						    <div id="PbAmountDiv" class="mt-3" style="display: none;">
 						        <label for="benefit_pension_amount" class="form-label">Enter Pensions Benefit Amount</label>
 						        <input type="number" id="benefit_pension_amount" class="form-control" placeholder="Enter Pensions Benefit Amount" min="1" oninput="validatePositiveNumber(this)">
@@ -530,7 +532,7 @@ margin-top: 10px;
 						        </div>						        
 						    </div>
 						    						    						    
-						    <!-- Placeholder for dynamically added input -->
+						    Placeholder for dynamically added input
 						    <div id="dcrgAmountDiv" class="mt-3" style="display: none;">
 						        <label for="benefit_dcrg_amount" class="form-label">Enter Benefit DCRG Amount</label>
 						        <input type="number" id="benefit_dcrg_amount" class="form-control" placeholder="Enter Pensions Benefit DCRG Amount" min="1" oninput="validatePositiveNumber(this)">
@@ -551,13 +553,13 @@ margin-top: 10px;
 						        </div>						        
 						    </div>
 						    						    						    
-						    <!-- Placeholder for dynamically added input -->
+						    Placeholder for dynamically added input
 						    <div id="CommutationAmountDiv" class="mt-3" style="display: none;">
 						        <label for="benefit_commutation_amount" class="form-label">Enter Benefit Commutation Amount</label>
 						        <input type="number" id="benefit_commutation_amount" class="form-control" placeholder="Enter Pensions Benefit Commutation Amount" min="1" oninput="validatePositiveNumber(this)">
 						    </div>
 						</div>
-						</div>
+						</div> -->
 						
 						     <!-- file history -->
 
@@ -817,7 +819,8 @@ margin-top: 10px;
 	 	                
 	 	               console.log("retirementdate",retirementdate);
 	 	               
-	 	          
+	 	              let status=employeeDetails.file_status;
+	 	                console.log("status=:"+status);
 	 	                
 	 	               
 	 	                // Update the modal title with the employee code
@@ -828,7 +831,10 @@ margin-top: 10px;
 	 	                
 	 	                
 							//zone benefits fields
+	 	                if (status >= 6 && status <= 8) {
+	 	                	
 	 	                	
+	 	                	$('#showZoneBenefit').show();
 	 	               
 			                 if (employeeDetails.gpf === 'yes') {
 			                     $('#gpfYes').prop('checked', true); // Disable radio
@@ -908,7 +914,13 @@ margin-top: 10px;
 			             			                     
 			                 }	
 			                     
-	                        $('#pensionNumber').val(employeeDetails.pension_number).prop('readonly',true);
+	 	                }
+	 	                else if(status <=5)
+	 	                	{
+	 	                	$('#showZoneBenefit').hide();
+	 	                	}
+	                        
+	                       /*  $('#pensionNumber').val(employeeDetails.pension_number).prop('readonly',true);
 	                        $('#ledgerNumber').val(employeeDetails.ledger_number).prop('readonly',true);
 	                        
 	                        $('input[name="benefit_pension"][value="' + employeeDetails.benefit_pension + '"]').prop('checked', true);
@@ -962,7 +974,7 @@ margin-top: 10px;
 	                            $('#CommutationAmountDiv').hide();
 	                            $('#commutationNo').prop('disabled', true);
 			                     $('#commutationYes').prop('disabled', true);
-	                        }
+	                        } */
 	 	          	       
 			 	            	 //$('#datefile').val('');
 			 	         	    $('#remarks').val('');
@@ -1077,7 +1089,7 @@ margin-top: 10px;
 	 
 	 
 	 
-	    document.querySelectorAll('input[name="benefit_pension"]').forEach(radio => {
+	    /* document.querySelectorAll('input[name="benefit_pension"]').forEach(radio => {
 	        radio.addEventListener('change', function () {
 	            const PbAmountDiv = document.getElementById('PbAmountDiv');
 	            if (this.value === 'yes') {
@@ -1113,7 +1125,7 @@ margin-top: 10px;
 	                document.getElementById('benefit_commutation_amount').value = ''; // Clear the input field
 	            }
 	        });
-	    });
+	    }); */
 	});
  	
  	 

frontend/pensioner/department/newentry/contributorypensionscheme.html

@@ -159,7 +159,7 @@ padding-top: 2%;
                     <div class="col-md-12">
 					    <div class="card">
 					        <div class="card-block">
-					        <h5 style="font-weight:bold;">New Entry - Contributory Pension</h5><span th:text="${filecategory}" id="filecategory" style="display:none"></span>
+					         <h5 style="font-weight:bold;"> <span th:text="${deptname}" id="deptname"></span>&nbsp;Department</h5><h5 style="font-weight:bold;">New Entry - Contributory Pension</h5><span th:text="${filecategory}" id="filecategory" style="display:none"></span>
 							<h5 style="font-weight:bold;"><span th:text="${deptId}" id="deptId" style="display:none"></span></h5>
 					        <span th:text="${userId}" id="userId" style="display:none"></span>
 								<div class="row mb-4">

frontend/pensioner/department/newentry/familypension.html

@@ -532,7 +532,7 @@ padding-top: 2%;
   		                        
   		                      const currentDate = $('#filesentdate').val().trim();
                               
-                              if(employeeDetails.RETIREMENT_DATE <= currentDate){
+                             /*  if(employeeDetails.RETIREMENT_DATE <= currentDate){
                               	
                               	 Swal.fire({
                                        icon: "warning",
@@ -544,7 +544,7 @@ padding-top: 2%;
                                        }
                                    });
                                    return;
-                              }
+                              } */
 
   		                        // Populate the form fields with the employee details
   		                        $('#employeeno').val(employeeDetails.EMPLOYEE_CODE);

frontend/pensioner/department/partial/familypension.html

@@ -266,7 +266,7 @@ margin-top: 10px;
 			                       <!-- pending duration-->
 			                    
 			                    
-                    				<div class="col-md-6">
+                    				<div class="col-md-4">
 										    <label for="pendingDuration" class="form-label fw-bold">
 										        Pending Duration
 										        
@@ -288,18 +288,18 @@ margin-top: 10px;
 			                    
 			                    
 			                    <!-- While in Service Death -->
-			                    <div class="col-md-6">
+			                    <div class="col-md-4">
 			                        <label for="servicedeath" class="form-label fw-bold">While in Service Death </label>
-			                        <input type="text" id="servicedeath" class="form-control" readonly>
+			                        <input type="date" id="servicedeath" class="form-control" readonly>
 			                    </div>
 			                    
 			                     <!-- Relationship of Deceased -->
-			                    <div class="col-md-6">
+			                    <div class="col-md-4">
 			                        <label for="relationship" class="form-label fw-bold">Relationship of Deceased </label>
 			                        <input type="text" id="relationship" class="form-control" readonly>
 			                    </div>
 			                    
-			                     <div class="col-md-6">
+			                     <div class="col-md-4">
 			                        <label for="sanctionedgis" class="form-label fw-bold">Sanctioned GIS</label>
 			                        <input type="text" id="sanctionedgis" class="form-control" readonly>
 			                    </div>
@@ -313,7 +313,7 @@ margin-top: 10px;
 			                    <!-- Remarks -->
 			                    <div class="col-md-12">
 			                        <label for="remarks_modal" class="form-label fw-bold">Comments/Remarks  </label>
-			                        <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea>
+			                        <textarea id="remarks_modal" class="form-control" rows="4" readonly></textarea>
 			                    </div>
 			                    
 			                    <!-- new -->
@@ -600,7 +600,7 @@ margin-top: 10px;
         
         // Set the value of the input field to the current date (in DD-MM-YYYY format for display)
         document.getElementById("datefile").value = formattedDateDisplay;
-
+        document.getElementById("servicedeath").value = formattedDateDisplay;
         
     });
   
@@ -644,7 +644,10 @@ document.getElementById("submitbutton").addEventListener("click", function () {
 	 	                $('#employeename').val(employeeDetails.emp_name);
 	 	                $('#department').val(employeeDetails.dept_name);
 	 	                $('#designation').val(employeeDetails.designation);
-	 	                $('#typeofretirement').val(employeeDetails.type_of_retirement);
+	 	                $('#servicedeath').val(employeeDetails.service_death);
+	 	                $('#relationship').val(employeeDetails.relationship_deceased);
+	 	                //$('#typeofretirement').val(employeeDetails.type_of_retirement);
+	 	               $('#sanctionedgis').val(employeeDetails.sanctioned_gis_amount);
 	 	              // $('#classes').val(employeeDetails.retirement_class);
 	 	               $('#datefile_modal').val(employeeDetails.file_moved_date);
 	 	               $('#remarks_modal').val(employeeDetails.remarks);
@@ -756,7 +759,7 @@ document.getElementById("submitbutton").addEventListener("click", function () {
 	                        }
 	 	          	       
 			 	            	 //$('#datefile').val('');
-			 	         	    $('#remarks').val('');
+			 	         	    //$('#remarks').val('');
 	 	          	            document.getElementById("receivedcard").style.display = "block";
 	 	          	        
 	 	          	    });

frontend/pensioner/department/partial/pendency.html

@@ -263,17 +263,17 @@ margin-top: 10px;
 			                        <input type="text" id="designation" class="form-control" readonly>
 			                    </div>
 			                    
-			                    <div class="col-md-6">
+			                    <div class="col-md-4">
 			                        <label for="classes" class="form-label fw-bold">Class</label>
 			                        <input type="text" id="classes" class="form-control" readonly>
 			                    </div>
 			                    
-			                    <div class="col-md-6">
+			                    <div class="col-md-4">
 			                        <label for="retirementdate" class="form-label fw-bold">Retirement Date </label>
 			                        <input type="date" id="retirementdate" class="form-control" readonly>
 			                    </div>
 			                    
-			                            <div class="col-md-6">
+			                            <div class="col-md-4">
 										    <label for="pendingDuration" class="form-label fw-bold">
 										        Pending Duration
 										        
@@ -309,7 +309,7 @@ margin-top: 10px;
 			                    <!-- Remarks -->
 			                    <div class="col-md-12">
 			                        <label for="remarks_modal" class="form-label fw-bold">Comments/Remarks  </label>
-			                        <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea>
+			                        <textarea id="remarks_modal" class="form-control" rows="4" readonly></textarea>
 			                    </div>
 			                    
 			                    <!-- new -->
@@ -752,7 +752,7 @@ document.getElementById("submitbutton").addEventListener("click", function () {
 	                        }
 	 	          	       
 			 	            	 //$('#datefile').val('');
-			 	         	    $('#remarks').val('');
+			 	         	    //$('#remarks').val('');
 	 	          	            document.getElementById("receivedcard").style.display = "block";
 	 	          	        
 	 	          	    });

frontend/pensioner/department/partial/retirement.html

@@ -289,7 +289,7 @@ margin-top: 10px;
 			                    <!-- Remarks -->
 			                    <div class="col-md-12">
 			                        <label for="remarks_modal" class="form-label fw-bold">Comments/Remarks  </label>
-			                        <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea>
+			                        <textarea id="remarks_modal" class="form-control" rows="4"  readonly></textarea>
 			                    </div>
 			                    
 			                    <!-- new -->
@@ -715,7 +715,7 @@ function convertDateFormat(dateString) {
 	                        }
 	 	          	       
 			 	            	 //$('#datefile').val('');
-			 	         	    $('#remarks').val('');
+			 	         	    //$('#remarks').val('');
 	 	          	            document.getElementById("receivedcard").style.display = "block";
 	 	          	        
 	 	          	    });

frontend/pensioner/department/received/familypension.html

@@ -106,10 +106,9 @@ margin-top: 10px;
                         <div class="row align-items-end">
                             <div class="col-lg-8">
                                 <div class="page-header-title">
-                                    <i class="fa fa-list-alt bg-blue"></i>
                                     <div class="d-inline">	
-                                        <h5>Department Entries</h5>
-                                        <span>Family Pension</span>
+                                        <h5>Family Pension</h5>
+                                       <span>Department Entries </span>
                                     </div>
                                 </div>
                             </div>
@@ -274,7 +273,7 @@ margin-top: 10px;
                     <!-- Remarks -->
                     <div class="col-md-12">
                         <label for="remarks_modal" class="form-label fw-bold">Comments/Remarks  </label>
-                        <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea>
+                        <textarea id="remarks_modal" class="form-control" rows="4" readonly></textarea>
                     </div>
                      
                     <!-- new -->
@@ -614,7 +613,7 @@ margin-top: 10px;
 		 	                        $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);
 		 	                        
 		 	                       //$('#datefile').val('');
-		 	                        $('#remarks').val('');
+		 	                        //$('#remarks').val('');
 		 	                    } 
 
 		 	                    if (status === 5) {
@@ -623,7 +622,7 @@ margin-top: 10px;
 		 	                        $('#spfgsAmount').val('');
 		 	                        $('#recoveryemployeevalue').val('');
 		 	                        //$('#datefile').val('');
-		 	                        $('#remarks').val('');
+		 	                        //$('#remarks').val('');
 
 		 	                        $('input[name="gpf"]').prop('checked', false);
 		 	                        $('input[name="earnedleave"]').prop('checked', false);
@@ -969,6 +968,7 @@ document.addEventListener("DOMContentLoaded", function() {
     
     // Set the value of the input field to the current date (in DD-MM-YYYY format for display)
      document.getElementById("datefile").value = formattedDateDisplay;
+     document.getElementById("servicedeath").value = formattedDateDisplay;
 
     
 });

frontend/pensioner/department/received/pendency.html

@@ -269,7 +269,7 @@ margin-top: 10px;
                     <!-- Remarks -->
                     <div class="col-md-12">
                         <label for="remarks_modal" class="form-label fw-bold">Comments/Remarks  </label>
-                        <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea>
+                        <textarea id="remarks_modal" class="form-control" rows="4" readonly></textarea>
                     </div>
                      
                     <!-- new -->
@@ -394,7 +394,7 @@ margin-top: 10px;
 			             <!-- Remarks -->       
 			            <div class="col-md-12">
 	                        <label for="remarks" class="form-label fw-bold">Remarks<span class="text-danger">*</span></label>
-	                        <textarea id="remarks" class="form-control" rows="4" placeholder="Enter your remarks here"></textarea>
+	                        <textarea id="remarks" class="form-control" rows="4" ></textarea>
 		                </div>	
 		                
 		               
@@ -476,7 +476,7 @@ margin-top: 10px;
 		    document.querySelectorAll('input[name="gpf"]').forEach(radio => {
 		        radio.addEventListener('change', function () {
 		            const gpfAmountDiv = document.getElementById('gpfAmountDiv');
-		            if (this.value === 'yes' || this.value === '50') {
+		            if (this.value === 'yes' || this.value === '90') {
 		                gpfAmountDiv.style.display = 'block'; // Show the input field
 		            } else {
 		                gpfAmountDiv.style.display = 'none'; // Hide the input field
@@ -603,7 +603,7 @@ margin-top: 10px;
 		 	                        $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);
 		 	                        
 		 	                       //$('#filedate').val('');
-		 	                        $('#remarks').val('');
+		 	                        //$('#remarks').val('');
 		 	                    } 
 
 		 	                    if (status === 5) {
@@ -612,7 +612,7 @@ margin-top: 10px;
 		 	                        $('#spfgsAmount').val('');
 		 	                        $('#recoveryemployeevalue').val('');
 		 	                        //$('#filedate').val('');
-		 	                        $('#remarks').val('');
+		 	                        //$('#remarks').val('');
 
 		 	                        $('input[name="gpf"]').prop('checked', false);
 		 	                        $('input[name="earnedleave"]').prop('checked', false);

frontend/pensioner/department/received/provisionalretirement.html

@@ -376,7 +376,7 @@ margin-top: 10px;
 		                    <!-- Remarks -->
 		                    <div class="col-md-12">
 		                        <label for="remarks_modal" class="form-label fw-bold">Comments/Remarks<span class="text-danger">*</span>  </label>
-		                        <textarea id="remarks_modal" class="form-control" rows="2" placeholder="Enter your remarks here" readonly></textarea>
+		                        <textarea id="remarks_modal" class="form-control" rows="2"  readonly></textarea>
 		                    </div>
 		                    
 		                    <!-- new -->

frontend/pensioner/department/received/retirement.html

@@ -249,7 +249,7 @@ margin-top: 10px;
                     <!-- Remarks -->
                     <div class="col-md-12">
                         <label for="remarks_modal" class="form-label fw-bold">Comments/Remarks  </label>
-                        <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea>
+                        <textarea id="remarks_modal" class="form-control" rows="4"  readonly></textarea>
                     </div>
                      
                     <!-- new -->
@@ -592,7 +592,7 @@ margin-top: 10px;
 		 	                        $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);
 		 	                        
 		 	                       //$('#datefile').val('');
-		 	                        $('#remarks').val('');
+		 	                       //$('#remarks').val('');
 		 	                    } 
 
 		 	                    if (status === 5) {
@@ -601,7 +601,7 @@ margin-top: 10px;
 		 	                        $('#spfgsAmount').val('');
 		 	                        $('#recoveryemployeevalue').val('');
 		 	                        //$('#datefile').val('');
-		 	                        $('#remarks').val('');
+		 	                        //$('#remarks').val('');
 
 		 	                        $('input[name="gpf"]').prop('checked', false);
 		 	                        $('input[name="earnedleave"]').prop('checked', false);

frontend/pensioner/department/reports.html

@@ -187,7 +187,7 @@ td, th {
                     <div class="col-md-12">
 					    <div class="card">
 					        <div class="card-block">
-					        <h5 style="font-weight:bold;">Zone Department/Report</h5>
+					        <h5 style="font-weight:bold;">Department-Report</h5>
 					       
 					        <h5 style="font-weight:bold;"> <span th:text="${deptname}" id="deptname"></span>&nbsp;</h5><span th:text="${filecategory}" id="filecategory" style="display:none"></span>
 							<h5 style="font-weight:bold;"><span th:text="${deptId}" id="deptId" style="display:none"></span> </h5>
@@ -591,7 +591,21 @@ td, th {
 		            { title: "Pending Duration", data: "reason_for_pending", className: "text-center" },
 		            { title: "File Status", data: "fst", className: "text-center" },
 		            { title: "File Category", data: "file_category_name", className: "text-center" },
-		            { title: "File Moved Date", data: "created_date", className: "text-center" },
+		            { 
+		                title: "File Moved Date", 
+		                data: "created_date", 
+		                className: "text-center",
+		                render: function(data, type, row) {
+		                    if (data) {
+		                        let date = new Date(data);
+		                        let day = String(date.getDate()).padStart(2, '0');
+		                        let month = String(date.getMonth() + 1).padStart(2, '0');
+		                        let year = date.getFullYear();
+		                        return `${day}-${month}-${year}`;
+		                    }
+		                    return "";
+		                }
+		            },
 		            { title: "Comments/Remarks", data: "remarks", className: "text-center" },
 	            
 	        ]
@@ -599,7 +613,7 @@ td, th {
 	    
 	    // retirement datatable
 	    
-	    let fileRetireTable = $("#FileRetirementTable").DataTable({
+/* 	    let fileRetireTable = $("#FileRetirementTable").DataTable({
 	        dom: 'Bftip',
 	        columnDefs: [{ targets: 'no-sort', orderable: false }],
 	        lengthMenu: [
@@ -633,11 +647,96 @@ td, th {
 		            { title: "File Status", data: "fst", className: "text-center" },
 		            { title: "File Category", data: "file_category_name", className: "text-center" },
 		            { title: "File Moved Date", data: "file_moved_date", className: "text-center" },
+		            { 
+		                title: "File Moved Date", 
+		                data: "file_moved_date", 
+		                className: "text-center",
+		                render: function(data, type, row) {
+		                    if (data) {
+		                        let date = new Date(data);
+		                        let day = String(date.getDate()).padStart(2, '0');
+		                        let month = String(date.getMonth() + 1).padStart(2, '0');
+		                        let year = date.getFullYear();
+		                        return `${day}-${month}-${year}`;
+		                    }
+		                    return "";
+		                }
+		            },
+		            
 		            { title: "Comments/Remarks", data: "remarks", className: "text-center" },
 	            
 	        ]
+	    }); */
+	    
+	    
+	    
+	    let fileRetireTable = $("#FileRetirementTable").DataTable({
+	        dom: 'Bftip',
+	        columnDefs: [{ targets: 'no-sort', orderable: false }],
+	        lengthMenu: [
+	            [50, 100, 200, 500, -1],
+	            ['50 rows', '100 rows', '200 rows', 'Show all']
+	        ],
+	        scrollY: '50vh',
+	        fixedColumns: { left: 1, right: 1 },
+	        buttons: [
+	            { extend: 'pageLength', className: 'btn btn-warning ' },
+	            { title: 'Data export', extend: 'copyHtml5', text: 'Copy', className: 'btn btn-secondary ' },
+	            { extend: 'excelHtml5', text: 'Excel', className: 'btn btn-secondary' },
+	            { extend: 'csvHtml5', text: 'CSV', className: 'btn btn-secondary' },
+	            { extend: 'pdfHtml5', text: 'PDF', className: 'btn btn-secondary' }
+	        ],
+	        fixedHeader: false,
+	        autoWidth: true,
+	        responsive: true,
+	        searching: true,
+	        select: false,
+	        processing: false,
+	        data: [],
+	        columns: [
+	            { title: "S.No", data: "index", className: "text-center" },
+	            { title: "Employee Code", data: "emp_no", className: "text-center" },
+	            { title: "Name", data: "emp_name", className: "text-center" },
+	            { title: "Designation", data: "designation", className: "text-center" },
+	            { title: "Type of Retirement", data: "type_of_retirement", className: "text-center" },
+	            { 
+	            	title: "Date of Retirement", 
+	            	data: "retirement_date", 
+	            	className: "text-center",
+	            	 render: function(data, type, row) {
+		                    if (data) {
+		                        let date = new Date(data);
+		                        let day = String(date.getDate()).padStart(2, '0');
+		                        let month = String(date.getMonth() + 1).padStart(2, '0');
+		                        let year = date.getFullYear();
+		                        return `${day}-${month}-${year}`;
+		                    }
+		                    return "";
+		                }
+	            	
+	            },
+	            { title: "File Status", data: "fst", className: "text-center" },
+	            { title: "File Category", data: "file_category_name", className: "text-center" },
+	            { 
+	                title: "File Moved Date", 
+	                data: "file_moved_date", 
+	                className: "text-center",
+	                render: function(data, type, row) {
+	                    if (data) {
+	                        let date = new Date(data);
+	                        let day = String(date.getDate()).padStart(2, '0');
+	                        let month = String(date.getMonth() + 1).padStart(2, '0');
+	                        let year = date.getFullYear();
+	                        return `${day}-${month}-${year}`;
+	                    }
+	                    return "";
+	                }
+	            },
+	            { title: "Comments/Remarks", data: "remarks", className: "text-center" },
+	        ]
 	    });
 
+	    
 	    // family pension datatable
 	    
 	    let fileFamilyPensionTable = $("#FileFamilyPensionTable").DataTable({
@@ -669,12 +768,40 @@ td, th {
 		            { title: "Employee Code", data: "emp_no", className: "text-center" },
 		            { title: "Name", data: "emp_name", className: "text-center" },
 		            { title: "Designation", data: "designation", className: "text-center" },
-		            { title: "Service Death Date", data: "service_death", className: "text-center" },
+		            { 
+		                title: "Service Death Date", 
+		                data: "service_death", 
+		                className: "text-center",
+		                render: function(data, type, row) {
+		                    if (data) {
+		                        let date = new Date(data);
+		                        let day = String(date.getDate()).padStart(2, '0');
+		                        let month = String(date.getMonth() + 1).padStart(2, '0');
+		                        let year = date.getFullYear();
+		                        return `${day}-${month}-${year}`;
+		                    }
+		                    return "";
+		                }
+		            },
 		            { title: "Relationship Type", data: "relationship_deceased", className: "text-center" },
 		            { title: "Pending Duration", data: "reason_for_pending", className: "text-center" },
 		            { title: "File Status", data: "fst", className: "text-center" },
 		            { title: "File Category", data: "file_category_name", className: "text-center" },
-		            { title: "File Moved Date", data: "file_moved_date", className: "text-center" },
+		            { 
+		                title: "File Moved Date", 
+		                data: "file_moved_date", 
+		                className: "text-center",
+		                render: function(data, type, row) {
+		                    if (data) {
+		                        let date = new Date(data);
+		                        let day = String(date.getDate()).padStart(2, '0');
+		                        let month = String(date.getMonth() + 1).padStart(2, '0');
+		                        let year = date.getFullYear();
+		                        return `${day}-${month}-${year}`;
+		                    }
+		                    return "";
+		                }
+		            },
 		            { title: "Comments/Remarks", data: "remarks", className: "text-center" },
 	            
 	        ]
@@ -712,11 +839,40 @@ td, th {
 		            { title: "Name", data: "emp_name", className: "text-center" },
 		            { title: "Designation", data: "designation", className: "text-center" },
 		            { title: "Type of Retirement", data: "type_of_retirement", className: "text-center" },
-		            { title: "Date of Retirement", data: "retirement_date", className: "text-center" },
+		            { 
+		            	title: "Date of Retirement", 
+		            	data: "retirement_date", 
+		            	className: "text-center",
+		            	 render: function(data, type, row) {
+			                    if (data) {
+			                        let date = new Date(data);
+			                        let day = String(date.getDate()).padStart(2, '0');
+			                        let month = String(date.getMonth() + 1).padStart(2, '0');
+			                        let year = date.getFullYear();
+			                        return `${day}-${month}-${year}`;
+			                    }
+			                    return "";
+			                }
+		            	
+		            },
 		            { title: "Pending Duration", data: "reason_for_pending", className: "text-center" },
 		            { title: "File Status", data: "fst", className: "text-center" },
 		            { title: "File Category", data: "file_category_name", className: "text-center" },
-		            { title: "File Moved Date", data: "file_moved_date", className: "text-center" },
+		            { 
+		                title: "File Moved Date", 
+		                data: "file_moved_date", 
+		                className: "text-center",
+		                render: function(data, type, row) {
+		                    if (data) {
+		                        let date = new Date(data);
+		                        let day = String(date.getDate()).padStart(2, '0');
+		                        let month = String(date.getMonth() + 1).padStart(2, '0');
+		                        let year = date.getFullYear();
+		                        return `${day}-${month}-${year}`;
+		                    }
+		                    return "";
+		                }
+		            },
 		            { title: "Comments/Remarks", data: "remarks", className: "text-center" },
 	            
 	        ]
@@ -753,11 +909,39 @@ td, th {
 		            { title: "Employee Code", data: "emp_no", className: "text-center" },
 		            { title: "Name", data: "emp_name", className: "text-center" },
 		            { title: "Designation", data: "designation", className: "text-center" },	            
-		            { title: "Service Death Date", data: "service_death", className: "text-center" },
+		            { 
+		                title: "Service Death Date", 
+		                data: "service_death", 
+		                className: "text-center",
+		                render: function(data, type, row) {
+		                    if (data) {
+		                        let date = new Date(data);
+		                        let day = String(date.getDate()).padStart(2, '0');
+		                        let month = String(date.getMonth() + 1).padStart(2, '0');
+		                        let year = date.getFullYear();
+		                        return `${day}-${month}-${year}`;
+		                    }
+		                    return "";
+		                }
+		            },
 		            { title: "Sanctioned Amount", data: "sanctional_gis_amount", className: "text-center" },
 		            { title: "File Status", data: "fst", className: "text-center" },
 		            { title: "File Category", data: "file_category_name", className: "text-center" },
-		            { title: "File Moved Date", data: "file_moved_date", className: "text-center" },
+		            { 
+		                title: "File Moved Date", 
+		                data: "file_moved_date", 
+		                className: "text-center",
+		                render: function(data, type, row) {
+		                    if (data) {
+		                        let date = new Date(data);
+		                        let day = String(date.getDate()).padStart(2, '0');
+		                        let month = String(date.getMonth() + 1).padStart(2, '0');
+		                        let year = date.getFullYear();
+		                        return `${day}-${month}-${year}`;
+		                    }
+		                    return "";
+		                }
+		            },
 		            { title: "Comments/Remarks", data: "remarks", className: "text-center" },
 	            
 	        ]
@@ -795,10 +979,39 @@ td, th {
 		            { title: "Name", data: "emp_name", className: "text-center" },
 		            { title: "Designation", data: "designation", className: "text-center" },
 		            { title: "Type of Retirement", data: "type_of_retirement", className: "text-center" },
-		            { title: "Date of Retirement", data: "retirement_date", className: "text-center" },
+		            { 
+		            	title: "Date of Retirement", 
+		            	data: "retirement_date", 
+		            	className: "text-center",
+		            	 render: function(data, type, row) {
+			                    if (data) {
+			                        let date = new Date(data);
+			                        let day = String(date.getDate()).padStart(2, '0');
+			                        let month = String(date.getMonth() + 1).padStart(2, '0');
+			                        let year = date.getFullYear();
+			                        return `${day}-${month}-${year}`;
+			                    }
+			                    return "";
+			                }
+		            	
+		            },
 		            { title: "File Category", data: "file_category_name", className: "text-center" },
 		            { title: "File Status", data: "fst", className: "text-center" },
-		            { title: "File Moved Date", data: "file_moved_date", className: "text-center" },
+		            { 
+		                title: "File Moved Date", 
+		                data: "file_moved_date", 
+		                className: "text-center",
+		                render: function(data, type, row) {
+		                    if (data) {
+		                        let date = new Date(data);
+		                        let day = String(date.getDate()).padStart(2, '0');
+		                        let month = String(date.getMonth() + 1).padStart(2, '0');
+		                        let year = date.getFullYear();
+		                        return `${day}-${month}-${year}`;
+		                    }
+		                    return "";
+		                }
+		            },
 		            { title: "Comments/Remarks", data: "remarks", className: "text-center" },
 	            
 	        ]

frontend/pensioner/department/return/familypension.html

@@ -267,7 +267,7 @@ margin-top: 10px;
     
         <!--  Modal Box -->    
 		<div class="modal fade" id="returnfamilydetailsModal" tabindex="-1" role="dialog" aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-		    <div class="modal-dialog modal-xl" role="document">
+		    <div class="modal-dialog modal-lg" role="document">
 		        <div class="modal-content">
 		            <div class="modal-header">
 		                <h5 class="modal-title" id="detailsModalLabel">
@@ -330,7 +330,7 @@ margin-top: 10px;
 							<!-- While in Service Death -->
 							   <div class="col-md-6">
 			                        <label for="servicedeath" class="form-label fw-bold">While in Service Death  </label>
-			                        <input type="text" id="servicedeath" class="form-control" readonly>
+			                        <input type="date" id="servicedeath"  class="form-control" readonly>
 			                    </div>
 			                    
 			                     <!-- Relationship of Deceased -->
@@ -353,8 +353,8 @@ margin-top: 10px;
 		
 		                    <!-- Remarks -->
 		                    <div class="col-md-12">
-		                        <label for="remarks" class="form-label fw-bold">Comments/Remarks   </label>
-		                        <textarea id="remarks" class="form-control" rows="2" placeholder="Enter your remarks here" readonly></textarea>
+		                        <label for="remarks_modal" class="form-label fw-bold">Comments/Remarks   </label>
+		                        <textarea id="remarks_modal" class="form-control" rows="2"  readonly></textarea>
 		                    </div>
 		                    
 		                   
@@ -386,7 +386,7 @@ margin-top: 10px;
 					        <!-- Remarks -->             
 					        <div class="col-md-12">
 		                        <label for="remarks" class="form-label fw-bold">Comments/Remarks<span class="text-danger">*</span></label>
-		                        <textarea id="remarkss" class="form-control" rows="4" placeholder="Enter your remarks here"></textarea>
+		                        <textarea id="remarks" class="form-control" rows="4" placeholder="Enter your remarks here"></textarea>
 					        </div>
 					       </div> 
 					       
@@ -462,6 +462,7 @@ margin-top: 10px;
         
         // Set the value of the input field to the current date (in DD-MM-YYYY format for display)
         document.getElementById("datefiles").value = formattedDateDisplay;
+        document.getElementById("servicedeath").value = formattedDateDisplay;
 
         
     });
@@ -510,7 +511,7 @@ function convertDateFormat(dateString) {
 	 	               	$('#relationship').val(employeeDetails.relationship_deceased);
 	 	              	$('#sanctionedgis').val(employeeDetails.sanctioned_gis_amount);
 	 	               	$('#datefile').val(employeeDetails.file_moved_date);
-	 	               	$('#remarks').val(employeeDetails.remarks);
+	 	               	$('#remarks_modal').val(employeeDetails.remarks);
 	 	               	
 	 	               
 	 	              // Show Pending Duration and Input based on the value
@@ -556,7 +557,7 @@ function convertDateFormat(dateString) {
 	 	        		}); */
 	 	                
 	 	               $('#rectifysubmit').off('click').on('click', function () {
-	 	            	    let employeeNo = $('#employeenomodel').val(); // Get the employee number
+	 	            	    let employeeNo = $('#employeeno').val(); // Get the employee number
 	 	            	    saveEntryDetails(tempId, employeeNo); // Call function with parameters
 	 	            	});
 	 	                
@@ -661,7 +662,7 @@ function convertDateFormat(dateString) {
   	        empNo: empCode,
   	        tempId: tempId,
   	        dateToAudit: convertDateFormat($('#datefiles').val()?.trim()),
-  	        remarks: $('#remarkss').val(),
+  	        remarks: $('#remarks').val(),
   	        deptId:$('#deptId').text().trim(),
   	        filemovedby:$('#userId').text().trim()
   	    };

frontend/pensioner/department/return/pendency.html

@@ -94,7 +94,7 @@
 }
 
 
-#returnPendencydetailsModal .modal-body{
+#returnpendencydetailsModal .modal-body{
 	max-height:80vh;
 	overflow-y:auto; 
 }
@@ -261,7 +261,7 @@ margin-top: 10px;
     
     
     <div class="modal fade" id="returnpendencydetailsModal" tabindex="-1" role="dialog" aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-			    <div class="modal-dialog modal-xl"  role="document">
+			    <div class="modal-dialog modal-lg"  role="document">
 			        <div class="modal-content">
 			            <div class="modal-header">
 			                <h5 class="modal-title" id="detailsModalLabel">
@@ -346,7 +346,7 @@ margin-top: 10px;
 			                    <!-- Remarks -->
 			                    <div class="col-md-12">
 			                        <label for="remarks_modal" class="form-label fw-bold">Comments/Remarks  <span class="text-danger">*</span></label>
-			                        <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here"></textarea>
+			                        <textarea id="remarks_modal" class="form-control" rows="4"  readonly></textarea>
 			                    </div>
 			                    
 			                    

frontend/pensioner/department/return/retirement.html

@@ -261,7 +261,7 @@ margin-top: 10px;
                     <!-- Remarks -->
                     <div class="col-md-12">
                         <label for="remarks_modal" class="form-label fw-bold">Comments/Remarks   </label>
-                        <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea>
+                        <textarea id="remarks_modal" class="form-control" rows="4"  readonly></textarea>
                     </div>
                     
                     <!-- new -->
@@ -425,13 +425,13 @@ margin-top: 10px;
 		 	                $('#returnretrieddetailsModal').modal('show');
 		 	                
 		 	             	//additional card display function
-		 	               document.getElementById("submitbutton").addEventListener("click", function() {
+/* 		 	               document.getElementById("submitbutton").addEventListener("click", function() {
 		 	          	       
 				 	            	 //$('#datefile').val('');
 				 	         	    $('#remarks').val('');
 		 	          	            document.getElementById("receivedcard").style.display = "block";
 		 	          	        
-		 	          	    });
+		 	          	    }); */
 		 	                
 		 	               /*  document.getElementById('rectifysubmit').addEventListener('click', function () {
 		 	                	 let employeeNo = $('#employeenomodel').val(); // Using jQuery to get the value

frontend/pensioner/pensioner/audit/familypension.html

@@ -93,7 +93,7 @@
     cursor: pointer; /* Change cursor to hand symbol */
 }
 
-#returnretrieddetailsModal .modal-body{
+#returnfamilypensiondetailsModal .modal-body{
 	max-height:80vh;
 	overflow-y:auto; 
 }
@@ -267,7 +267,7 @@ margin-top: 10px;
 							<!--  Modal Box -->   
 	 
 			<div class="modal fade" id="returnfamilypensiondetailsModal" tabindex="-1" role="dialog" aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-			    <div class="modal-dialog modal-xl"  role="document">
+			    <div class="modal-dialog modal-lg"  role="document">
 			        <div class="modal-content">
 			            <div class="modal-header">
 			                <h5 class="modal-title" id="detailsModalLabel">
@@ -332,7 +332,7 @@ margin-top: 10px;
 			                    <!-- While in Service Death -->
 			                    <div class="col-md-6">
 			                        <label for="servicedeath" class="form-label fw-bold">While in Service Death </label>
-			                        <input type="text" id="servicedeath" class="form-control" readonly>
+			                        <input type="date" id="servicedeath" class="form-control" readonly>
 			                    </div>
 			                    
 			                     <!-- Relationship of Deceased -->
@@ -356,7 +356,7 @@ margin-top: 10px;
 			                    <!-- Remarks -->
 			                    <div class="col-md-12">
 			                        <label for="remarks_modal" class="form-label fw-bold">Comments/Remarks  </label>
-			                        <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea>
+			                        <textarea id="remarks_modal" class="form-control" rows="4"  readonly></textarea>
 			                    </div>
 			                    
 			                    
@@ -466,7 +466,7 @@ margin-top: 10px;
         
         // Set the value of the input field to the current date (in DD-MM-YYYY format for display)
         document.getElementById("datefile").value = formattedDateDisplay;
-
+        document.getElementById("servicedeath").value = formattedDateDisplay;
         
     });
   
@@ -548,7 +548,7 @@ function convertDateFormat(dateString) {
 	 	               document.getElementById("submitbutton").addEventListener("click", function() {
 	 	          	       
 			 	            	 //$('#datefile').val('');
-			 	         	    $('#remarks').val('');
+			 	         	    //$('#remarks').val('');
 	 	          	            document.getElementById("receivedcard").style.display = "block";
 	 	          	        
 	 	          	    });

frontend/pensioner/pensioner/audit/pendency.html

@@ -94,7 +94,7 @@
     cursor: pointer; /* Change cursor to hand symbol */
 }
 
-#returnretrieddetailsModal .modal-body{
+#returnpendencydetailsModal .modal-body{
 	max-height:80vh;
 	overflow-y:auto; 
 }
@@ -270,7 +270,7 @@ margin-top: 10px;
 							<!--  Modal Box -->   
 	 
 			<div class="modal fade" id="returnpendencydetailsModal" tabindex="-1" role="dialog" aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-			    <div class="modal-dialog modal-xl"  role="document">
+			    <div class="modal-dialog modal-lg"  role="document">
 			        <div class="modal-content">
 			            <div class="modal-header">
 			                <h5 class="modal-title" id="detailsModalLabel">
@@ -356,7 +356,7 @@ margin-top: 10px;
 			                    <!-- Remarks -->
 			                    <div class="col-md-12">
 			                        <label for="remarks_modal" class="form-label fw-bold">Remarks</label>
-			                        <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea>
+			                        <textarea id="remarks_modal" class="form-control" rows="4"  readonly></textarea>
 			                    </div>
 			                    
 			                    

frontend/pensioner/pensioner/audit/retirement.html

@@ -262,7 +262,7 @@ margin-top: 10px;
 			                    <!-- Remarks -->
 			                    <div class="col-md-12">
 			                        <label for="remarks_modal" class="form-label fw-bold">Comments/Remarks  </label>
-			                        <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea>
+			                        <textarea id="remarks_modal" class="form-control" rows="4"  readonly></textarea>
 			                    </div>
 			                    
 			                    <!-- new -->
@@ -428,7 +428,7 @@ margin-top: 10px;
 			 	               document.getElementById("submitbutton").addEventListener("click", function() {
 			 	          	       
 					 	            	// $('#datefile').val('');
-					 	         	    $('#remarks').val('');
+					 	         	    //$('#remarks').val('');
 			 	          	            document.getElementById("receivedcard").style.display = "block";
 			 	          	        
 			 	          	    });

frontend/pensioner/pensioner/completed/familypension.html

@@ -330,7 +330,7 @@ margin-top: 10px;
 			                    <!-- While in Service Death -->
 			                    <div class="col-md-6">
 			                        <label for="servicedeath" class="form-label fw-bold">While in Service Death <span class="text-danger">*</span></label>
-			                        <input type="text" id="servicedeath" class="form-control" readonly>
+			                        <input type="date" id="servicedeath" class="form-control" readonly>
 			                    </div>
 			                    
 			                     <!-- Relationship of Deceased -->
@@ -594,6 +594,25 @@ margin-top: 10px;
         processing: false
     });
 	
+	
+    document.addEventListener("DOMContentLoaded", function() {
+        // Get today's date
+        const today = new Date();
+        
+        // Format the date as DD-MM-YYYY for display
+        const day = String(today.getDate()).padStart(2, '0');
+        const month = String(today.getMonth() + 1).padStart(2, '0'); // Months are 0-based
+        const year = today.getFullYear();
+        
+        // Combine into DD-MM-YYYY format for display
+        const formattedDateDisplay = `${day}-${month}-${year}`;
+        
+        // Set the value of the input field to the current date (in DD-MM-YYYY format for display)
+        
+        document.getElementById("servicedeath").value = formattedDateDisplay;
+
+    });
+
   //model function
 	 function fetchEmployeeDetails(tempId) {
 	 	    $.ajax({

frontend/pensioner/pensioner/completed/provisionalretirement.html

@@ -184,7 +184,7 @@ margin-top: 10px;
                                     <i class="fa fa-list-alt bg-blue"></i>
                                     <div class="d-inline">	
                                         <h5>Provisional Retriement</h5>
-                                        <span>Department Entries</span>
+                                        <span>Pensioner Entries</span>
                                     </div>
                                 </div>
                             </div>
@@ -192,7 +192,7 @@ margin-top: 10px;
                                 <nav class="breadcrumb-container" aria-label="breadcrumb">
                                     <ol class="breadcrumb">
                                         <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
-                                        <li class="breadcrumb-item" aria-current="page">Department Entries</li>
+                                        <li class="breadcrumb-item" aria-current="page">Pensioner Entries</li>
                                         <li class="breadcrumb-item" aria-current="page">Completed</li>
                                         <li class="breadcrumb-item active" aria-current="page">Provisional Retriement</li>
                                     </ol>

frontend/pensioner/pensioner/forward/familypension.html

@@ -93,7 +93,7 @@
     cursor: pointer; /* Change cursor to hand symbol */
 }
 
-#returnretrieddetailsModal .modal-body{
+#returnfamilypensiondetailsModal .modal-body{
 	max-height:80vh;
 	overflow-y:auto; 
 }
@@ -267,7 +267,7 @@ margin-top: 10px;
 							<!--  Modal Box -->   
 	 
 			<div class="modal fade" id="returnfamilypensiondetailsModal" tabindex="-1" role="dialog" aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-			    <div class="modal-dialog modal-xl"  role="document">
+			    <div class="modal-dialog modal-lg"  role="document">
 			        <div class="modal-content">
 			            <div class="modal-header">
 			                <h5 class="modal-title" id="detailsModalLabel">
@@ -356,7 +356,7 @@ margin-top: 10px;
 			                    <!-- Remarks -->
 			                    <div class="col-md-12">
 			                        <label for="remarks_modal" class="form-label fw-bold">Comments/Remarks  </label>
-			                        <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea>
+			                        <textarea id="remarks_modal" class="form-control" rows="4"  readonly></textarea>
 			                    </div>
 			                    
 			                    

frontend/pensioner/pensioner/forward/pendency.html

@@ -94,7 +94,7 @@
     cursor: pointer; /* Change cursor to hand symbol */
 }
 
-#returnretrieddetailsModal .modal-body{
+#returnpendencydetailsModal .modal-body{
 	max-height:80vh;
 	overflow-y:auto; 
 }
@@ -270,7 +270,7 @@ margin-top: 10px;
 							<!--  Modal Box -->   
 	 
 			<div class="modal fade" id="returnpendencydetailsModal" tabindex="-1" role="dialog" aria-labelledby="detailsModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-			    <div class="modal-dialog modal-xl"  role="document">
+			    <div class="modal-dialog modal-lg"  role="document">
 			        <div class="modal-content">
 			            <div class="modal-header">
 			                <h5 class="modal-title" id="detailsModalLabel">
@@ -356,7 +356,7 @@ margin-top: 10px;
 			                    <!-- Remarks -->
 			                    <div class="col-md-12">
 			                        <label for="remarks_modal" class="form-label fw-bold">Comments/Remarks </label>
-			                        <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea>
+			                        <textarea id="remarks_modal" class="form-control" rows="4" readonly></textarea>
 			                    </div>
 			                    
 			                    

frontend/pensioner/pensioner/forward/retirement.html

@@ -241,7 +241,7 @@ margin-top: 10px;
                     <!-- Remarks -->
                     <div class="col-md-12">
                         <label for="remarks_modal" class="form-label fw-bold">Comments/Remarks  </label>
-                        <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea>
+                        <textarea id="remarks_modal" class="form-control" rows="4" readonly></textarea>
                     </div>
                     
                     <!-- new -->
@@ -409,7 +409,7 @@ margin-top: 10px;
 		 	               document.getElementById("submitbutton").addEventListener("click", function() {
 		 	          	       
 				 	            	 //$('#datefile').val('');
-				 	         	    $('#remarks').val('');
+				 	         	    //$('#remarks').val('');
 		 	          	            document.getElementById("receivedcard").style.display = "block";
 		 	          	        
 		 	          	    });

frontend/pensioner/pensioner/partial/familypension.html

@@ -264,20 +264,40 @@ margin-top: 10px;
 			                    </div>
 			                    
 			                    <div class="col-md-4">
-			                        <label for="retirementdate" class="form-label fw-bold">Retirement Date <span class="text-danger">*</span></label>
-			                        <input type="date" id="retirementdate" class="form-control" readonly>
+										    <label for="pendingDuration" class="form-label fw-bold">
+										        Pending Duration
+										         
+										    </label>
+										    <div class="d-flex align-items-center">
+										        <div class="form-check" style="padding-right:10px;">
+										            <input type="radio" id="yes" name="pendingDuration" value="yes"class="form-check-input" disabled>
+										            <label for="yes" class="form-check-label">Yes</label>
+										        </div>
+										        <div class="form-check">
+										            <input type="radio" id="no" name="pendingDuration" value="no"class="form-check-input" disabled>
+										            <label for="no" class="form-check-label">No</label>
+										        </div>
+										    </div>
+										    <div class="dropdown" id="pendingDurationInputContainer" style="display: none; margin-top: 10px;">
+										        <input type="text" id="pendingDurationInput" name="pendingDurationValue" class="form-control" readonly>
+										    </div>
+										</div>
+			                    
+			                     <!-- While in Service Death -->
+			                    <div class="col-md-4">
+			                        <label for="servicedeath" class="form-label fw-bold">While in Service Death  </label>
+			                       <!--  <input type="text" id="servicedeath" class="form-control" readonly> -->
+			                         <input type="date" id="servicedeath"  class="form-control" readonly>
 			                    </div>
 			                   
-			                    <!-- Class -->
 			                    <div class="col-md-4">
-			                        <label for="classes" class="form-label fw-bold">Class <span class="text-danger">*</span></label>
-			                        <input type="text" id="classes" class="form-control" readonly>
+			                        <label for="relationship" class="form-label fw-bold">Relationship of Deceased  </label>
+			                        <input type="text" id="relationship" class="form-control" readonly>
 			                    </div>
 			                    
-			                    <!-- Type of Retirement -->
 			                     <div class="col-md-4">
-			                        <label for="typeofretirement" class="form-label fw-bold">Type of Retirement <span class="text-danger">*</span></label>
-			                        <input type="text" id="typeofretirement" class="form-control" readonly>
+			                        <label for="sanctionedgis" class="form-label fw-bold">Sanctioned GIS </label>
+			                        <input type="text" id="sanctionedgis" class="form-control" readonly>
 			                    </div>
 			                    
 			                    <!-- Date File Sent to Audit -->
@@ -289,7 +309,7 @@ margin-top: 10px;
 			                    <!-- Remarks -->
 			                    <div class="col-md-12">
 			                        <label for="remarks_modal" class="form-label fw-bold">Comments/Remarks  <span class="text-danger">*</span></label>
-			                        <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea>
+			                        <textarea id="remarks_modal" class="form-control" rows="4" readonly></textarea>
 			                    </div>
 			                    
 			                    <!-- new -->
@@ -575,6 +595,7 @@ margin-top: 10px;
         
         // Set the value of the input field to the current date (in DD-MM-YYYY format for display)
         document.getElementById("datefile").value = formattedDateDisplay;
+        //document.getElementById("retirementdate").value = formattedDateDisplay;
 
         
     });
@@ -614,19 +635,38 @@ function convertDateFormat(dateString) {
 	 	            	let employeeDetails = response[0]; // Access the first object in the array
 	 	            	console.log("response:",response);
 	 	            	
-	 	            	
+	 	            	 //classes,typeofretirement
 	 	                // Populate modal fields
 	 	                $('#employeenomodel').val(employeeDetails.emp_no);
 	 	                $('#employeename').val(employeeDetails.emp_name);
 	 	                $('#department').val(employeeDetails.dept_name);
 	 	                $('#designation').val(employeeDetails.designation);
-	 	                $('#typeofretirement').val(employeeDetails.type_of_retirement);
+	 	                $('#relationship').val(employeeDetails.relationship_deceased);
+	 	                $('#servicedeath').val(employeeDetails.service_death);
 	 	                $('#classes').val(employeeDetails.retirement_class);
 	 	                $('#datefile_modal').val(employeeDetails.file_moved_date);
 	 	               	$('#remarks_modal').val(employeeDetails.remarks);
-	 	                $('#retirementdate').val(employeeDetails.retirement_date);
+	 	                $('#sanctionedgis').val(employeeDetails.sanctioned_gis_amount);
+	 	                
+	 	               
 	 	                
+	 	            // Show Pending Duration and Input based on the value
+	 	                let pendingDuration = employeeDetails.pending_duration; // Assuming this comes from the response
+	 	                let pendingReason = employeeDetails.reason_for_pending; // Assuming this comes from the response
 
+	 	                if (pendingDuration === "yes") {
+	 	                    $('#pendingDurationInputContainer').show(); // Show the text box
+	 	                    $('#pendingDurationInput').val(pendingReason); // Populate the input field
+	 	                } else {
+	 	                    $('#pendingDurationInputContainer').hide(); // Hide the text box
+	 	                }
+
+	 	                // Update radio button selection
+	 	                if (pendingDuration === "yes") {
+	 	                    $('#yes').prop('checked', true);
+	 	                } else {
+	 	                    $('#no').prop('checked', true);
+	 	                }
 	 	                // Update the modal title with the employee code
 	 	                $('#modalEmployeeCode').text(employeeDetails.emp_no);
 
@@ -737,7 +777,7 @@ function convertDateFormat(dateString) {
 	                        }
 	 	          	       
 			 	            	 //$('#datefile').val('');
-			 	         	    $('#remarks').val('');
+			 	         	    //$('#remarks').val('');
 	 	          	            document.getElementById("receivedcard").style.display = "block";
 	 	          	        
 	 	          	    });

frontend/pensioner/pensioner/partial/pendency.html

@@ -1,4 +1,4 @@
-f<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en" dir="">
 <html xmlns:th="http://www.thymeleaf.org">
 <head th:replace="~{fragments/modules/base/head :: head}"></head>
@@ -289,7 +289,7 @@ margin-top: 10px;
 			                    <!-- Remarks -->
 			                    <div class="col-md-12">
 			                        <label for="remarks_modal" class="form-label fw-bold">Comments/Remarks  <span class="text-danger">*</span></label>
-			                        <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea>
+			                        <textarea id="remarks_modal" class="form-control" rows="4"  readonly></textarea>
 			                    </div>
 			                    
 			                    <!-- new -->
@@ -737,7 +737,7 @@ function convertDateFormat(dateString) {
 	                        }
 	 	          	       
 			 	            	 //$('#datefile').val('');
-			 	         	    $('#remarks').val('');
+			 	         	    //$('#remarks').val('');
 	 	          	            document.getElementById("receivedcard").style.display = "block";
 	 	          	        
 	 	          	    });

frontend/pensioner/pensioner/partial/retirement.html

@@ -289,7 +289,7 @@ margin-top: 10px;
 			                    <!-- Remarks -->
 			                    <div class="col-md-12">
 			                        <label for="remarks_modal" class="form-label fw-bold">Comments/Remarks  <span class="text-danger">*</span></label>
-			                        <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea>
+			                        <textarea id="remarks_modal" class="form-control" rows="4"  readonly></textarea>
 			                    </div>
 			                    
 			                    <!-- new -->
@@ -737,7 +737,7 @@ function convertDateFormat(dateString) {
 	                        }
 	 	          	       
 			 	            	 //$('#datefile').val('');
-			 	         	    $('#remarks').val('');
+			 	         	   // $('#remarks').val('');
 	 	          	            document.getElementById("receivedcard").style.display = "block";
 	 	          	        
 	 	          	    });

frontend/pensioner/pensioner/received/familypension.html

@@ -120,7 +120,7 @@ margin-top: 10px;
                                     <ol class="breadcrumb">
                                         <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
                                         <li class="breadcrumb-item" aria-current="page">Pensioner Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Received From Pension</li>
+                                        <li class="breadcrumb-item" aria-current="page">Received From Department</li>
                                         <li class="breadcrumb-item active" aria-current="page">Family Pension</li>
                                     </ol>
                                 </nav>
@@ -365,7 +365,7 @@ margin-top: 10px;
                     <!-- Remarks -->
                     <div class="col-md-12">
                         <label for="remarks_modal" class="form-label fw-bold">Comments/Remarks  </label>
-                        <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea>
+                        <textarea id="remarks_modal" class="form-control" rows="4"  readonly></textarea>
                     </div>
                     </div>
                     

frontend/pensioner/pensioner/received/gis.html

@@ -130,8 +130,8 @@ margin-top: 10px;
                                     <ol class="breadcrumb">
                                         <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
                                         <li class="breadcrumb-item" aria-current="page">Pensioner Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Audit</li>
-                                        <li class="breadcrumb-item active" aria-current="page">Retirement</li>
+                                        <li class="breadcrumb-item" aria-current="page">Received From Department</li>
+                                        <li class="breadcrumb-item active" aria-current="page">GIS</li>
                                     </ol>
                                 </nav>
                             </div>
@@ -283,7 +283,7 @@ margin-top: 10px;
 			                    <!-- Remarks -->
 			                    <div class="col-md-12">
 			                        <label for="remarks_modal" class="form-label fw-bold">Comments/Remarks  </label>
-			                        <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea>
+			                        <textarea id="remarks_modal" class="form-control" rows="4" readonly></textarea>
 			                    </div>
 			                    
 			                    <!-- new -->
@@ -473,7 +473,7 @@ margin-top: 10px;
 			 	               document.getElementById("submitbutton").addEventListener("click", function() {
 			 	          	       
 					 	            	 //$('#datefile').val('');
-					 	         	    $('#remarks').val('');
+					 	         	    //$('#remarks').val('');
 			 	          	            document.getElementById("receivedcard").style.display = "block";
 			 	          	        
 			 	          	    });

frontend/pensioner/pensioner/received/pendency.html

@@ -120,7 +120,7 @@ margin-top: 10px;
                                     <ol class="breadcrumb">
                                         <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
                                         <li class="breadcrumb-item" aria-current="page">Pensioner Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Received From Pension</li>
+                                        <li class="breadcrumb-item" aria-current="page">Received From Department</li>
                                         <li class="breadcrumb-item active" aria-current="page">Pendency</li>
                                     </ol>
                                 </nav>
@@ -133,7 +133,7 @@ margin-top: 10px;
                     <div class="col-md-12">
 					    <div class="card">
 					        <div class="card-block">
-					        <h5 style="font-weight:bold;">Received From Department - Family Pension</h5>
+					        <h5 style="font-weight:bold;">Received From Department - Pendency</h5>
 							<h5 style="font-weight:bold;"><span th:text="${deptId}" id="deptId" style="display:none"></span></h5>
 					        <span th:text="${userId}" id="userId" style="display:none"></span>	
 					            <div  id="returnretriedtable">
@@ -224,12 +224,12 @@ margin-top: 10px;
                         <input type="text" id="designation" class="form-control" readonly>
                     </div>
                     
-                    <div class="col-md-6">
+                    <div class="col-md-4">
 	                        <label for="classes" class="form-label fw-bold">Class</label>
 	                        <input type="text" id="classes" class="form-control" readonly>
 	                    </div>
 	                    
-	                    <div class="col-md-6">
+	                    <div class="col-md-4">
 	                        <label for="retirementdate" class="form-label fw-bold">Retirement Date </label>
 	                        <input type="date" id="retirementdate" class="form-control" readonly>
 	                    </div>
@@ -359,7 +359,7 @@ margin-top: 10px;
                     <!-- Remarks -->
                     <div class="col-md-12">
                         <label for="remarks_modal" class="form-label fw-bold">Remarks </label>
-                        <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea>
+                        <textarea id="remarks_modal" class="form-control" rows="4"  readonly></textarea>
                     </div>
                     </div>
                     

frontend/pensioner/pensioner/received/provisionalretirement.html

@@ -193,7 +193,7 @@ margin-top: 10px;
                                     <ol class="breadcrumb">
                                         <li class="breadcrumb-item"><a href="/gcc/index"><i class="ik ik-home"></i></a></li>
                                         <li class="breadcrumb-item" aria-current="page">Pensioner Entries</li>
-                                        <li class="breadcrumb-item" aria-current="page">Received From Pension</li>
+                                        <li class="breadcrumb-item" aria-current="page">Received From Department</li>
                                         <li class="breadcrumb-item active" aria-current="page">Provisional Retriement</li>
                                     </ol>
                                 </nav>
@@ -371,7 +371,7 @@ margin-top: 10px;
 		                    <!-- Remarks -->
 		                    <div class="col-md-12">
 		                        <label for="remarks_modal" class="form-label fw-bold">Comments/Remarks </label>
-		                        <textarea id="remarks_modal" class="form-control" rows="2" placeholder="Enter your remarks here" readonly></textarea>
+		                        <textarea id="remarks_modal" class="form-control" rows="2"  readonly></textarea>
 		                    </div>
 		                    
 		                    <!-- new -->
@@ -732,7 +732,7 @@ margin-top: 10px;
 		 	               document.getElementById("submitbutton").addEventListener("click", function() {
 		 	          	       
 				 	            	// $('#datefile').val('');
-				 	         	    $('#remarks').val('');
+				 	         	    //$('#remarks').val('');
 		 	          	            document.getElementById("receivedcard").style.display = "block";
 		 	          	        
 		 	          	    });

frontend/pensioner/pensioner/received/retirement.html

@@ -337,7 +337,7 @@ margin-top: 10px;
                     <!-- Remarks -->
                     <div class="col-md-12">
                         <label for="remarks_modal" class="form-label fw-bold">Comments/Remarks  </label>
-                        <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea>
+                        <textarea id="remarks_modal" class="form-control" rows="4" s readonly></textarea>
                     </div>
                     </div>
                     

frontend/pensioner/pensioner/reports.html

@@ -210,7 +210,7 @@ td, th {
 										</div>
 									
 									<div class="col-md-3" id="categoryDiv1" style="display: none;">
-										    <label for="typeofcategory1" class="form-label fw-bold">Type of Category</label>
+										    <label for="typeofcategory1" class="form-label fw-bold">Type of Category<span class="text-danger">*</span></label>
 										    <select id="typeofcategory1" class="form-control" style="width: 100%;">
 										        <option value="" selected>-- Select Category --</option>
 										    </select>
@@ -757,7 +757,21 @@ td, th {
 		            { title: "Pending Duration", data: "reason_for_pending", className: "text-center" },
 		            { title: "File Status", data: "fst", className: "text-center" },
 		            { title: "File Category", data: "file_category_name", className: "text-center" },
-		            { title: "File Moved Date", data: "created_date", className: "text-center" },
+		            { 
+		                title: "File Moved Date", 
+		                data: "created_date", 
+		                className: "text-center",
+		                render: function(data, type, row) {
+		                    if (data) {
+		                        let date = new Date(data);
+		                        let day = String(date.getDate()).padStart(2, '0');
+		                        let month = String(date.getMonth() + 1).padStart(2, '0');
+		                        let year = date.getFullYear();
+		                        return `${day}-${month}-${year}`;
+		                    }
+		                    return "";
+		                }
+		            },
 		            { title: "Comments/Remarks", data: "remarks", className: "text-center" },
 	            
 	        ]
@@ -832,10 +846,39 @@ td, th {
 		            { title: "Department", data: "dept_name", className: "text-center" },
 		            { title: "Designation", data: "designation", className: "text-center" },
 		            { title: "Type of Retirement", data: "type_of_retirement", className: "text-center" },
-		            { title: "Date of Retirement", data: "retirement_date", className: "text-center" },
+		            { 
+		            	title: "Date of Retirement", 
+		            	data: "retirement_date", 
+		            	className: "text-center",
+		            	 render: function(data, type, row) {
+			                    if (data) {
+			                        let date = new Date(data);
+			                        let day = String(date.getDate()).padStart(2, '0');
+			                        let month = String(date.getMonth() + 1).padStart(2, '0');
+			                        let year = date.getFullYear();
+			                        return `${day}-${month}-${year}`;
+			                    }
+			                    return "";
+			                }
+		            	
+		            },
 		            { title: "File Status", data: "fst", className: "text-center" },
 		            { title: "File Category", data: "file_category_name", className: "text-center" },
-		            { title: "File Moved Date", data: "file_moved_date", className: "text-center" },
+		            { 
+		                title: "File Moved Date", 
+		                data: "file_moved_date", 
+		                className: "text-center",
+		                render: function(data, type, row) {
+		                    if (data) {
+		                        let date = new Date(data);
+		                        let day = String(date.getDate()).padStart(2, '0');
+		                        let month = String(date.getMonth() + 1).padStart(2, '0');
+		                        let year = date.getFullYear();
+		                        return `${day}-${month}-${year}`;
+		                    }
+		                    return "";
+		                }
+		            },
 		            { title: "Comments/Remarks", data: "remarks", className: "text-center" },
 	            
 	        ]
@@ -909,12 +952,40 @@ td, th {
 		            { title: "Name", data: "emp_name", className: "text-center" },
 		            { title: "Department", data: "dept_name", className: "text-center" },
 		            { title: "Designation", data: "designation", className: "text-center" },
-		            { title: "Service Death Date", data: "service_death", className: "text-center" },
+		            { 
+		                title: "Service Death Date", 
+		                data: "service_death", 
+		                className: "text-center",
+		                render: function(data, type, row) {
+		                    if (data) {
+		                        let date = new Date(data);
+		                        let day = String(date.getDate()).padStart(2, '0');
+		                        let month = String(date.getMonth() + 1).padStart(2, '0');
+		                        let year = date.getFullYear();
+		                        return `${day}-${month}-${year}`;
+		                    }
+		                    return "";
+		                }
+		            },
 		            { title: "Relationship Type", data: "relationship_deceased", className: "text-center" },
 		            { title: "Pending Duration", data: "reason_for_pending", className: "text-center" },
 		            { title: "File Status", data: "fst", className: "text-center" },
 		            { title: "File Category", data: "file_category_name", className: "text-center" },
-		            { title: "File Moved Date", data: "file_moved_date", className: "text-center" },
+		            { 
+		                title: "File Moved Date", 
+		                data: "file_moved_date", 
+		                className: "text-center",
+		                render: function(data, type, row) {
+		                    if (data) {
+		                        let date = new Date(data);
+		                        let day = String(date.getDate()).padStart(2, '0');
+		                        let month = String(date.getMonth() + 1).padStart(2, '0');
+		                        let year = date.getFullYear();
+		                        return `${day}-${month}-${year}`;
+		                    }
+		                    return "";
+		                }
+		            },
 		            { title: "Comments/Remarks", data: "remarks", className: "text-center" },
 	            
 	        ]
@@ -989,11 +1060,40 @@ td, th {
 		            { title: "Department", data: "dept_name", className: "text-center" },
 		            { title: "Designation", data: "designation", className: "text-center" },
 		            { title: "Type of Retirement", data: "type_of_retirement", className: "text-center" },
-		            { title: "Date of Retirement", data: "retirement_date", className: "text-center" },
+		            { 
+		            	title: "Date of Retirement", 
+		            	data: "retirement_date", 
+		            	className: "text-center",
+		            	 render: function(data, type, row) {
+			                    if (data) {
+			                        let date = new Date(data);
+			                        let day = String(date.getDate()).padStart(2, '0');
+			                        let month = String(date.getMonth() + 1).padStart(2, '0');
+			                        let year = date.getFullYear();
+			                        return `${day}-${month}-${year}`;
+			                    }
+			                    return "";
+			                }
+		            	
+		            },
 		            { title: "Pending Duration", data: "reason_for_pending", className: "text-center" },
 		            { title: "File Status", data: "fst", className: "text-center" },
 		            { title: "File Category", data: "file_category_name", className: "text-center" },
-		            { title: "File Moved Date", data: "file_moved_date", className: "text-center" },
+		            { 
+		                title: "File Moved Date", 
+		                data: "file_moved_date", 
+		                className: "text-center",
+		                render: function(data, type, row) {
+		                    if (data) {
+		                        let date = new Date(data);
+		                        let day = String(date.getDate()).padStart(2, '0');
+		                        let month = String(date.getMonth() + 1).padStart(2, '0');
+		                        let year = date.getFullYear();
+		                        return `${day}-${month}-${year}`;
+		                    }
+		                    return "";
+		                }
+		            },
 		            { title: "Comments/Remarks", data: "remarks", className: "text-center" },
 	            
 	        ]
@@ -1067,11 +1167,39 @@ td, th {
 		            { title: "Name", data: "emp_name", className: "text-center" },
 		            { title: "Department", data: "dept_name", className: "text-center" },
 		            { title: "Designation", data: "designation", className: "text-center" },
-		            { title: "Service Death Date", data: "service_death", className: "text-center" },
+		            { 
+		                title: "Service Death Date", 
+		                data: "service_death", 
+		                className: "text-center",
+		                render: function(data, type, row) {
+		                    if (data) {
+		                        let date = new Date(data);
+		                        let day = String(date.getDate()).padStart(2, '0');
+		                        let month = String(date.getMonth() + 1).padStart(2, '0');
+		                        let year = date.getFullYear();
+		                        return `${day}-${month}-${year}`;
+		                    }
+		                    return "";
+		                }
+		            },
 		            { title: "Sanctioned Amount", data: "sanctional_gis_amount", className: "text-center" },
 		            { title: "File Status", data: "fst", className: "text-center" },
 		            { title: "File Category", data: "file_category_name", className: "text-center" },
-		            { title: "File Moved Date", data: "file_moved_date", className: "text-center" },
+		            { 
+		                title: "File Moved Date", 
+		                data: "file_moved_date", 
+		                className: "text-center",
+		                render: function(data, type, row) {
+		                    if (data) {
+		                        let date = new Date(data);
+		                        let day = String(date.getDate()).padStart(2, '0');
+		                        let month = String(date.getMonth() + 1).padStart(2, '0');
+		                        let year = date.getFullYear();
+		                        return `${day}-${month}-${year}`;
+		                    }
+		                    return "";
+		                }
+		            },
 		            { title: "Comments/Remarks", data: "remarks", className: "text-center" },
 	            
 	        ]
@@ -1146,10 +1274,39 @@ td, th {
 		            { title: "Department", data: "dept_name", className: "text-center" },
 		            { title: "Designation", data: "designation", className: "text-center" },
 		            { title: "Type of Retirement", data: "type_of_retirement", className: "text-center" },
-		            { title: "Date of Retirement", data: "retirement_date", className: "text-center" },
+		            { 
+		            	title: "Date of Retirement", 
+		            	data: "retirement_date", 
+		            	className: "text-center",
+		            	 render: function(data, type, row) {
+			                    if (data) {
+			                        let date = new Date(data);
+			                        let day = String(date.getDate()).padStart(2, '0');
+			                        let month = String(date.getMonth() + 1).padStart(2, '0');
+			                        let year = date.getFullYear();
+			                        return `${day}-${month}-${year}`;
+			                    }
+			                    return "";
+			                }
+		            	
+		            },
 		            { title: "File Category", data: "file_category_name", className: "text-center" },
 		            { title: "File Status", data: "fst", className: "text-center" },
-		            { title: "File Moved Date", data: "file_moved_date", className: "text-center" },
+		            { 
+		                title: "File Moved Date", 
+		                data: "file_moved_date", 
+		                className: "text-center",
+		                render: function(data, type, row) {
+		                    if (data) {
+		                        let date = new Date(data);
+		                        let day = String(date.getDate()).padStart(2, '0');
+		                        let month = String(date.getMonth() + 1).padStart(2, '0');
+		                        let year = date.getFullYear();
+		                        return `${day}-${month}-${year}`;
+		                    }
+		                    return "";
+		                }
+		            },
 		            { title: "Comments/Remarks", data: "remarks", className: "text-center" },
 	            
 	        ]
@@ -1315,6 +1472,16 @@ td, th {
 	        }
 	        
 	        
+	        if (typeOfReport === "Abstract" && typeOfCategory1 === "") {
+	            Swal.fire({
+	                icon: "warning",
+	                title: "Validation Error",
+	                text: "Please select a Category for Abstract report.",
+	                confirmButtonText: "OK"
+	            });
+	            return;
+	        }
+	       
 
 	        if (typeOfReport === "Detailed" && typeOfCategory === "") {
 	            Swal.fire({

gcc_pensioner_emptyDump/gcc_pensioner_cps_pensioner_details.sql

@@ -1,74 +0,0 @@
--- MySQL dump 10.13  Distrib 8.0.40, for Win64 (x86_64)
---
--- Host: localhost    Database: gcc_pensioner
--- ------------------------------------------------------
--- Server version	8.0.40
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!50503 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `cps_pensioner_details`
---
-
-DROP TABLE IF EXISTS `cps_pensioner_details`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `cps_pensioner_details` (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `emp_no` varchar(20) NOT NULL,
-  `emp_name` varchar(30) NOT NULL,
-  `dept_id` int NOT NULL,
-  `dept_name` varchar(30) NOT NULL,
-  `designation` varchar(30) NOT NULL,
-  `file_category` int NOT NULL,
-  `file_category_name` varchar(70) DEFAULT NULL,
-  `retirement_class` varchar(10) DEFAULT NULL,
-  `type_of_retirement` varchar(30) DEFAULT NULL,
-  `remarks` text,
-  `file_status` int NOT NULL,
-  `file_entry_type` varchar(20) NOT NULL,
-  `uac` varchar(20) DEFAULT NULL,
-  `uac_date` date DEFAULT NULL,
-  `pending_duration` varchar(30) DEFAULT NULL,
-  `reason_for_pending` varchar(255) DEFAULT NULL,
-  `cps` varchar(20) DEFAULT NULL,
-  `cps_amount` decimal(15,2) DEFAULT NULL,
-  `el_or_lpa` varchar(20) DEFAULT NULL,
-  `el_or_lpa_amount` decimal(15,2) DEFAULT NULL,
-  `spfgs` varchar(20) DEFAULT NULL,
-  `spfgs_amount` decimal(15,2) DEFAULT NULL,
-  `created_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `updated_date` varchar(45) DEFAULT NULL,
-  `temp_id` varchar(45) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `cps_pensioner_details`
---
-
-LOCK TABLES `cps_pensioner_details` WRITE;
-/*!40000 ALTER TABLE `cps_pensioner_details` DISABLE KEYS */;
-/*!40000 ALTER TABLE `cps_pensioner_details` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2025-02-06 16:33:03

gcc_pensioner_emptyDump/gcc_pensioner_cps_pensioner_details_history.sql

@@ -1,74 +0,0 @@
--- MySQL dump 10.13  Distrib 8.0.40, for Win64 (x86_64)
---
--- Host: localhost    Database: gcc_pensioner
--- ------------------------------------------------------
--- Server version	8.0.40
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!50503 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `cps_pensioner_details_history`
---
-
-DROP TABLE IF EXISTS `cps_pensioner_details_history`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `cps_pensioner_details_history` (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `emp_no` varchar(20) NOT NULL,
-  `emp_name` varchar(30) NOT NULL,
-  `dept_id` int NOT NULL,
-  `dept_name` varchar(30) NOT NULL,
-  `designation` varchar(30) NOT NULL,
-  `file_category` int NOT NULL,
-  `file_category_name` varchar(70) DEFAULT NULL,
-  `retirement_class` varchar(10) DEFAULT NULL,
-  `type_of_retirement` varchar(30) DEFAULT NULL,
-  `remarks` text,
-  `file_status` int NOT NULL,
-  `file_entry_type` varchar(20) DEFAULT NULL,
-  `file_moved_by` varchar(20) NOT NULL,
-  `uac` varchar(20) DEFAULT NULL,
-  `uac_date` date DEFAULT NULL,
-  `pending_duration` varchar(30) DEFAULT NULL,
-  `reason_for_pending` varchar(255) DEFAULT NULL,
-  `cps` varchar(20) DEFAULT NULL,
-  `cps_amount` decimal(15,2) DEFAULT NULL,
-  `el_or_lpa` varchar(20) DEFAULT NULL,
-  `el_or_lpa_amount` decimal(15,2) DEFAULT NULL,
-  `spfgs` varchar(20) DEFAULT NULL,
-  `spfgs_amount` decimal(15,2) DEFAULT NULL,
-  `created_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `temp_id` varchar(45) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `cps_pensioner_details_history`
---
-
-LOCK TABLES `cps_pensioner_details_history` WRITE;
-/*!40000 ALTER TABLE `cps_pensioner_details_history` DISABLE KEYS */;
-/*!40000 ALTER TABLE `cps_pensioner_details_history` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2025-02-06 16:33:03

gcc_pensioner_emptyDump/gcc_pensioner_department_master.sql

@@ -1,55 +0,0 @@
--- MySQL dump 10.13  Distrib 8.0.40, for Win64 (x86_64)
---
--- Host: localhost    Database: gcc_pensioner
--- ------------------------------------------------------
--- Server version	8.0.40
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!50503 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `department_master`
---
-
-DROP TABLE IF EXISTS `department_master`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `department_master` (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `dept_id` int NOT NULL,
-  `dept_name` varchar(70) NOT NULL,
-  `isactive` tinyint(1) NOT NULL DEFAULT '1',
-  `isdelete` tinyint(1) NOT NULL DEFAULT '0',
-  `created_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=59 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `department_master`
---
-
-LOCK TABLES `department_master` WRITE;
-/*!40000 ALTER TABLE `department_master` DISABLE KEYS */;
-INSERT INTO `department_master` VALUES (1,1,'A-Accounts Central Cell',1,0,'2025-01-08 08:57:10'),(2,2,'J-Bridges',1,0,'2025-01-08 08:58:02'),(3,3,'B-Buildings',1,0,'2025-01-08 09:06:02'),(4,4,'BR-Bus Route Roads',1,0,'2025-01-08 09:06:02'),(5,5,'X-Chief Engineer Office',1,0,'2025-01-08 09:06:02'),(6,6,'C-Council',1,0,'2025-01-08 09:06:02'),(7,7,'HD-District Family Welfare',1,0,'2025-01-08 09:06:02'),(8,8,'E-Education',1,0,'2025-01-08 09:06:02'),(9,9,'L-Electrical',1,0,'2025-01-08 09:06:02'),(10,10,'G-General',1,0,'2025-01-08 09:06:02'),(11,11,'H-Health',1,0,'2025-01-08 09:12:46'),(12,12,'V-Land and Estate',1,0,'2025-01-08 09:12:46'),(13,13,'Y-Legal Cell',1,0,'2025-01-08 09:12:46'),(14,14,'M-Mechanical',1,0,'2025-01-08 09:12:46'),(15,15,'P-Parks and Playfields',1,0,'2025-01-08 09:12:46'),(16,16,'R-Revenue',1,0,'2025-01-08 09:12:46'),(17,17,'Q-Solid Waste Management',1,0,'2025-01-08 09:12:46'),(18,18,'D-Storm Water Drains',1,0,'2025-01-08 09:12:46'),(19,19,'T-Taxation Appeals Committee',1,0,'2025-01-08 09:12:46'),(20,20,'W-Works',1,0,'2025-01-08 09:12:46'),(21,21,'FA-Zone 1',1,0,'2025-01-08 09:15:21'),(22,22,'FB-Zone 2',1,0,'2025-01-08 09:19:47'),(23,23,'FC-Zone 3',1,0,'2025-01-08 09:23:05'),(24,24,'FD-Zone 4',1,0,'2025-01-08 09:23:05'),(25,25,'FE-Zone 5',1,0,'2025-01-08 09:23:05'),(26,26,'FF-Zone 6',1,0,'2025-01-08 09:23:05'),(27,27,'FG-Zone 7',1,0,'2025-01-08 09:23:05'),(28,28,'FH-Zone 8',1,0,'2025-01-08 09:23:05'),(29,29,'FJ-Zone 9',1,0,'2025-01-08 09:23:05'),(30,30,'FK-Zone 10',1,0,'2025-01-08 09:23:05'),(31,31,'Z-Education-Elementary',1,0,'2025-01-08 09:31:08'),(32,32,'NA-THIRUVOTTIYUR',1,0,'2025-01-08 09:31:08'),(33,33,'NB-MANALI',1,0,'2025-01-08 09:31:08'),(34,34,'NC-MADHAVARAM',1,0,'2025-01-08 09:31:08'),(35,35,'ND-TONDIARPET',1,0,'2025-01-08 09:31:08'),(36,36,'NE-ROYAPURAM',1,0,'2025-01-08 09:31:08'),(37,37,'NF-THIRU-VI-KA NAGAR',1,0,'2025-01-08 09:31:08'),(38,38,'NG-AMBATTUR',1,0,'2025-01-08 09:31:08'),(39,39,'NH-ANNA NAGAR',1,0,'2025-01-08 09:31:08'),(40,40,'NJ-TEYNAMPET',1,0,'2025-01-08 09:31:08'),(41,41,'NK-KODAMBAKKAM',1,0,'2025-01-08 09:31:08'),(42,42,'NL-VALASARAVAKKAM',1,0,'2025-01-08 09:31:08'),(43,43,'NM-ALANDUR',1,0,'2025-01-08 09:31:08'),(44,44,'NN-ADYAR',1,0,'2025-01-08 09:31:08'),(45,45,'NP-PERUNGUDI',1,0,'2025-01-08 09:31:08'),(46,46,'NQ-SHOZHINGANALLUR',1,0,'2025-01-08 09:31:08'),(47,48,'RN-Regional office - North',1,0,'2025-01-08 09:31:08'),(48,49,'RS-Regional office - South',1,0,'2025-01-08 09:31:08'),(49,50,'RC-Regional office - Central',1,0,'2025-01-08 09:31:08'),(50,51,'S-Chief Engineer Office (SWD, BRR, SP)',1,0,'2025-01-08 10:16:00'),(51,52,'K-Chief Engineer Office - SWM',1,0,'2025-01-08 10:16:20'),(52,53,'SP-SPECIAL PROJECTS',1,0,'2025-01-08 10:16:23'),(53,54,'PT - PLANNING AND TRAINING',1,0,'2025-01-08 10:16:25'),(54,55,'JP-Chief Engineer Office (Buildings, Bridges and Planning)',1,0,'2025-01-08 10:16:28'),(55,56,'CP-Chief Engineer Office - Parks',1,0,'2025-01-08 10:16:30'),(56,57,'CL-Chief Engineer Office - Electrical',1,0,'2025-01-08 10:16:31'),(57,58,'EL-ELECTION',1,0,'2025-01-08 10:21:56'),(58,2000,'Pensioner',1,0,'2025-01-22 09:15:27');
-/*!40000 ALTER TABLE `department_master` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2025-02-06 16:33:02

gcc_pensioner_emptyDump/gcc_pensioner_file_category_master.sql

@@ -1,54 +0,0 @@
--- MySQL dump 10.13  Distrib 8.0.40, for Win64 (x86_64)
---
--- Host: localhost    Database: gcc_pensioner
--- ------------------------------------------------------
--- Server version	8.0.40
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!50503 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `file_category_master`
---
-
-DROP TABLE IF EXISTS `file_category_master`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `file_category_master` (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `file_name` varchar(255) NOT NULL,
-  `isactive` tinyint(1) NOT NULL DEFAULT '1',
-  `isdelete` tinyint(1) NOT NULL DEFAULT '0',
-  `created_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `file_category_master`
---
-
-LOCK TABLES `file_category_master` WRITE;
-/*!40000 ALTER TABLE `file_category_master` DISABLE KEYS */;
-INSERT INTO `file_category_master` VALUES (1,'Retirement',1,0,'2025-01-20 07:02:29'),(2,'Family Pension',1,0,'2025-01-20 07:02:29'),(3,'Pendency',1,0,'2025-01-20 07:02:29'),(4,'GIS',1,0,'2025-01-20 07:02:29'),(5,'Provisional Retirement',1,0,'2025-01-20 07:02:29'),(6,'Contributory Pension Scheme',1,0,'2025-01-20 07:02:29');
-/*!40000 ALTER TABLE `file_category_master` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2025-02-06 16:33:04

gcc_pensioner_emptyDump/gcc_pensioner_file_movement_history.sql

@@ -1,56 +0,0 @@
--- MySQL dump 10.13  Distrib 8.0.40, for Win64 (x86_64)
---
--- Host: localhost    Database: gcc_pensioner
--- ------------------------------------------------------
--- Server version	8.0.40
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!50503 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `file_movement_history`
---
-
-DROP TABLE IF EXISTS `file_movement_history`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `file_movement_history` (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `temp_id` varchar(45) NOT NULL,
-  `emp_no` varchar(30) NOT NULL,
-  `file_moved_date` date NOT NULL,
-  `file_status` varchar(40) NOT NULL,
-  `file_moved_by` varchar(20) NOT NULL,
-  `remarks` text,
-  `created_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `file_movement_history`
---
-
-LOCK TABLES `file_movement_history` WRITE;
-/*!40000 ALTER TABLE `file_movement_history` DISABLE KEYS */;
-/*!40000 ALTER TABLE `file_movement_history` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2025-02-06 16:33:03

gcc_pensioner_emptyDump/gcc_pensioner_file_status_master.sql

@@ -1,54 +0,0 @@
--- MySQL dump 10.13  Distrib 8.0.40, for Win64 (x86_64)
---
--- Host: localhost    Database: gcc_pensioner
--- ------------------------------------------------------
--- Server version	8.0.40
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!50503 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `file_status_master`
---
-
-DROP TABLE IF EXISTS `file_status_master`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `file_status_master` (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `file_status` varchar(60) NOT NULL,
-  `isactive` tinyint(1) NOT NULL DEFAULT '1',
-  `isdelete` tinyint(1) NOT NULL DEFAULT '0',
-  `created_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `file_status_master`
---
-
-LOCK TABLES `file_status_master` WRITE;
-/*!40000 ALTER TABLE `file_status_master` DISABLE KEYS */;
-INSERT INTO `file_status_master` VALUES (1,'Sent to Audit',1,0,'2025-01-08 11:07:32'),(2,'Returned From Audit',1,0,'2025-01-08 11:14:08'),(3,'Rectify and Sent to Audit',1,0,'2025-01-08 11:14:08'),(4,'Audit Certified',1,0,'2025-01-08 11:14:08'),(5,'File Forwarded to Department',1,0,'2025-01-08 11:28:21'),(6,'Returned to Department',1,0,'2025-01-08 11:28:21'),(7,'File Forwarded to Pension',1,0,'2025-01-08 11:28:21'),(8,'Pension Pending',1,0,'2025-01-08 11:28:21'),(9,'File in Department to complete pending values',1,0,'2025-01-08 11:28:21'),(10,'File in Pension to complete pending values',1,0,'2025-01-08 11:28:21'),(11,'File Completed',1,0,'2025-01-08 11:28:21');
-/*!40000 ALTER TABLE `file_status_master` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2025-02-06 16:33:04

gcc_pensioner_emptyDump/gcc_pensioner_login_details.sql

@@ -1,53 +0,0 @@
--- MySQL dump 10.13  Distrib 8.0.40, for Win64 (x86_64)
---
--- Host: localhost    Database: gcc_pensioner
--- ------------------------------------------------------
--- Server version	8.0.40
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!50503 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `login_details`
---
-
-DROP TABLE IF EXISTS `login_details`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `login_details` (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `gcc_login_id` int NOT NULL,
-  `emp_dept_id` int NOT NULL,
-  `created_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `login_details`
---
-
-LOCK TABLES `login_details` WRITE;
-/*!40000 ALTER TABLE `login_details` DISABLE KEYS */;
-INSERT INTO `login_details` VALUES (1,14,1,'2025-01-08 12:51:50'),(2,15,2,'2025-01-08 12:51:50'),(3,16,2,'2025-01-22 09:20:51');
-/*!40000 ALTER TABLE `login_details` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2025-02-06 16:33:02

gcc_pensioner_emptyDump/gcc_pensioner_pension_benefits.sql

@@ -1,62 +0,0 @@
--- MySQL dump 10.13  Distrib 8.0.40, for Win64 (x86_64)
---
--- Host: localhost    Database: gcc_pensioner
--- ------------------------------------------------------
--- Server version	8.0.40
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!50503 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `pension_benefits`
---
-
-DROP TABLE IF EXISTS `pension_benefits`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `pension_benefits` (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `emp_no` varchar(20) NOT NULL,
-  `temp_id` varchar(45) NOT NULL,
-  `file_pending` varchar(30) DEFAULT NULL,
-  `pension_number` varchar(30) DEFAULT NULL,
-  `ledger_number` varchar(30) DEFAULT NULL,
-  `benefit_pension` varchar(30) DEFAULT NULL,
-  `benefit_pension_amount` decimal(15,2) DEFAULT NULL,
-  `benefit_dcrg` varchar(30) DEFAULT NULL,
-  `benefit_dcrg_amount` decimal(15,2) DEFAULT NULL,
-  `benefit_commutation` varchar(30) DEFAULT NULL,
-  `benefit_commutation_amount` decimal(15,2) DEFAULT NULL,
-  `created_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `updated_date` varchar(45) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `pension_benefits`
---
-
-LOCK TABLES `pension_benefits` WRITE;
-/*!40000 ALTER TABLE `pension_benefits` DISABLE KEYS */;
-/*!40000 ALTER TABLE `pension_benefits` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2025-02-06 16:33:04

gcc_pensioner_emptyDump/gcc_pensioner_pension_benefits_history.sql

@@ -1,62 +0,0 @@
--- MySQL dump 10.13  Distrib 8.0.40, for Win64 (x86_64)
---
--- Host: localhost    Database: gcc_pensioner
--- ------------------------------------------------------
--- Server version	8.0.40
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!50503 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `pension_benefits_history`
---
-
-DROP TABLE IF EXISTS `pension_benefits_history`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `pension_benefits_history` (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `emp_no` varchar(20) NOT NULL,
-  `temp_id` varchar(45) NOT NULL,
-  `file_pending` varchar(30) DEFAULT NULL,
-  `pension_number` varchar(30) DEFAULT NULL,
-  `ledger_number` varchar(30) DEFAULT NULL,
-  `benefit_pension` varchar(30) DEFAULT NULL,
-  `benefit_pension_amount` decimal(15,2) DEFAULT NULL,
-  `benefit_dcrg` varchar(30) DEFAULT NULL,
-  `benefit_dcrg_amount` decimal(15,2) DEFAULT NULL,
-  `benefit_commutation` varchar(30) DEFAULT NULL,
-  `benefit_commutation_amount` decimal(15,2) DEFAULT NULL,
-  `file_moved_by` varchar(20) NOT NULL,
-  `created_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `pension_benefits_history`
---
-
-LOCK TABLES `pension_benefits_history` WRITE;
-/*!40000 ALTER TABLE `pension_benefits_history` DISABLE KEYS */;
-/*!40000 ALTER TABLE `pension_benefits_history` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2025-02-06 16:33:04

gcc_pensioner_emptyDump/gcc_pensioner_pensioner_details.sql

@@ -1,81 +0,0 @@
--- MySQL dump 10.13  Distrib 8.0.40, for Win64 (x86_64)
---
--- Host: localhost    Database: gcc_pensioner
--- ------------------------------------------------------
--- Server version	8.0.40
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!50503 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `pensioner_details`
---
-
-DROP TABLE IF EXISTS `pensioner_details`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `pensioner_details` (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `emp_no` varchar(20) NOT NULL,
-  `emp_name` varchar(30) NOT NULL,
-  `dept_id` int NOT NULL,
-  `dept_name` varchar(30) NOT NULL,
-  `designation` varchar(30) NOT NULL,
-  `file_category` int NOT NULL,
-  `file_category_name` varchar(70) DEFAULT NULL,
-  `retirement_date` date DEFAULT NULL,
-  `retirement_class` varchar(10) DEFAULT NULL,
-  `type_of_retirement` varchar(30) DEFAULT NULL,
-  `file_moved_date` date DEFAULT NULL,
-  `remarks` text,
-  `file_status` int NOT NULL,
-  `file_entry_type` varchar(20) NOT NULL,
-  `service_death` varchar(30) DEFAULT NULL,
-  `relationship_deceased` varchar(20) DEFAULT NULL,
-  `sanctioned_gis_amount` decimal(15,2) DEFAULT NULL,
-  `sanctioned_funeral_advance` decimal(15,2) DEFAULT NULL,
-  `pending_duration` varchar(20) DEFAULT NULL,
-  `reason_for_pending` varchar(255) DEFAULT NULL,
-  `reason_for_provisional_pension` varchar(255) DEFAULT NULL,
-  `others_provisional_pension` varchar(200) DEFAULT NULL,
-  `dp` varchar(20) DEFAULT NULL,
-  `pr_amount` decimal(15,2) DEFAULT NULL,
-  `pr_percentage` varchar(45) DEFAULT NULL,
-  `sanctional_gis_date` date DEFAULT NULL,
-  `sanctional_gis_amount` decimal(15,2) DEFAULT NULL,
-  `lic_date` date DEFAULT NULL,
-  `temp_id` varchar(45) NOT NULL,
-  `created_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `updated_date` varchar(45) DEFAULT NULL,
-  `is_closed` tinyint(1) DEFAULT '0',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `pensioner_details`
---
-
-LOCK TABLES `pensioner_details` WRITE;
-/*!40000 ALTER TABLE `pensioner_details` DISABLE KEYS */;
-/*!40000 ALTER TABLE `pensioner_details` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2025-02-06 16:33:03

gcc_pensioner_emptyDump/gcc_pensioner_pensioner_details_history.sql

@@ -1,80 +0,0 @@
--- MySQL dump 10.13  Distrib 8.0.40, for Win64 (x86_64)
---
--- Host: localhost    Database: gcc_pensioner
--- ------------------------------------------------------
--- Server version	8.0.40
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!50503 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `pensioner_details_history`
---
-
-DROP TABLE IF EXISTS `pensioner_details_history`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `pensioner_details_history` (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `emp_no` varchar(20) NOT NULL,
-  `emp_name` varchar(30) NOT NULL,
-  `dept_id` int NOT NULL,
-  `dept_name` varchar(30) NOT NULL,
-  `designation` varchar(30) NOT NULL,
-  `file_category` int NOT NULL,
-  `file_category_name` varchar(70) DEFAULT NULL,
-  `retirement_class` varchar(10) DEFAULT NULL,
-  `retirement_date` date DEFAULT NULL,
-  `type_of_retirement` varchar(30) DEFAULT NULL,
-  `file_moved_date` date DEFAULT NULL,
-  `remarks` text,
-  `file_status` int NOT NULL,
-  `file_entry_type` varchar(20) NOT NULL,
-  `file_moved_by` varchar(20) NOT NULL,
-  `service_death` varchar(30) DEFAULT NULL,
-  `relationship_deceased` varchar(20) DEFAULT NULL,
-  `sanctioned_gis_amount` decimal(15,2) DEFAULT NULL,
-  `sanctioned_funeral_advance` decimal(15,2) DEFAULT NULL,
-  `pending_duration` varchar(20) DEFAULT NULL,
-  `reason_for_pending` varchar(255) DEFAULT NULL,
-  `reason_for_provisional_pension` varchar(255) DEFAULT NULL,
-  `others_provisional_pension` varchar(200) DEFAULT NULL,
-  `dp` varchar(20) DEFAULT NULL,
-  `pr_amount` decimal(15,2) DEFAULT NULL,
-  `pr_percentage` varchar(45) DEFAULT NULL,
-  `sanctional_gis_date` date DEFAULT NULL,
-  `sanctional_gis_amount` decimal(15,2) DEFAULT NULL,
-  `lic_date` date DEFAULT NULL,
-  `temp_id` varchar(45) NOT NULL,
-  `created_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `pensioner_details_history`
---
-
-LOCK TABLES `pensioner_details_history` WRITE;
-/*!40000 ALTER TABLE `pensioner_details_history` DISABLE KEYS */;
-/*!40000 ALTER TABLE `pensioner_details_history` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2025-02-06 16:33:04

gcc_pensioner_emptyDump/gcc_pensioner_reason_for_provisional.sql

@@ -1,54 +0,0 @@
--- MySQL dump 10.13  Distrib 8.0.40, for Win64 (x86_64)
---
--- Host: localhost    Database: gcc_pensioner
--- ------------------------------------------------------
--- Server version	8.0.40
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!50503 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `reason_for_provisional`
---
-
-DROP TABLE IF EXISTS `reason_for_provisional`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `reason_for_provisional` (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `provisional_reason` varchar(60) NOT NULL,
-  `isactive` tinyint(1) NOT NULL DEFAULT '1',
-  `isdelete` tinyint(1) NOT NULL DEFAULT '0',
-  `created_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `reason_for_provisional`
---
-
-LOCK TABLES `reason_for_provisional` WRITE;
-/*!40000 ALTER TABLE `reason_for_provisional` DISABLE KEYS */;
-INSERT INTO `reason_for_provisional` VALUES (1,'Disciplinary Pending',1,0,'2025-02-01 08:51:12'),(2,'CourtCase Pending',1,0,'2025-02-01 08:51:12'),(3,'DVAC Pending',1,0,'2025-02-01 08:51:12'),(4,'Others',1,0,'2025-02-01 08:51:12');
-/*!40000 ALTER TABLE `reason_for_provisional` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2025-02-06 16:33:04

gcc_pensioner_emptyDump/gcc_pensioner_type_of_retriment.sql

@@ -1,54 +0,0 @@
--- MySQL dump 10.13  Distrib 8.0.40, for Win64 (x86_64)
---
--- Host: localhost    Database: gcc_pensioner
--- ------------------------------------------------------
--- Server version	8.0.40
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!50503 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `type_of_retriment`
---
-
-DROP TABLE IF EXISTS `type_of_retriment`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `type_of_retriment` (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `retriment_type` varchar(60) NOT NULL,
-  `isactive` tinyint(1) NOT NULL DEFAULT '1',
-  `isdelete` tinyint(1) NOT NULL DEFAULT '0',
-  `created_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `type_of_retriment`
---
-
-LOCK TABLES `type_of_retriment` WRITE;
-/*!40000 ALTER TABLE `type_of_retriment` DISABLE KEYS */;
-INSERT INTO `type_of_retriment` VALUES (1,'Super Annuation',1,0,'2025-01-31 11:32:24'),(2,'Voluntary',1,0,'2025-01-31 11:32:24'),(3,'Compulsory',1,0,'2025-01-31 11:32:24'),(4,'Medical Invalidation',1,0,'2025-01-31 11:32:24'),(5,'Provisional',1,0,'2025-02-01 06:22:17');
-/*!40000 ALTER TABLE `type_of_retriment` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2025-02-06 16:33:03

gcc_pensioner_emptyDump/gcc_pensioner_zone_benefits.sql

@@ -1,61 +0,0 @@
--- MySQL dump 10.13  Distrib 8.0.40, for Win64 (x86_64)
---
--- Host: localhost    Database: gcc_pensioner
--- ------------------------------------------------------
--- Server version	8.0.40
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!50503 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `zone_benefits`
---
-
-DROP TABLE IF EXISTS `zone_benefits`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `zone_benefits` (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `emp_no` varchar(20) NOT NULL,
-  `temp_id` varchar(45) NOT NULL,
-  `gpf` varchar(30) DEFAULT NULL,
-  `gpf_amount` decimal(15,2) DEFAULT NULL,
-  `spfgs` varchar(30) DEFAULT NULL,
-  `spfgs_amount` decimal(15,2) DEFAULT NULL,
-  `dcrg` varchar(30) DEFAULT NULL,
-  `private_affairs` varchar(30) DEFAULT NULL,
-  `private_affairs_amount` decimal(15,2) DEFAULT NULL,
-  `recovery_emp` text,
-  `created_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `updated_date` varchar(45) DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `zone_benefits`
---
-
-LOCK TABLES `zone_benefits` WRITE;
-/*!40000 ALTER TABLE `zone_benefits` DISABLE KEYS */;
-/*!40000 ALTER TABLE `zone_benefits` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2025-02-06 16:33:02

gcc_pensioner_emptyDump/gcc_pensioner_zone_benefits_history.sql

@@ -1,61 +0,0 @@
--- MySQL dump 10.13  Distrib 8.0.40, for Win64 (x86_64)
---
--- Host: localhost    Database: gcc_pensioner
--- ------------------------------------------------------
--- Server version	8.0.40
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!50503 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `zone_benefits_history`
---
-
-DROP TABLE IF EXISTS `zone_benefits_history`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `zone_benefits_history` (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `emp_no` varchar(20) NOT NULL,
-  `temp_id` varchar(45) NOT NULL,
-  `gpf` varchar(30) DEFAULT NULL,
-  `gpf_amount` decimal(15,2) DEFAULT NULL,
-  `spfgs` varchar(30) DEFAULT NULL,
-  `spfgs_amount` decimal(15,2) DEFAULT NULL,
-  `dcrg` varchar(30) DEFAULT NULL,
-  `private_affairs` varchar(30) DEFAULT NULL,
-  `private_affairs_amount` decimal(15,2) DEFAULT NULL,
-  `recovery_emp` text,
-  `file_moved_by` varchar(20) NOT NULL,
-  `created_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `zone_benefits_history`
---
-
-LOCK TABLES `zone_benefits_history` WRITE;
-/*!40000 ALTER TABLE `zone_benefits_history` DISABLE KEYS */;
-/*!40000 ALTER TABLE `zone_benefits_history` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2025-02-06 16:33:02